demo headers refactor

This commit is contained in:
h4570
2022-08-14 20:11:57 +02:00
parent 7ef0e73543
commit 5c2ae9770e
35 changed files with 57 additions and 87 deletions
+1 -1
View File
@@ -8,7 +8,7 @@
# Sandro Sobczyński <sandro.sobczynski@gmail.com>
*/
#include "engine.hpp"
#include <tyra>
#include "demo_game.hpp"
int main() {
-2
View File
@@ -9,8 +9,6 @@
*/
#include "states/game/debug_object.hpp"
#include <loaders/3d/obj_loader/obj_loader.hpp>
#include <file/file_utils.hpp>
using Tyra::Color;
using Tyra::FileUtils;
+1 -2
View File
@@ -10,7 +10,6 @@
#include "states/game/enemy/enemy.hpp"
#include <functional>
#include "debug/debug.hpp"
using Tyra::Math;
@@ -49,7 +48,7 @@ Enemy::Enemy(Engine* engine, const EnemyInfo& t_info) {
mesh->translation.translateY(-5.0F);
audio = &engine->audio;
audio->adpcm.setVolume(50, info.adpcmChannel);
audio->adpcm.setVolume(30, info.adpcmChannel);
allocateOptions();
@@ -9,10 +9,7 @@
*/
#include "states/game/enemy/enemy_manager.hpp"
#include "loaders/3d/obj_loader/obj_loader.hpp"
#include <file/file_utils.hpp>
#include <functional>
#include "debug/debug.hpp"
using Tyra::FileUtils;
using Tyra::Math;
-2
View File
@@ -9,8 +9,6 @@
*/
#include "states/game/game_state.hpp"
#include "debug/debug.hpp"
#include "file/file_utils.hpp"
using Tyra::FileUtils;
-1
View File
@@ -9,7 +9,6 @@
*/
#include "states/game/player/camera.hpp"
#include "debug/debug.hpp"
namespace Demo {
+6
View File
@@ -31,6 +31,12 @@ void Player::update(const Heightmap& heightmap) {
weapon.update();
}
PlayerShootAction Player::getShootAction() const {
PlayerShootAction action;
return action;
}
void Player::handlePlayerPosition(const Heightmap& heightmap,
const float& terrainHeight) {
const auto& leftJoy = pad->getLeftJoyPad();
-2
View File
@@ -9,8 +9,6 @@
*/
#include "states/game/player/weapon.hpp"
#include <loaders/3d/obj_loader/obj_loader.hpp>
#include <file/file_utils.hpp>
using Tyra::FileUtils;
using Tyra::ObjLoader;
@@ -9,7 +9,6 @@
*/
#include "states/game/renderer/game_renderer.hpp"
#include "thread/threading.hpp"
using Tyra::Threading;
-2
View File
@@ -9,8 +9,6 @@
*/
#include "states/game/ship/ship.hpp"
#include <loaders/3d/obj_loader/obj_loader.hpp>
#include <file/file_utils.hpp>
using Tyra::FileUtils;
using Tyra::ObjLoader;
-2
View File
@@ -9,8 +9,6 @@
*/
#include "states/game/skybox/skybox.hpp"
#include <loaders/3d/obj_loader/obj_loader.hpp>
#include <file/file_utils.hpp>
using Tyra::FileUtils;
using Tyra::ObjLoader;
@@ -9,8 +9,6 @@
*/
#include "states/game/terrain/heightmap.hpp"
#include "file/file_utils.hpp"
#include "debug/debug.hpp"
using Tyra::FileUtils;
using Tyra::PngLoader;
-2
View File
@@ -9,8 +9,6 @@
*/
#include "states/game/terrain/terrain.hpp"
#include <loaders/3d/obj_loader/obj_loader.hpp>
#include <file/file_utils.hpp>
using Tyra::FileUtils;
using Tyra::ObjLoader;
-2
View File
@@ -9,8 +9,6 @@
*/
#include "states/intro/intro_state.hpp"
#include "file/file_utils.hpp"
#include "debug/debug.hpp"
#include "states/intro/states/intro_ps2dev_state.hpp"
#include "states/intro/states/intro_tyra_state.hpp"
@@ -9,12 +9,7 @@
*/
#include "states/intro/states/intro_press_key_state.hpp"
#include "loaders/texture/png_loader.hpp"
#include "file/file_utils.hpp"
#include "debug/debug.hpp"
#include <string>
#include "thread/threading.hpp"
#include "math/math.hpp"
using Tyra::FileUtils;
using Tyra::Math;
@@ -9,10 +9,6 @@
*/
#include "states/intro/states/intro_ps2dev_state.hpp"
#include "loaders/texture/png_loader.hpp"
#include "file/file_utils.hpp"
#include "debug/debug.hpp"
#include "thread/threading.hpp"
using Tyra::FileUtils;
using Tyra::PngLoader;
@@ -9,11 +9,6 @@
*/
#include "states/intro/states/intro_tyra_state.hpp"
#include "loaders/texture/png_loader.hpp"
#include "file/file_utils.hpp"
#include "debug/debug.hpp"
#include "thread/threading.hpp"
#include "math/math.hpp"
using Tyra::FileUtils;
using Tyra::Math;