Mostly working prototype that uses FTXUI to render to SFML and then plays a sound when you hit a wall.
This commit is contained in:
parent
69fa7d9e4e
commit
feda66defd
11 changed files with 213 additions and 68 deletions
17
.tarpit.json
Normal file
17
.tarpit.json
Normal file
|
@ -0,0 +1,17 @@
|
||||||
|
{
|
||||||
|
"audio": {
|
||||||
|
"you_died": "./assets/you_died.mp3",
|
||||||
|
"build_success": "",
|
||||||
|
"build_failed": "./assets/build_failed.mp3",
|
||||||
|
"building": "./mysounds/building.mp3"
|
||||||
|
},
|
||||||
|
"images": {
|
||||||
|
"build_success": "./assets/build_success.png",
|
||||||
|
"you_died": "./assets/you_died.png",
|
||||||
|
"build_failed": "./assets/build_failed.png",
|
||||||
|
"building": "./assets/building.png"
|
||||||
|
},
|
||||||
|
"git_path": ".\\",
|
||||||
|
"build_cmd": "meson compile -C builddir",
|
||||||
|
"test_cmd": "./builddir/runtests.exe"
|
||||||
|
}
|
1
.vimrc_proj
Normal file
1
.vimrc_proj
Normal file
|
@ -0,0 +1 @@
|
||||||
|
set makeprg=meson\ compile\ -j\ 4\ -C\ .
|
BIN
assets/hit.wav
Normal file
BIN
assets/hit.wav
Normal file
Binary file not shown.
BIN
assets/text.ttf
Normal file
BIN
assets/text.ttf
Normal file
Binary file not shown.
2
fsm.hpp
2
fsm.hpp
|
@ -12,7 +12,7 @@ template<typename S, typename E>
|
||||||
class DeadSimpleFSM {
|
class DeadSimpleFSM {
|
||||||
protected:
|
protected:
|
||||||
// BUG: don't put this in your class because state() won't work
|
// BUG: don't put this in your class because state() won't work
|
||||||
S _state = S::START;
|
S _state = S::START;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
template<typename... Types>
|
template<typename... Types>
|
||||||
|
|
232
main.cpp
232
main.cpp
|
@ -3,6 +3,9 @@
|
||||||
// the LICENSE file.
|
// the LICENSE file.
|
||||||
#include <chrono> // for operator""s, chrono_literals
|
#include <chrono> // for operator""s, chrono_literals
|
||||||
#include <iostream> // for cout, ostream
|
#include <iostream> // for cout, ostream
|
||||||
|
#include <locale>
|
||||||
|
#include <codecvt>
|
||||||
|
#include <fstream>
|
||||||
#include <memory> // for allocator, shared_ptr
|
#include <memory> // for allocator, shared_ptr
|
||||||
#include <string> // for string, operator<<
|
#include <string> // for string, operator<<
|
||||||
#include <thread> // for sleep_for
|
#include <thread> // for sleep_for
|
||||||
|
@ -14,8 +17,15 @@
|
||||||
#include <ftxui/component/loop.hpp>
|
#include <ftxui/component/loop.hpp>
|
||||||
#include <ftxui/screen/color.hpp>
|
#include <ftxui/screen/color.hpp>
|
||||||
#include "ftxui/component/screen_interactive.hpp" // for ScreenInteractive
|
#include "ftxui/component/screen_interactive.hpp" // for ScreenInteractive
|
||||||
|
#include <SFML/Window.hpp>
|
||||||
|
#include <SFML/System.hpp>
|
||||||
|
#include <SFML/Graphics/Text.hpp>
|
||||||
|
#include <SFML/Graphics/Font.hpp>
|
||||||
|
#include <SFML/Graphics/RenderWindow.hpp>
|
||||||
|
#include <SFML/Audio.hpp>
|
||||||
|
|
||||||
#include <fmt/core.h>
|
#include <fmt/core.h>
|
||||||
|
#include "fsm.hpp"
|
||||||
#include "map.hpp"
|
#include "map.hpp"
|
||||||
#include "dbc.hpp"
|
#include "dbc.hpp"
|
||||||
|
|
||||||
|
@ -23,42 +33,128 @@ using std::string;
|
||||||
using namespace fmt;
|
using namespace fmt;
|
||||||
using namespace std::chrono_literals;
|
using namespace std::chrono_literals;
|
||||||
|
|
||||||
|
enum class Value {
|
||||||
|
BLACK=0, DARK_DARK, DARK_MID,
|
||||||
|
DARK_LIGHT, MID, LIGHT_DARK, LIGHT_MID,
|
||||||
|
LIGHT_LIGHT, WHITE, TRANSPARENT
|
||||||
|
};
|
||||||
|
|
||||||
|
std::array<sf::Color, 10> VALUES{
|
||||||
|
sf::Color{1, 4, 2}, // black
|
||||||
|
sf::Color{9, 29, 16}, // dark dark
|
||||||
|
sf::Color{14, 50, 26}, // dark mid
|
||||||
|
sf::Color{0, 109, 44}, // dark light
|
||||||
|
sf::Color{63, 171, 92}, // mid
|
||||||
|
sf::Color{161, 217, 155}, // light dark
|
||||||
|
sf::Color{199, 233, 192}, // light mid
|
||||||
|
sf::Color{229, 245, 224}, // light light
|
||||||
|
sf::Color{255, 255, 255}, // white
|
||||||
|
sf::Color::Transparent, // white
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class EntityState {
|
||||||
|
START, HUNTING, DEAD
|
||||||
|
};
|
||||||
|
|
||||||
|
enum class EntityEvent {
|
||||||
|
GO, HIT
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
class Entity : public DeadSimpleFSM<EntityState, EntityEvent> {
|
||||||
|
public:
|
||||||
|
Point location;
|
||||||
|
int hp = 20;
|
||||||
|
int damage = 10;
|
||||||
|
|
||||||
|
Entity(Point loc) : location(loc) {
|
||||||
|
};
|
||||||
|
|
||||||
|
// disable copy
|
||||||
|
Entity(Entity &e) = delete;
|
||||||
|
|
||||||
|
void move(Point loc) {
|
||||||
|
location = loc;
|
||||||
|
}
|
||||||
|
|
||||||
|
void event(EntityEvent ev) {
|
||||||
|
switch(_state) {
|
||||||
|
FSM_STATE(EntityState, START, ev);
|
||||||
|
FSM_STATE(EntityState, HUNTING, ev);
|
||||||
|
FSM_STATE(EntityState, DEAD, ev);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void START(EntityEvent ev) {
|
||||||
|
state(EntityState::HUNTING);
|
||||||
|
}
|
||||||
|
|
||||||
|
void HUNTING(EntityEvent ev) {
|
||||||
|
switch(ev) {
|
||||||
|
case EntityEvent::HIT:
|
||||||
|
hp -= damage;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
state(EntityState::HUNTING);
|
||||||
|
}
|
||||||
|
|
||||||
|
if(hp <= 0) {
|
||||||
|
state(EntityState::DEAD);
|
||||||
|
} else {
|
||||||
|
state(EntityState::HUNTING);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void DEAD(EntityEvent ev) {
|
||||||
|
state(EntityState::DEAD);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
sf::SoundBuffer g_hit_buf;
|
||||||
|
sf::Sound g_hit_sound;
|
||||||
|
|
||||||
int main() {
|
int main() {
|
||||||
using namespace ftxui;
|
using namespace ftxui;
|
||||||
std::string reset_position;
|
auto c = Canvas(60 * 2, 20 * 4);
|
||||||
|
|
||||||
auto c = Canvas(60 * 2, 27 * 4);
|
int res = g_hit_buf.loadFromFile("./hit.wav");
|
||||||
|
dbc::check(res, "faile to load hit.wav");
|
||||||
|
g_hit_sound.setBuffer(g_hit_buf);
|
||||||
|
|
||||||
Map game_map(50, 27);
|
Map game_map(50, 20);
|
||||||
game_map.generate();
|
game_map.generate();
|
||||||
Matrix &walls = game_map.walls();
|
Matrix &walls = game_map.walls();
|
||||||
Room &start = game_map.room(0);
|
Room &start = game_map.room(0);
|
||||||
Room &bad_room = game_map.room(1);
|
Room &bad_room = game_map.room(1);
|
||||||
Room &gold_room = game_map.room(game_map.room_count() - 1);
|
Room &gold_room = game_map.room(game_map.room_count() - 1);
|
||||||
|
|
||||||
Point me = {.x=start.x+1, .y=start.y+1};
|
Entity me({.x=start.x+1, .y=start.y+1});
|
||||||
Point enemy = {.x=bad_room.x+1, .y=bad_room.y+1};
|
Entity enemy({.x=bad_room.x+1, .y=bad_room.y+1});
|
||||||
Point goal = {.x=gold_room.x+1, .y=gold_room.y+1};
|
Point goal{.x=gold_room.x+1, .y=gold_room.y+1};
|
||||||
string dead_yet = "NOT DEAD";
|
string status_text = "NOT DEAD";
|
||||||
|
|
||||||
bool show_paths = false;
|
bool show_paths = false;
|
||||||
bool bomb = false;
|
bool bomb = false;
|
||||||
|
|
||||||
auto map = Renderer([&] {
|
auto map = Renderer([&] {
|
||||||
game_map.set_target(me);
|
game_map.set_target(me.location);
|
||||||
game_map.make_paths();
|
game_map.make_paths();
|
||||||
Matrix &paths = game_map.paths();
|
Matrix &paths = game_map.paths();
|
||||||
|
|
||||||
|
if(me.in_state(EntityState::DEAD)) {
|
||||||
|
status_text = "DEAD!";
|
||||||
|
}
|
||||||
|
|
||||||
for(size_t x = 0; x < walls[0].size(); ++x) {
|
for(size_t x = 0; x < walls[0].size(); ++x) {
|
||||||
for(size_t y = 0; y < walls.size(); ++y) {
|
for(size_t y = 0; y < walls.size(); ++y) {
|
||||||
string tile = walls[y][x] == 1 ? "#" : format("{}", paths[y][x]);
|
string tile = walls[y][x] == 1 ? "#" : format("{}", paths[y][x]);
|
||||||
if(tile == "#") {
|
if(tile == "#") {
|
||||||
c.DrawText(x*2, y*4, tile, Color::GrayDark);
|
c.DrawText(x*2, y*4, tile);
|
||||||
} else if(show_paths) {
|
} else if(show_paths) {
|
||||||
int pnum = paths[y][x];
|
//int pnum = paths[y][x];
|
||||||
c.DrawText(x*2, y*4, tile, Color::Palette16(pnum % 7 + 1));
|
c.DrawText(x*2, y*4, tile);
|
||||||
} else {
|
} else {
|
||||||
c.DrawText(x*2, y*4, ".", Color::GrayDark);
|
c.DrawText(x*2, y*4, ".");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -66,12 +162,12 @@ int main() {
|
||||||
if(bomb) {
|
if(bomb) {
|
||||||
/// draw
|
/// draw
|
||||||
bomb = false;
|
bomb = false;
|
||||||
c.DrawPointCircle(me.x*2, me.y*4, 4, Color::Red);
|
c.DrawPointCircle(me.location.x*2, me.location.y*4, 4);
|
||||||
}
|
}
|
||||||
|
|
||||||
c.DrawText(enemy.x*2, enemy.y*4, "!", Color::Red);
|
c.DrawText(enemy.location.x*2, enemy.location.y*4, "!");
|
||||||
c.DrawText(me.x*2, me.y*4, "@", Color::Blue);
|
c.DrawText(me.location.x*2, me.location.y*4, "@");
|
||||||
c.DrawText(goal.x*2, goal.y*4, "$", Color::Yellow);
|
c.DrawText(goal.x*2, goal.y*4, "$");
|
||||||
|
|
||||||
return canvas(c);
|
return canvas(c);
|
||||||
});
|
});
|
||||||
|
@ -80,56 +176,76 @@ int main() {
|
||||||
return hbox({
|
return hbox({
|
||||||
hflow(
|
hflow(
|
||||||
vbox(
|
vbox(
|
||||||
gauge(0.5) | border,
|
text(format("HP: {}", me.hp)) | border,
|
||||||
text(dead_yet) | border
|
text(status_text) | border
|
||||||
) | xflex_grow
|
) | xflex_grow
|
||||||
),
|
),
|
||||||
separator(),
|
separator(),
|
||||||
hbox(map->Render()),
|
hbox(map->Render()),
|
||||||
}) | border;
|
});
|
||||||
});
|
});
|
||||||
|
|
||||||
document |= CatchEvent([&](Event e) -> bool {
|
auto screen = Screen::Create(Dimension::Full());
|
||||||
size_t x = me.x;
|
|
||||||
size_t y = me.y;
|
|
||||||
|
|
||||||
if(e == Event::ArrowLeft) {
|
sf::RenderWindow window(sf::VideoMode(1600,900), "Roguish");
|
||||||
x -= 1;
|
|
||||||
} else if(e == Event::ArrowRight) {
|
sf::Font font;
|
||||||
x += 1;
|
font.loadFromFile("./unifont-16.0.01.otf");
|
||||||
} else if(e == Event::ArrowDown) {
|
sf::Text text;
|
||||||
y += 1;
|
text.setFont(font);
|
||||||
} else if(e == Event::ArrowUp) {
|
text.setCharacterSize(30);
|
||||||
y -= 1;
|
text.setFillColor(VALUES[size_t(Value::LIGHT_LIGHT)]);
|
||||||
} else if(e == Event::Backspace) {
|
|
||||||
bomb = true;
|
while(window.isOpen()) {
|
||||||
} else {
|
Render(screen, document->Render());
|
||||||
return false;
|
std::string screen_out = screen.ToString();
|
||||||
|
std::wstring_convert<std::codecvt_utf8_utf16<wchar_t>> converter;
|
||||||
|
std::wstring utf8 = converter.from_bytes(screen_out);
|
||||||
|
|
||||||
|
text.setString(utf8);
|
||||||
|
text.setPosition({0,0});
|
||||||
|
window.clear();
|
||||||
|
window.draw(text);
|
||||||
|
window.display();
|
||||||
|
|
||||||
|
sf::Event event;
|
||||||
|
while(window.pollEvent(event)) {
|
||||||
|
if(event.type == sf::Event::Closed) {
|
||||||
|
window.close();
|
||||||
|
} else if(event.type == sf::Event::KeyPressed) {
|
||||||
|
size_t x = me.location.x;
|
||||||
|
size_t y = me.location.y;
|
||||||
|
|
||||||
|
if(sf::Keyboard::isKeyPressed(sf::Keyboard::Left)) {
|
||||||
|
x -= 1;
|
||||||
|
} else if(sf::Keyboard::isKeyPressed(sf::Keyboard::Right)) {
|
||||||
|
x += 1;
|
||||||
|
} else if(sf::Keyboard::isKeyPressed(sf::Keyboard::Up)) {
|
||||||
|
y -= 1;
|
||||||
|
} else if(sf::Keyboard::isKeyPressed(sf::Keyboard::Down)) {
|
||||||
|
y += 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(game_map.inmap(x,y) && !game_map.iswall(x,y)) {
|
||||||
|
game_map.clear_target(me.location);
|
||||||
|
me.move({x, y});
|
||||||
|
} else {
|
||||||
|
g_hit_sound.play();
|
||||||
|
}
|
||||||
|
|
||||||
|
// move enemy here
|
||||||
|
bool found = game_map.neighbors(enemy.location, true);
|
||||||
|
if(!found) {
|
||||||
|
status_text = "ENEMY STUCK!";
|
||||||
|
}
|
||||||
|
|
||||||
|
if(enemy.location.x == me.location.x && enemy.location.y == me.location.y) {
|
||||||
|
me.event(EntityEvent::HIT);
|
||||||
|
} else if(goal.x == me.location.x && goal.y == me.location.y) {
|
||||||
|
status_text = "YOU WIN!";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if(game_map.inmap(x,y) && !game_map.iswall(x,y)) {
|
|
||||||
game_map.clear_target(me);
|
|
||||||
me.x = x;
|
|
||||||
me.y = y;
|
|
||||||
}
|
|
||||||
|
|
||||||
// move enemy here
|
|
||||||
bool found = game_map.neighbors(enemy, true);
|
|
||||||
|
|
||||||
if(enemy.x == me.x && enemy.y == me.y) {
|
|
||||||
dead_yet = "YOU DIED!";
|
|
||||||
} else if(goal.x == me.x && goal.y == me.y) {
|
|
||||||
dead_yet = "YOU WIN!";
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
|
||||||
});
|
|
||||||
|
|
||||||
auto screen = ScreenInteractive::Fullscreen();
|
|
||||||
Loop loop(&screen, document);
|
|
||||||
|
|
||||||
while(!loop.HasQuitted()) {
|
|
||||||
loop.RunOnceBlocking();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
|
@ -7,10 +7,11 @@ json = dependency('nlohmann_json')
|
||||||
ftxui_screen = dependency('ftxui-screen')
|
ftxui_screen = dependency('ftxui-screen')
|
||||||
ftxui_dom = dependency('ftxui-dom')
|
ftxui_dom = dependency('ftxui-dom')
|
||||||
ftxui_component = dependency('ftxui-component')
|
ftxui_component = dependency('ftxui-component')
|
||||||
|
sfml = dependency('sfml')
|
||||||
|
|
||||||
dependencies = [catch2, fmt,
|
dependencies = [catch2, fmt,
|
||||||
ftxui_screen, ftxui_dom, ftxui_component,
|
ftxui_screen, ftxui_dom, ftxui_component,
|
||||||
json]
|
json, sfml]
|
||||||
|
|
||||||
runtests = executable('runtests', [
|
runtests = executable('runtests', [
|
||||||
'dbc.cpp',
|
'dbc.cpp',
|
||||||
|
|
|
@ -8,6 +8,13 @@ meson wrap install fmt
|
||||||
meson wrap install catch2
|
meson wrap install catch2
|
||||||
meson wrap install ftxui
|
meson wrap install ftxui
|
||||||
meson wrap install nlohmann_json
|
meson wrap install nlohmann_json
|
||||||
|
meson wrap install libpng
|
||||||
|
meson wrap install vorbis
|
||||||
|
meson wrap install ogg
|
||||||
|
meson wrap install flac
|
||||||
|
meson wrap install freetype2
|
||||||
|
meson wrap install openal-soft
|
||||||
|
meson wrap install sfml
|
||||||
# $env:CC="clang"
|
# $env:CC="clang"
|
||||||
# $env:CXX="clang++"
|
# $env:CXX="clang++"
|
||||||
meson setup --default-library=static --prefer-static builddir
|
meson setup --default-library=static --prefer-static builddir
|
||||||
|
|
|
@ -11,4 +11,12 @@ meson wrap install fmt
|
||||||
meson wrap install catch2
|
meson wrap install catch2
|
||||||
meson wrap install ftxui
|
meson wrap install ftxui
|
||||||
meson wrap install nlohmann_json
|
meson wrap install nlohmann_json
|
||||||
|
meson wrap install sfml
|
||||||
|
meson wrap install libpng
|
||||||
|
meson wrap install vorbis
|
||||||
|
meson wrap install ogg
|
||||||
|
meson wrap install flac
|
||||||
|
meson wrap install freetype2
|
||||||
|
meson wrap install openal-soft
|
||||||
|
meson wrap install sfml
|
||||||
meson setup builddir
|
meson setup builddir
|
||||||
|
|
|
@ -1,8 +1,5 @@
|
||||||
|
|
||||||
|
|
||||||
TODO:
|
TODO:
|
||||||
|
|
||||||
* Create a map gen of some kind.
|
* Clean up the code to not be such a horrible hack mess.
|
||||||
* Research how hard to create a non-terminal/graphic backend to FTXUI.
|
* Figure out how to render color fonts from FTUI.
|
||||||
* Look into font rendering libraries.
|
* Lua integration?
|
||||||
* Lua integration
|
|
||||||
|
|
|
@ -37,7 +37,5 @@ TEST_CASE("dijkstra algo test", "[map]") {
|
||||||
|
|
||||||
TEST_CASE("bsp algo test", "[map]") {
|
TEST_CASE("bsp algo test", "[map]") {
|
||||||
Map map(50, 20);
|
Map map(50, 20);
|
||||||
|
|
||||||
map.generate();
|
map.generate();
|
||||||
map.dump();
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue