diff options
-rw-r--r-- | game/terrain.cpp | 2 | ||||
-rw-r--r-- | game/terrain.h | 4 | ||||
-rw-r--r-- | game/vehicles/railloco.cpp | 4 | ||||
-rw-r--r-- | game/vehicles/railloco.h | 7 | ||||
-rw-r--r-- | game/vehicles/vehicle.cpp | 1 | ||||
-rw-r--r-- | game/vehicles/vehicle.h | 2 | ||||
-rw-r--r-- | gfx/followCameraController.cpp | 1 | ||||
-rw-r--r-- | gfx/gl/shader.cpp | 1 | ||||
-rw-r--r-- | gfx/manualCameraController.cpp | 1 | ||||
-rw-r--r-- | gfx/models/mesh.cpp | 6 | ||||
-rw-r--r-- | gfx/models/mesh.h | 7 | ||||
-rw-r--r-- | gfx/models/obj.impl.cpp | 6 | ||||
-rw-r--r-- | test/test-obj.cpp | 1 | ||||
-rw-r--r-- | utility/embed-glsl.cpp.m4 | 3 |
14 files changed, 23 insertions, 23 deletions
diff --git a/game/terrain.cpp b/game/terrain.cpp index 20c06e8..44fd41d 100644 --- a/game/terrain.cpp +++ b/game/terrain.cpp @@ -1,6 +1,5 @@ #include "terrain.h" #include "gfx/models/texture.h" -#include <GL/glew.h> #include <cache.h> #include <cmath> #include <gfx/gl/shader.h> @@ -9,7 +8,6 @@ #include <gfx/models/mesh.h> #include <gfx/models/vertex.hpp> #include <glm/glm.hpp> -#include <maths.h> #include <random> #include <stb_image.h> diff --git a/game/terrain.h b/game/terrain.h index 2cec963..979a8e0 100644 --- a/game/terrain.h +++ b/game/terrain.h @@ -2,9 +2,8 @@ #define TERRAIN_H #include "collection.hpp" -#include "worldobject.h" +#include "game/worldobject.h" #include <gfx/models/mesh.h> -#include <gfx/models/vertex.hpp> #include <gfx/renderable.h> #include <memory> #include <string> @@ -12,6 +11,7 @@ class Shader; class Texture; +class Vertex; class Terrain : public WorldObject, public Renderable { public: diff --git a/game/vehicles/railloco.cpp b/game/vehicles/railloco.cpp index b47722e..6a43965 100644 --- a/game/vehicles/railloco.cpp +++ b/game/vehicles/railloco.cpp @@ -6,7 +6,9 @@ #include <algorithm> #include <array> #include <cache.h> +#include <filesystem> #include <glm/glm.hpp> +#include <iterator> #include <lib/resource.h> #include <maths.h> #include <memory> @@ -61,7 +63,7 @@ RailLoco::updateRailVehiclePosition(RailVehicle * w, float trailBy) const { const auto overhang {(w->length - w->wheelBase) / 2}; const auto & b1Pos = w->bogeys[0].location = getBogeyPosition(linkDist, trailBy += overhang); - const auto & b2Pos = w->bogeys[1].location = getBogeyPosition(linkDist, trailBy += wheelBase); + const auto & b2Pos = w->bogeys[1].location = getBogeyPosition(linkDist, trailBy + wheelBase); const auto diff = glm::normalize(b2Pos.GetPos() - b1Pos.GetPos()); w->location.GetPos() = (b1Pos.GetPos() + b2Pos.GetPos()) / 2.F; w->location.GetRot() = {-vector_pitch(diff), vector_yaw(diff), 0}; diff --git a/game/vehicles/railloco.h b/game/vehicles/railloco.h index 0d0425a..df5f970 100644 --- a/game/vehicles/railloco.h +++ b/game/vehicles/railloco.h @@ -1,11 +1,14 @@ #include "game/network/link.h" #include "game/vehicles/vehicle.h" #include "game/worldobject.h" +#include "gfx/gl/transform.h" #include "gfx/models/mesh.h" +#include <array> #include <memory> -#include <string> #include <vector> +class Shader; + class Texture; class RailVehicle : public Vehicle { public: @@ -42,7 +45,7 @@ public: private: void move(TickDuration dur); - Transform getBogeyPosition(float linkDist, float dist) const; + [[nodiscard]] Transform getBogeyPosition(float linkDist, float dist) const; void updateRailVehiclePosition(RailVehicle *, float trailBy) const; void updateWagons() const; }; diff --git a/game/vehicles/vehicle.cpp b/game/vehicles/vehicle.cpp index b9d10bc..26e33d4 100644 --- a/game/vehicles/vehicle.cpp +++ b/game/vehicles/vehicle.cpp @@ -1,6 +1,5 @@ #include "vehicle.h" #include "game/network/link.h" -#include <array> #include <memory> #include <utility> diff --git a/game/vehicles/vehicle.h b/game/vehicles/vehicle.h index bbfa6ea..228f15a 100644 --- a/game/vehicles/vehicle.h +++ b/game/vehicles/vehicle.h @@ -1,11 +1,11 @@ #ifndef VEHICLE_H #define VEHICLE_H +#include "gfx/gl/transform.h" #include <game/network/link.h> #include <game/worldobject.h> #include <gfx/renderable.h> #include <memory> -#include <string> #include <utility> #include <vector> diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp index 25a64e4..1a5a5d3 100644 --- a/gfx/followCameraController.cpp +++ b/gfx/followCameraController.cpp @@ -2,7 +2,6 @@ #include "game/vehicles/vehicle.h" #include "gfx/gl/transform.h" #include <gfx/gl/camera.h> -#include <gfx/gl/shader.h> #include <glm/glm.hpp> #include <maths.h> #include <memory> diff --git a/gfx/gl/shader.cpp b/gfx/gl/shader.cpp index d4cb747..f30af5c 100644 --- a/gfx/gl/shader.cpp +++ b/gfx/gl/shader.cpp @@ -1,4 +1,5 @@ #include "shader.h"
+#include "gfx/gl/shader-source.h"
#include <array>
#include <gfx/gl/shaders/fs-basicShader.h>
#include <gfx/gl/shaders/fs-landmassShader.h>
diff --git a/gfx/manualCameraController.cpp b/gfx/manualCameraController.cpp index f8cdbf8..01787c6 100644 --- a/gfx/manualCameraController.cpp +++ b/gfx/manualCameraController.cpp @@ -1,6 +1,5 @@ #include "manualCameraController.h" #include <gfx/gl/camera.h> -#include <gfx/gl/shader.h> bool ManualCameraController::handleInput(SDL_Event & e) diff --git a/gfx/models/mesh.cpp b/gfx/models/mesh.cpp index c829f4e..3487083 100644 --- a/gfx/models/mesh.cpp +++ b/gfx/models/mesh.cpp @@ -1,11 +1,5 @@ #include "mesh.h"
-#include "obj.h"
#include "vertex.hpp"
-#include <algorithm>
-#include <glm/glm.hpp>
-#include <iterator>
-#include <resource.h>
-#include <vector>
Mesh::Mesh(std::span<Vertex> vertices, std::span<unsigned int> indices, GLenum m) :
m_vertexArrayObject {}, m_vertexArrayBuffers {}, m_numIndices {indices.size()}, mode {m}
diff --git a/gfx/models/mesh.h b/gfx/models/mesh.h index ea3a26b..1e53407 100644 --- a/gfx/models/mesh.h +++ b/gfx/models/mesh.h @@ -4,14 +4,11 @@ #include <GL/glew.h>
#include <array>
#include <cstddef>
-#include <filesystem>
-#include <gfx/models/vertex.hpp>
+#include <memory>
#include <span>
#include <special_members.hpp>
-#include <utility>
-#include <vector>
-class ObjParser;
+class Vertex;
enum MeshBufferPositions { POSITION_VB, TEXCOORD_VB, NORMAL_VB, INDEX_VB };
diff --git a/gfx/models/obj.impl.cpp b/gfx/models/obj.impl.cpp index e410058..0c1303a 100644 --- a/gfx/models/obj.impl.cpp +++ b/gfx/models/obj.impl.cpp @@ -1,6 +1,12 @@ #include "obj.h" +#include <algorithm> #include <gfx/models/mesh.h> #include <gfx/models/vertex.hpp> +#include <glm/glm.hpp> +#include <iterator> +#include <memory> +#include <utility> +#include <vector> std::vector<ObjParser::NamedMesh> ObjParser::createMeshes() const diff --git a/test/test-obj.cpp b/test/test-obj.cpp index 68221b8..0d53691 100644 --- a/test/test-obj.cpp +++ b/test/test-obj.cpp @@ -4,6 +4,7 @@ #include <gfx/models/obj.h> #include <memory> +#include <utility> #include <vector> BOOST_AUTO_TEST_CASE(objparse) diff --git a/utility/embed-glsl.cpp.m4 b/utility/embed-glsl.cpp.m4 index febba68..9e4c6d4 100644 --- a/utility/embed-glsl.cpp.m4 +++ b/utility/embed-glsl.cpp.m4 @@ -1,7 +1,8 @@ changecom()dnl // NAME #include "substr(TYPE,1)-NAME.h" -#include <cstring> +#include <GL/glew.h> +#include "gfx/gl/shader-source.h" constexpr const GLchar * src { R"GLSL-EMBED(dnl include(SOURCE))GLSL-EMBED" }; |