demo headers refactor

demo/inc/states/game/debug_object.hpp

@@ -10,9 +10,7 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
-#include <renderer/renderer.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_static_pair.hpp"
 
 using Tyra::Renderer;

demo/inc/states/game/enemy/enemy.hpp

@@ -10,13 +10,9 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/dynamic/dynamic_mesh.hpp>
-#include <renderer/3d/pipeline/dynamic/dynpip_options.hpp>
-#include <renderer/3d/mesh/dynamic/animation_sequence_callback.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_dynamic_pair.hpp"
 #include "states/game/terrain/heightmap.hpp"
-#include <renderer/renderer.hpp>
-#include <engine.hpp>
 #include "./enemy_info.hpp"
 
 using Tyra::AnimationSequenceCallback;

demo/inc/states/game/enemy/enemy_manager.hpp

@@ -10,10 +10,10 @@
 
 #pragma once
 
-#include "states/game/terrain/heightmap.hpp"
-#include "./enemy.hpp"
 #include <tyra>
 #include <vector>
+#include "states/game/terrain/heightmap.hpp"
+#include "./enemy.hpp"
 
 using Tyra::DynamicMesh;
 using Tyra::Engine;

demo/inc/states/game/player/camera.hpp

@@ -10,9 +10,7 @@
 
 #pragma once
 
-#include "math/vec4.hpp"
-#include "renderer/core/3d/camera_info_3d.hpp"
-#include "pad/pad.hpp"
+#include <tyra>
 
 using Tyra::CameraInfo3D;
 using Tyra::Pad;

demo/inc/states/game/player/player.hpp

@@ -15,7 +15,8 @@
 #include "states/game/terrain/heightmap.hpp"
 #include "./weapon.hpp"
 #include "./camera.hpp"
-#include <engine.hpp>
+#include "./player_shoot_action.hpp"
+#include <tyra>
 
 using Tyra::Engine;
 using Tyra::Pad;
@@ -35,8 +36,11 @@ class Player {
 
   void update(const Heightmap& heightmap);
 
+  PlayerShootAction getShootAction() const;
+
  private:
-  void handlePlayerPosition(const Heightmap& heightmap,const float& terrainHeight);
+  void handlePlayerPosition(const Heightmap& heightmap,
+                            const float& terrainHeight);
 
   float speed;
   Pad* pad;

demo/inc/states/game/player/player_shoot_action.hpp

@@ -0,0 +1,25 @@
+/*
+# _____        ____   ___
+#   |     \/   ____| |___|
+#   |     |   |   \  |   |
+#-----------------------------------------------------------------------
+# Copyright 2022, tyra - https://github.com/h4570/tyra
+# Licensed under Apache License 2.0
+# Sandro Sobczyński <sandro.sobczynski@gmail.com>
+*/
+
+#pragma once
+
+#include <tyra>
+#include <optional>
+
+using Tyra::Ray;
+
+namespace Demo {
+
+struct PlayerShootAction {
+  bool isShooting = false;
+  std::optional<Ray> ray;
+};
+
+}  // namespace Demo

demo/inc/states/game/player/weapon.hpp

@@ -10,13 +10,7 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
-#include <renderer/renderer.hpp>
-#include <engine.hpp>
-#include <pad/pad.hpp>
-#include <audio/audio.hpp>
-#include <time/timer.hpp>
+#include <tyra>
 
 using Tyra::Audio;
 using Tyra::Engine;

demo/inc/states/game/renderer/game_renderer.hpp

@@ -10,11 +10,9 @@
 
 #pragma once
 
-#include "renderer/renderer.hpp"
-#include "renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp"
-#include "renderer/3d/pipeline/static/static_pipeline.hpp"
-#include "./renderer_dynamic_pair.hpp"
+#include <tyra>
 #include "./renderer_static_pair.hpp"
+#include "./renderer_dynamic_pair.hpp"
 
 using Tyra::DynamicPipeline;
 using Tyra::Renderer;

demo/inc/states/game/renderer/renderer_dynamic_pair.hpp

@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include "renderer/3d/pipeline/dynamic/dynamic_pipeline.hpp"
-#include "renderer/3d/mesh/dynamic/dynamic_mesh.hpp"
+#include <tyra>
 
 using Tyra::DynamicMesh;
 using Tyra::DynPipOptions;

demo/inc/states/game/renderer/renderer_static_pair.hpp

@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include "renderer/3d/pipeline/static/static_pipeline.hpp"
-#include "renderer/3d/mesh/static/static_mesh.hpp"
+#include <tyra>
 
 using Tyra::StaPipOptions;
 using Tyra::StaticMesh;

demo/inc/states/game/ship/ship.hpp

@@ -10,10 +10,8 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_static_pair.hpp"
-#include <renderer/renderer.hpp>
 
 using Tyra::Renderer;
 using Tyra::StaPipOptions;

demo/inc/states/game/skybox/skybox.hpp

@@ -10,10 +10,8 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_static_pair.hpp"
-#include <renderer/renderer.hpp>
 
 using Tyra::Renderer;
 using Tyra::StaPipOptions;

demo/inc/states/game/terrain/heightmap.hpp

@@ -10,8 +10,7 @@
 
 #pragma once
 
-#include "math/vec4.hpp"
-#include "loaders/texture/png_loader.hpp"
+#include <tyra>
 
 using Tyra::Vec4;
 

demo/inc/states/game/terrain/terrain.hpp

@@ -10,10 +10,8 @@
 
 #pragma once
 
-#include <renderer/3d/mesh/static/static_mesh.hpp>
-#include <renderer/3d/pipeline/static/stapip_options.hpp>
+#include <tyra>
 #include "states/game/renderer/renderer_static_pair.hpp"
-#include <renderer/renderer.hpp>
 #include "./heightmap.hpp"
 
 using Tyra::StaPipOptions;