diff --git a/meson.build b/meson.build index d210774..11a9597 100644 --- a/meson.build +++ b/meson.build @@ -2,7 +2,7 @@ project('raycaster', 'cpp', version: '0.1.0', default_options: [ - 'cpp_std=c++20', + 'cpp_std=c++23', 'cpp_args=-D_GLIBCXX_DEBUG=1 -D_GLIBCXX_DEBUG_PEDANTIC=1', ]) diff --git a/src/graphics/raycaster.cpp b/src/graphics/raycaster.cpp index b5848ee..a0c9be3 100644 --- a/src/graphics/raycaster.cpp +++ b/src/graphics/raycaster.cpp @@ -1,19 +1,16 @@ -#include "graphics/raycaster.hpp" #include "dbc.hpp" -#include "algos/matrix.hpp" +#include "game/components.hpp" +#include "game/systems.hpp" +#include "graphics/animation.hpp" +#include "graphics/raycaster.hpp" +#include "graphics/shaders.hpp" #include #include #include #include #include #include -#include "game/components.hpp" -#include "graphics/textures.hpp" -#include "game/systems.hpp" -#include "graphics/shaders.hpp" -#include "graphics/animation.hpp" -using namespace fmt; using std::make_unique, std::shared_ptr; union ColorConv { @@ -92,6 +89,7 @@ void Raycaster::draw_pixel_buffer() { } void Raycaster::apply_sprite_effect(shared_ptr effect, float width, float height) { + // BUG: should I use the clock in the animation? effect->setUniform("u_time", $clock.getElapsedTime().asSeconds()); sf::Vector2f u_resolution{width, height}; effect->setUniform("u_resolution", u_resolution); diff --git a/src/graphics/raycaster.hpp b/src/graphics/raycaster.hpp index 2c5c92d..922eda9 100644 --- a/src/graphics/raycaster.hpp +++ b/src/graphics/raycaster.hpp @@ -1,10 +1,10 @@ #pragma once -#include -#include +#include "algos/matrix.hpp" #include "algos/spatialmap.hpp" #include "game/level.hpp" #include "graphics/textures.hpp" +#include using matrix::Matrix; using RGBA = uint32_t; @@ -79,7 +79,6 @@ struct Raycaster { void update_sprite(DinkyECS::Entity ent, components::Sprite& sprite); void init_shaders(); - // camera things? void position_camera(float player_x, float player_y); Point plan_move(int dir, bool strafe); void plan_rotate(int dir, float amount);