demo headers refactor
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user