games/raycaster
1
0
Fork 0
Code Issues 30 Pull requests Projects Releases 2 Packages Wiki Activity Actions

A bit more cleaning up of the gui and fsm, probaby done.

Browse source
This commit is contained in:
Zed A. Shaw 2025-02-21 01:04:32 -05:00
parent dd4f77a106
commit 6c1d851e85
3 changed files with 12 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gui_fsm.cpp
View file

@ -77,8 +77,8 @@ namespace gui {
void FSM::MOVING(Event ) { void FSM::MOVING(Event ) {
// this should be an optional that returns a point // this should be an optional that returns a point
if($main_ui.play_move()) { if(auto move_to = $main_ui.play_move()) {
System::plan_motion(*$level.world, {size_t($main_ui.$camera.target_x), size_t($main_ui.$camera.target_y)}); System::plan_motion(*$level.world, *move_to);
run_systems(); run_systems();
state(State::IDLE); state(State::IDLE);
} }

10
main_ui.cpp
View file

@ -90,8 +90,14 @@ namespace gui {
} }
// this could be an optional that returs a Point // this could be an optional that returs a Point
bool MainUI::play_move() { std::optional<Point> MainUI::play_move() {
return $camera.play_move($rayview); if($camera.play_move($rayview)) {
return std::make_optional<Point>({
size_t($camera.target_x),
size_t($camera.target_y)});
} else {
return std::nullopt;
}
} }
void MainUI::plan_rotate(int dir) { void MainUI::plan_rotate(int dir) {

3
main_ui.hpp
View file

@ -5,6 +5,7 @@
#include "overlay_ui.hpp" #include "overlay_ui.hpp"
#include "raycaster.hpp" #include "raycaster.hpp"
#include "camera.hpp" #include "camera.hpp"
#include <optional>
namespace gui { namespace gui {
@ -26,7 +27,7 @@ namespace gui {
void draw_stats(); void draw_stats();
void draw_blood(); void draw_blood();
bool play_move(); std::optional<Point> play_move();
void plan_rotate(int dir); void plan_rotate(int dir);
bool play_rotate(); bool play_rotate();
Point plan_move(int dir, bool strafe); Point plan_move(int dir, bool strafe);