diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-03-05 22:16:56 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2025-03-05 22:16:56 +0000 |
| commit | 2454b5449bbda815eb15327476e376d0d3a39617 (patch) | |
| tree | 405643f93a6e8eb2cd3f8b38a17649fd2f85f5a6 | |
| parent | Have Camera keep an array of frustum plane definitions (diff) | |
| download | ilt-2454b5449bbda815eb15327476e376d0d3a39617.tar.bz2 ilt-2454b5449bbda815eb15327476e376d0d3a39617.tar.xz ilt-2454b5449bbda815eb15327476e376d0d3a39617.zip | |
Move camera out of gl folder, it's not OpenGL specific
| -rw-r--r-- | gfx/camera.cpp (renamed from gfx/gl/camera.cpp) | 0 | ||||
| -rw-r--r-- | gfx/camera.h (renamed from gfx/gl/camera.h) | 0 | ||||
| -rw-r--r-- | gfx/followCameraController.cpp | 2 | ||||
| -rw-r--r-- | gfx/gl/sceneRenderer.h | 2 | ||||
| -rw-r--r-- | gfx/gl/shadowMapper.cpp | 2 | ||||
| -rw-r--r-- | test/test-maths.cpp | 2 | ||||
| -rw-r--r-- | ui/gameMainSelector.cpp | 2 | ||||
| -rw-r--r-- | ui/manualCameraController.cpp | 2 |
8 files changed, 6 insertions, 6 deletions
diff --git a/gfx/gl/camera.cpp b/gfx/camera.cpp index 9e165fa..9e165fa 100644 --- a/gfx/gl/camera.cpp +++ b/gfx/camera.cpp diff --git a/gfx/gl/camera.h b/gfx/camera.h index d4fe6de..d4fe6de 100644 --- a/gfx/gl/camera.h +++ b/gfx/camera.h diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp index cf6da34..d7bbc0b 100644 --- a/gfx/followCameraController.cpp +++ b/gfx/followCameraController.cpp @@ -1,6 +1,6 @@ #include "followCameraController.h" #include "game/vehicles/vehicle.h" -#include <gfx/gl/camera.h> +#include <gfx/camera.h> #include <glm/glm.hpp> #include <location.h> #include <maths.h> diff --git a/gfx/gl/sceneRenderer.h b/gfx/gl/sceneRenderer.h index 93470f5..4649a68 100644 --- a/gfx/gl/sceneRenderer.h +++ b/gfx/gl/sceneRenderer.h @@ -1,12 +1,12 @@ #pragma once -#include "camera.h" #include "gfx/lightDirection.h" #include "glArrays.h" #include "program.h" #include "sceneProvider.h" #include "sceneShader.h" #include "shadowMapper.h" +#include <gfx/camera.h> #include <glm/fwd.hpp> class SceneRenderer { diff --git a/gfx/gl/shadowMapper.cpp b/gfx/gl/shadowMapper.cpp index 1b95aa3..908dbdb 100644 --- a/gfx/gl/shadowMapper.cpp +++ b/gfx/gl/shadowMapper.cpp @@ -1,5 +1,4 @@ #include "shadowMapper.h" -#include "camera.h" #include "collections.h" #include "game/gamestate.h" #include "gfx/gl/shaders/fs-shadowDynamicPointInstWithTextures.h" @@ -21,6 +20,7 @@ #include "sceneProvider.h" #include "sceneShader.h" #include "sorting.h" +#include <gfx/camera.h> #include <glm/gtc/type_ptr.hpp> #include <glm/gtx/transform.hpp> #include <glm/matrix.hpp> diff --git a/test/test-maths.cpp b/test/test-maths.cpp index a6b780a..6f1f030 100644 --- a/test/test-maths.cpp +++ b/test/test-maths.cpp @@ -9,7 +9,7 @@ #include <type_traits> #include <game/network/link.h> -#include <gfx/gl/camera.h> +#include <gfx/camera.h> #include <glm/glm.hpp> #include <maths.h> #include <triangle.h> diff --git a/ui/gameMainSelector.cpp b/ui/gameMainSelector.cpp index e9642ec..a817f69 100644 --- a/ui/gameMainSelector.cpp +++ b/ui/gameMainSelector.cpp @@ -7,7 +7,7 @@ #include <game/selectable.h> #include <game/terrain.h> #include <game/worldobject.h> // IWYU pragma: keep -#include <gfx/gl/camera.h> +#include <gfx/camera.h> #include <optional> #include <stream_support.h> #include <typeinfo> diff --git a/ui/manualCameraController.cpp b/ui/manualCameraController.cpp index 53905eb..fbd0ca3 100644 --- a/ui/manualCameraController.cpp +++ b/ui/manualCameraController.cpp @@ -1,7 +1,7 @@ #include "manualCameraController.h" #include <algorithm> #include <cmath> -#include <gfx/gl/camera.h> +#include <gfx/camera.h> #include <maths.h> bool |