learn-code-the-hard-way
/
raycaster
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

The ritual UI is now in its own thing, but not hooked up yet.

Browse Source
master
Zed A. Shaw 2 weeks ago
parent f1cc9f86c1
commit 263b7741f6
5 changed files with 156 additions and 73 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 1
      meson.build
  2. 121
      ritual_ui.cpp
  3. 32
      ritual_ui.hpp
  4. 66
      status_ui.cpp
  5. 9
      status_ui.hpp

1
meson.build
Unescape View File

@ -104,6 +104,7 @@ sources = [
'pathing.cpp', 'pathing.cpp',
'rand.cpp', 'rand.cpp',
'raycaster.cpp', 'raycaster.cpp',
'ritual_ui.cpp',
'rituals.cpp', 'rituals.cpp',
'save.cpp', 'save.cpp',
'shiterator.hpp', 'shiterator.hpp',

121
ritual_ui.cpp
Unescape View File

@ -0,0 +1,121 @@
#include "ritual_ui.hpp"
#include "components.hpp"
#include "guecs.hpp"
#include "rand.hpp"
namespace gui {
using namespace guecs;
using std::any, std::any_cast, std::string, std::make_any;
RitualUI::RitualUI(GameLevel level) :
$level(level)
{
$gui.position(STATUS_UI_X, STATUS_UI_Y, STATUS_UI_WIDTH, STATUS_UI_HEIGHT);
$gui.layout(
"[ ritual_ui ]"
"[inv_slot1 | inv_slot2 | inv_slot3]"
"[inv_slot4 | inv_slot5 | inv_slot6]"
"[*%(100,300)circle_area]"
"[_]"
"[_]");
}
void RitualUI::init() {
$gui.world().set_the<Background>({$gui.$parser});
for(auto& [name, cell] : $gui.cells()) {
if(name == "circle_area") {
dbc::log("circle area not setup...");
} else {
auto button = $gui.entity(name);
$gui.set<Rectangle>(button, {});
$gui.set<Textual>(button, {""});
$gui.set<ActionData>(button, {make_any<string>(name)});
if(name == "ritual_ui") {
$gui.set<Clickable>(button, {
[this](auto, auto){ select_ritual(); }
});
}
}
}
$ritual_ui = textures::get("ritual_crafting_area");
$ritual_ui.sprite->setPosition({0,0});
$ritual_ui.sprite->setTextureRect($ritual_closed_rect);
$ritual_state = RitualUIState::CLOSED;
$ritual_anim.simple = false;
$ritual_anim.looped = false;
$ritual_anim.easing = ease::NONE;
$ritual_anim.stationary = true;
$ritual_anim.texture_width = 380;
$ritual_anim.frames = 3;
$ritual_anim.speed = 0.2f;
$gui.init();
}
void RitualUI::select_ritual() {
using enum RitualUIState;
switch($ritual_state) {
case OPEN:
$ritual_state = CLOSING;
break;
case CLOSED:
$ritual_state = OPENING;
$ritual_anim.play();
break;
case OPENING: // ignored
break;
case CLOSING: // ignored
break;
default:
dbc::sentinel("INVALID RitualUIState");
}
}
/* WARNING: This is really not the greatest way to do this. */
void RitualUI::update() {
dbc::log("RITUAL UPDATE NOT IMPLEMENTED");
}
void RitualUI::render(sf::RenderWindow &window) {
sf::IntRect rect;
sf::Vector2f scale{1.0, 1.0};
sf::Vector2f pos{0, 0};
using enum RitualUIState;
switch($ritual_state) {
case OPEN: {
rect = $ritual_open_rect;
} break;
case CLOSED: {
rect = $ritual_closed_rect;
}
break;
case OPENING: {
if($ritual_anim.playing) {
rect = $ritual_closed_rect;
$ritual_anim.step(scale, pos, rect);
} else {
$ritual_state = OPEN;
rect = $ritual_open_rect;
}
}
break;
case CLOSING: {
rect = $ritual_closed_rect;
$ritual_state = CLOSED;
} break;
default:
dbc::sentinel("INVALID RitualUIState");
}
$ritual_ui.sprite->setTextureRect(rect);
$ritual_ui.sprite->setPosition(pos);
$ritual_ui.sprite->setScale(scale);
window.draw(*$ritual_ui.sprite);
}
}

32
ritual_ui.hpp
Unescape View File

@ -0,0 +1,32 @@
#pragma once
#include "levelmanager.hpp"
#include "constants.hpp"
#include <deque>
#include "textures.hpp"
#include "guecs.hpp"
namespace gui {
enum class RitualUIState {
OPEN=0,
CLOSED=1,
OPENING=2,
CLOSING=3
};
class RitualUI {
public:
sf::IntRect $ritual_closed_rect{{0,0},{380,720}};
sf::IntRect $ritual_open_rect{{380 * 2,0},{380,720}};
RitualUIState $ritual_state = RitualUIState::CLOSED;
textures::SpriteTexture $ritual_ui;
components::Animation $ritual_anim;
guecs::UI $gui;
GameLevel $level;
RitualUI(GameLevel level);
void select_ritual();
void init();
void render(sf::RenderWindow &window);
void update();
};
}

66
status_ui.cpp
Unescape View File

@ -58,36 +58,11 @@ namespace gui {
$ritual_ui = textures::get("ritual_crafting_area"); $ritual_ui = textures::get("ritual_crafting_area");
$ritual_ui.sprite->setPosition({0,0}); $ritual_ui.sprite->setPosition({0,0});
$ritual_ui.sprite->setTextureRect($ritual_closed_rect); $ritual_ui.sprite->setTextureRect($ritual_closed_rect);
$ritual_state = RitualUIState::CLOSED;
$ritual_anim.simple = false;
$ritual_anim.looped = false;
$ritual_anim.easing = ease::NONE;
$ritual_anim.stationary = true;
$ritual_anim.texture_width = 380;
$ritual_anim.frames = 3;
$ritual_anim.speed = 0.2f;
$gui.init(); $gui.init();
} }
void StatusUI::select_ritual() { void StatusUI::select_ritual() {
using enum RitualUIState; dbc::log("ritual selected but no way to trigger it yet");
switch($ritual_state) {
case OPEN:
$ritual_state = CLOSING;
break;
case CLOSED:
$ritual_state = OPENING;
$ritual_anim.play();
break;
case OPENING: // ignored
break;
case CLOSING: // ignored
break;
default:
dbc::sentinel("INVALID RitualUIState");
}
} }
void StatusUI::select_slot(DinkyECS::Entity ent, any slot_name) { void StatusUI::select_slot(DinkyECS::Entity ent, any slot_name) {
@ -152,44 +127,7 @@ namespace gui {
} }
void StatusUI::render(sf::RenderWindow &window) { void StatusUI::render(sf::RenderWindow &window) {
sf::IntRect rect; $gui.render(window);
sf::Vector2f scale{1.0, 1.0};
sf::Vector2f pos{0, 0};
using enum RitualUIState;
switch($ritual_state) {
case OPEN: {
rect = $ritual_open_rect;
} break;
case CLOSED: {
$gui.render(window);
rect = $ritual_closed_rect;
}
break;
case OPENING: {
$gui.render(window);
if($ritual_anim.playing) {
rect = $ritual_closed_rect;
$ritual_anim.step(scale, pos, rect);
} else {
$ritual_state = OPEN;
rect = $ritual_open_rect;
}
}
break;
case CLOSING: {
$gui.render(window);
rect = $ritual_closed_rect;
$ritual_state = CLOSED;
} break;
default:
dbc::sentinel("INVALID RitualUIState");
}
$ritual_ui.sprite->setTextureRect(rect);
$ritual_ui.sprite->setPosition(pos);
$ritual_ui.sprite->setScale(scale);
window.draw(*$ritual_ui.sprite); window.draw(*$ritual_ui.sprite);
} }

9
status_ui.hpp
Unescape View File

@ -6,18 +6,9 @@
#include "guecs.hpp" #include "guecs.hpp"
namespace gui { namespace gui {
enum class RitualUIState {
OPEN=0,
CLOSED=1,
OPENING=2,
CLOSING=3
};
class StatusUI { class StatusUI {
public: public:
sf::IntRect $ritual_closed_rect{{0,0},{380,720}}; sf::IntRect $ritual_closed_rect{{0,0},{380,720}};
sf::IntRect $ritual_open_rect{{380 * 2,0},{380,720}};
RitualUIState $ritual_state = RitualUIState::CLOSED;
textures::SpriteTexture $ritual_ui; textures::SpriteTexture $ritual_ui;
components::Animation $ritual_anim; components::Animation $ritual_anim;
guecs::UI $gui; guecs::UI $gui;

Write Preview
Loading…
Cancel
Save