Rewrite #includes to use explicit subdirectory paths

Co-authored-by: Hirek193 <23196899+Hirek193@users.noreply.github.com>

rendering/frustum.cpp

@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "frustum.h"
+#include "rendering/frustum.h"
 
 void
 cFrustum::calculate() {

rendering/frustum.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Float3d.h"
-#include "dumb3d.h"
+#include "utilities/Float3d.h"
+#include "utilities/dumb3d.h"
 
 inline std::vector<glm::vec4> const ndcfrustumshapepoints //
     {

rendering/geometrybank.cpp

@@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "geometrybank.h"
-#include "vertex.h"
+#include "rendering/geometrybank.h"
+#include "model/vertex.h"
 
-#include "sn_utils.h"
-#include "Logs.h"
-#include "Globals.h"
+#include "scene/sn_utils.h"
+#include "utilities/Logs.h"
+#include "utilities/Globals.h"
 
 namespace gfx {
 

rendering/geometrybank.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "ResourceManager.h"
+#include "model/ResourceManager.h"
 
 struct world_vertex;
 

rendering/light.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "color.h"
+#include "utilities/color.h"
 
 // a simple light source, either omni- or directional
 struct basic_light {

rendering/lightarray.cpp

@@ -14,8 +14,8 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "lightarray.h"
-#include "DynObj.h"
+#include "rendering/lightarray.h"
+#include "vehicle/DynObj.h"
 
 void
 light_array::insert( TDynamicObject const *Owner ) {

rendering/lightarray.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Classes.h"
+#include "utilities/Classes.h"
 
 // collection of virtual light sources present in the scene
 // used by the renderer to determine most suitable placement for actual light sources during render

rendering/nullrenderer.cpp

@@ -1,5 +1,5 @@
 #include "stdafx.h"
-#include "nullrenderer.h"
+#include "rendering/nullrenderer.h"
 
 std::unique_ptr<gfx_renderer> null_renderer::create_func()
 {

rendering/nullrenderer.h

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "Texture.h"
-#include "geometrybank.h"
-#include "material.h"
-#include "renderer.h"
+#include "model/Texture.h"
+#include "rendering/geometrybank.h"
+#include "model/material.h"
+#include "rendering/renderer.h"
 #include "stdafx.h"
 #include <glm/fwd.hpp>
 #include <stdexcept>

rendering/opengl33geometrybank.cpp

@@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "opengl33geometrybank.h"
+#include "rendering/opengl33geometrybank.h"
 
-#include "Logs.h"
+#include "utilities/Logs.h"
 
 namespace gfx {
 

rendering/opengl33geometrybank.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "geometrybank.h"
+#include "rendering/geometrybank.h"
 #include "gl/buffer.h"
 #include "gl/vao.h"
 

rendering/opengl33light.cpp

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #include "stdafx.h"
 
-#include "opengl33light.h"
+#include "rendering/opengl33light.h"
 
 void opengl33_light::apply_intensity(float const Factor) {
 

rendering/opengl33light.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "light.h"
+#include "rendering/light.h"
 
 struct opengl33_light : public basic_light {
 

rendering/opengl33particles.cpp

@@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "opengl33particles.h"
+#include "rendering/opengl33particles.h"
 
-#include "particles.h"
-#include "openglcamera.h"
-#include "simulation.h"
-#include "simulationenvironment.h"
+#include "rendering/particles.h"
+#include "rendering/openglcamera.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationenvironment.h"
 
 std::vector<std::pair<glm::vec3, glm::vec2>> const billboard_vertices {
 

rendering/opengl33precipitation.cpp

@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "opengl33precipitation.h"
+#include "rendering/opengl33precipitation.h"
 
-#include "Globals.h"
-#include "renderer.h"
-#include "simulationenvironment.h"
+#include "utilities/Globals.h"
+#include "rendering/renderer.h"
+#include "simulation/simulationenvironment.h"
 
 opengl33_precipitation::~opengl33_precipitation() {
     // TODO: release allocated resources

rendering/opengl33precipitation.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma	once
 
-#include "Texture.h"
+#include "model/Texture.h"
 #include "gl/vao.h"
 #include "gl/shader.h"
 

rendering/opengl33renderer.cpp

@@ -8,20 +8,20 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "opengl33renderer.h"
-#include "color.h"
-#include "Globals.h"
-#include "Timer.h"
-#include "Train.h"
-#include "Camera.h"
-#include "simulation.h"
-#include "Logs.h"
-#include "utilities.h"
-#include "simulationtime.h"
-#include "application.h"
-#include "AnimModel.h"
-#include "opengl33geometrybank.h"
-#include "screenshot.h"
+#include "rendering/opengl33renderer.h"
+#include "utilities/color.h"
+#include "utilities/Globals.h"
+#include "utilities/Timer.h"
+#include "vehicle/Train.h"
+#include "vehicle/Camera.h"
+#include "simulation/simulation.h"
+#include "utilities/Logs.h"
+#include "utilities/utilities.h"
+#include "simulation/simulationtime.h"
+#include "application/application.h"
+#include "model/AnimModel.h"
+#include "rendering/opengl33geometrybank.h"
+#include "rendering/screenshot.h"
 #include <imgui/imgui_impl_opengl3.h>
 
 //#define EU07_DEBUG_OPENGL

rendering/opengl33renderer.h

@@ -9,16 +9,16 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "renderer.h"
-#include "openglcamera.h"
-#include "opengl33light.h"
-#include "opengl33particles.h"
-#include "opengl33skydome.h"
-#include "opengl33precipitation.h"
-#include "simulationenvironment.h"
-#include "scene.h"
-#include "MemCell.h"
-#include "lightarray.h"
+#include "rendering/renderer.h"
+#include "rendering/openglcamera.h"
+#include "rendering/opengl33light.h"
+#include "rendering/opengl33particles.h"
+#include "rendering/opengl33skydome.h"
+#include "rendering/opengl33precipitation.h"
+#include "simulation/simulationenvironment.h"
+#include "scene/scene.h"
+#include "world/MemCell.h"
+#include "rendering/lightarray.h"
 #include "vr/vr_interface.h"
 #include "gl/ubo.h"
 #include "gl/framebuffer.h"

rendering/opengl33skydome.cpp

@@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "opengl33skydome.h"
+#include "rendering/opengl33skydome.h"
 
-#include "simulationenvironment.h"
+#include "simulation/simulationenvironment.h"
 
 void opengl33_skydome::update() {
 

rendering/openglcamera.cpp

@@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "openglcamera.h"
+#include "rendering/openglcamera.h"
 
-#include "DynObj.h"
+#include "vehicle/DynObj.h"
 
 void
 opengl_camera::update_frustum( glm::mat4 const &Projection, glm::mat4 const &Modelview ) {

rendering/openglcamera.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "frustum.h"
-#include "scene.h"
+#include "rendering/frustum.h"
+#include "scene/scene.h"
 
 // simple camera object. paired with 'virtual camera' in the scene
 class opengl_camera {

rendering/openglcolor.cpp

@@ -8,7 +8,7 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "openglcolor.h"
+#include "rendering/openglcolor.h"
 
 opengl_color OpenGLColor;
 

rendering/openglcolor.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Globals.h"
+#include "utilities/Globals.h"
 
 // encapsulation of the fixed pipeline opengl color
 class opengl_color {

rendering/openglgeometrybank.cpp

@@ -8,10 +8,10 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "openglgeometrybank.h"
-#include "openglcolor.h"
+#include "rendering/openglgeometrybank.h"
+#include "rendering/openglcolor.h"
 
-#include "Logs.h"
+#include "utilities/Logs.h"
 
 namespace gfx {
 

rendering/openglgeometrybank.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "geometrybank.h"
+#include "rendering/geometrybank.h"
 
 namespace gfx {
 

rendering/opengllight.cpp

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #include "stdafx.h"
 
-#include "opengllight.h"
-#include "utilities.h"
+#include "rendering/opengllight.h"
+#include "utilities/utilities.h"
 
 void
 opengl_light::apply_intensity( float const Factor ) {

rendering/opengllight.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "light.h"
+#include "rendering/light.h"
 
 struct opengl_light : public basic_light {
 

rendering/openglparticles.cpp

@@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "openglparticles.h"
+#include "rendering/openglparticles.h"
 
-#include "particles.h"
-#include "openglcamera.h"
-#include "simulation.h"
-#include "Logs.h"
+#include "rendering/particles.h"
+#include "rendering/openglcamera.h"
+#include "simulation/simulation.h"
+#include "utilities/Logs.h"
 
 std::vector<std::pair<glm::vec3, glm::vec2>> const billboard_vertices {
 

rendering/openglprecipitation.cpp

@@ -8,11 +8,11 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "openglprecipitation.h"
+#include "rendering/openglprecipitation.h"
 
-#include "Globals.h"
-#include "renderer.h"
-#include "simulationenvironment.h"
+#include "utilities/Globals.h"
+#include "rendering/renderer.h"
+#include "simulation/simulationenvironment.h"
 
 opengl_precipitation::~opengl_precipitation() {
 

rendering/openglprecipitation.h

@@ -9,7 +9,7 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma	once
 
-#include "Texture.h"
+#include "model/Texture.h"
 
 class opengl_precipitation {
 

rendering/openglrenderer.cpp

@@ -8,24 +8,24 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "openglrenderer.h"
+#include "rendering/openglrenderer.h"
 
-#include "color.h"
-#include "Globals.h"
-#include "Camera.h"
-#include "Timer.h"
-#include "simulation.h"
-#include "simulationtime.h"
-#include "Train.h"
-#include "DynObj.h"
-#include "AnimModel.h"
-#include "Traction.h"
-#include "application.h"
-#include "Logs.h"
-#include "utilities.h"
-#include "openglgeometrybank.h"
-#include "openglcolor.h"
-#include "screenshot.h"
+#include "utilities/color.h"
+#include "utilities/Globals.h"
+#include "vehicle/Camera.h"
+#include "utilities/Timer.h"
+#include "simulation/simulation.h"
+#include "simulation/simulationtime.h"
+#include "vehicle/Train.h"
+#include "vehicle/DynObj.h"
+#include "model/AnimModel.h"
+#include "world/Traction.h"
+#include "application/application.h"
+#include "utilities/Logs.h"
+#include "utilities/utilities.h"
+#include "rendering/openglgeometrybank.h"
+#include "rendering/openglcolor.h"
+#include "rendering/screenshot.h"
 #include <imgui/imgui_impl_opengl2.h>
 
 int const EU07_PICKBUFFERSIZE { 1024 }; // size of (square) textures bound with the pick framebuffer

rendering/openglrenderer.h

@@ -9,16 +9,16 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "renderer.h"
-#include "opengllight.h"
-#include "openglcamera.h"
-#include "openglparticles.h"
-#include "openglskydome.h"
-#include "openglprecipitation.h"
-#include "lightarray.h"
-#include "scene.h"
-#include "simulationenvironment.h"
-#include "MemCell.h"
+#include "rendering/renderer.h"
+#include "rendering/opengllight.h"
+#include "rendering/openglcamera.h"
+#include "rendering/openglparticles.h"
+#include "rendering/openglskydome.h"
+#include "rendering/openglprecipitation.h"
+#include "rendering/lightarray.h"
+#include "scene/scene.h"
+#include "simulation/simulationenvironment.h"
+#include "world/MemCell.h"
 
 #define EU07_USE_PICKING_FRAMEBUFFER
 //#define EU07_USE_DEBUG_SHADOWMAP

rendering/openglskydome.cpp

@@ -8,9 +8,9 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "openglskydome.h"
+#include "rendering/openglskydome.h"
 
-#include "simulationenvironment.h"
+#include "simulation/simulationenvironment.h"
 
 opengl_skydome::~opengl_skydome() {
 

rendering/particles.cpp

@@ -8,13 +8,13 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "particles.h"
+#include "rendering/particles.h"
 
-#include "Timer.h"
-#include "Globals.h"
-#include "AnimModel.h"
-#include "simulationenvironment.h"
-#include "Logs.h"
+#include "utilities/Timer.h"
+#include "utilities/Globals.h"
+#include "model/AnimModel.h"
+#include "simulation/simulationenvironment.h"
+#include "utilities/Logs.h"
 
 
 void

rendering/particles.h

@@ -9,8 +9,8 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Classes.h"
-#include "scene.h"
+#include "utilities/Classes.h"
+#include "scene/scene.h"
 
 // particle specialized for drawing smoke
 // given smoke features we can take certain shortcuts

rendering/precipitation.cpp

@@ -8,12 +8,12 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "precipitation.h"
+#include "rendering/precipitation.h"
 
-#include "Globals.h"
-#include "Timer.h"
-#include "simulation.h"
-#include "Train.h"
+#include "utilities/Globals.h"
+#include "utilities/Timer.h"
+#include "simulation/simulation.h"
+#include "vehicle/Train.h"
 
 basic_precipitation::~basic_precipitation() {
     // TODO: release allocated resources

rendering/renderer.cpp

@@ -8,8 +8,8 @@ http://mozilla.org/MPL/2.0/.
 */
 
 #include "stdafx.h"
-#include "renderer.h"
-#include "Logs.h"
+#include "rendering/renderer.h"
+#include "utilities/Logs.h"
 
 std::unique_ptr<gfx_renderer> GfxRenderer;
 

rendering/renderer.h

@@ -9,10 +9,10 @@ http://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "geometrybank.h"
+#include "rendering/geometrybank.h"
 #include "interfaces/IMaterial.h"
 #include "interfaces/ITexture.h"
-#include "Globals.h"
+#include "utilities/Globals.h"
 
 struct lighting_data;
 

rendering/screenshot.cpp

@@ -1,7 +1,7 @@
 #include "stdafx.h"
-#include "screenshot.h"
-#include "Globals.h"
-#include "Logs.h"
+#include "rendering/screenshot.h"
+#include "utilities/Globals.h"
+#include "utilities/Logs.h"
 #include <png.h>
 
 void screenshot_manager::screenshot_save_thread( char *img, int w, int h )