pch migration to modules [wip]

2026-11-02 11:39:14 +01:00 · 2026-09-09 20:35:26 +02:00
parent c3007e3237
commit 3f7960aad5
350 changed files with 5958 additions and 3059 deletions
--- a/scene/scene.cpp
+++ b/scene/scene.cpp
@@ -1,4 +1,35 @@
-/*
+module;
+#include "utilities/utilities_macros.h"
+#include "glad/glad.h"
+#include <GLFW/glfw3.h>
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <cstdio>
+#include <cstdlib>
+#include <deque>
+#include <istream>
+#include <iterator>
+#include <limits>
+#include <map>
+#include <ostream>
+#include <string>
+#include <tuple>
+#include <vector>
+#include "global_include/interfaces/ITexture_macros.h"
+#include "utilities/Globals_macros.h"
+
+module eu07.simcore;
+import eu07.simulation.simulation;
+import eu07.rendering.renderer;
+import :mover;
+import eu07.utilities.globals;
+import eu07.glm;
+import eu07.utilities.timer;
+import eu07.scene.sn_utils;
+import eu07.widgets.map_objects;
+/*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
 2.0. If a copy of the MPL was not
@@ -7,20 +38,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */

-#include "stdafx.h"
-#include "scene/scene.h"

-#include "simulation/simulation.h"
-#include "utilities/Globals.h"
-#include "vehicle/Camera.h"
-#include "model/AnimModel.h"
-#include "world/Event.h"
-#include "world/EvLaunch.h"
-#include "utilities/Timer.h"
-#include "utilities/Logs.h"
-#include "scene/sn_utils.h"
-#include "rendering/renderer.h"
-#include "widgets/map_objects.h"

 namespace scene {

--- a/scene/scene.cppm
+++ b/scene/scene.cppm
@@ -1,4 +1,26 @@
-/*
+module;
+#include <iosfwd>
+#include <cmath>
+#include <vector>
+#include <deque>
+#include <array>
+#include <stack>
+#include <unordered_set>
+#include <unordered_map>
+#include <map>
+#include "utilities/utilities_macros.h"
+
+export module eu07.simcore:scene;
+import :fwd;
+import eu07.input.command;
+import eu07.utilities.parser;
+import :scenenode;
+import :track;
+import :traction;
+import eu07.utilities.utilities;
+
+export {
+/*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
 2.0. If a copy of the MPL was not
@@ -7,27 +29,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */

-#pragma once

-#include <vector>
-#include <deque>
-#include <array>
-#include <stack>
-#include <unordered_set>
-#include <unordered_map>
-#include <map>

-#include "utilities/parser.h"
-#include "rendering/geometrybank.h"
-#include "scene/scenenode.h"
-#include "world/Track.h"
-#include "world/Traction.h"
-#include "audio/sound.h"
-#include "input/command.h"
-#include "utilities/utilities.h"

-class opengl_renderer;
-class opengl33_renderer;

 namespace scene {

@@ -77,10 +81,6 @@ struct scratch_data {
 // basic element of rudimentary partitioning scheme for the section. fixed size, no further subdivision
 // TBD, TODO: replace with quadtree scheme?
 class basic_cell {
-
-    friend opengl_renderer;
-    friend opengl33_renderer;
-
 public:
 // constructors
    basic_cell() = default;
@@ -248,10 +248,6 @@ public:

 // basic scene partitioning structure, holds terrain geometry and collection of cells
 class basic_section {
-
-    friend opengl_renderer;
-    friend opengl33_renderer;
-
 public:
 // constructors
    basic_section() = default;
@@ -364,10 +360,6 @@ public:

 // top-level of scene spatial structure, holds collection of sections
 class basic_region {
-
-    friend opengl_renderer;
-    friend opengl33_renderer;
-
 public:
 // constructors
    basic_region();
@@ -496,3 +488,5 @@ extern std::map<std::string, basic_node *> Hierarchy;
 } // scene

 //---------------------------------------------------------------------------
+
+}  // export
--- a/scene/sceneeditor.cpp
+++ b/scene/sceneeditor.cpp
@@ -1,3 +1,17 @@
+module;
+#include <algorithm>
+#include <cmath>
+#include <iterator>
+#include <typeinfo>
+#include "utilities/Globals_macros.h"
+
+module eu07.scene.sceneeditor;
+import eu07.scene.scenenodegroups;
+import eu07.utilities.utilities;
+import eu07.simulation.simulation;
+import eu07.simcore;
+import eu07.utilities.globals;
+import eu07.glm;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,17 +21,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */

-#include "stdafx.h"
-#include "scene/sceneeditor.h"
-#include "scene/scenenodegroups.h"

-#include "utilities/Globals.h"
-#include "application/application.h"
-#include "simulation/simulation.h"
-#include "world/MemCell.h"
-#include "vehicle/Camera.h"
-#include "model/AnimModel.h"
-#include "rendering/renderer.h"

 namespace scene {

--- a/scene/sceneeditor.cppm
+++ b/scene/sceneeditor.cppm
@@ -6,10 +6,15 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+#include <string>
+
+export module eu07.scene.sceneeditor;
+import eu07.glm;
+import eu07.simcore;
+export {

-#pragma once

-#include "scene/scenenode.h"

 namespace scene {

@@ -62,3 +67,5 @@ private:
 } // scene

 //---------------------------------------------------------------------------
+
+}  // export
--- a/scene/scenenode.cpp
+++ b/scene/scenenode.cpp
@@ -1,4 +1,24 @@
-/*
+module;
+#include "glad/glad.h"
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <cstdlib>
+#include <istream>
+#include <iterator>
+#include <limits>
+#include <ostream>
+#include <string>
+#include <vector>
+#include "global_include/interfaces/ITexture_macros.h"
+
+module eu07.simcore;
+import eu07.rendering.renderer;
+import :mover;
+import eu07.utilities.utilities;
+import eu07.utilities.parser;
+import eu07.scene.sn_utils;
+/*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
 2.0. If a copy of the MPL was not
@@ -7,14 +27,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */

-#include "stdafx.h"
-#include "scene/scenenode.h"

-#include "model/Model3d.h"
-#include "rendering/renderer.h"
-#include "utilities/parser.h"
-#include "utilities/Logs.h"
-#include "scene/sn_utils.h"

 // stores content of the struct in provided output stream
 void
--- a/scene/scenenode.cppm
+++ b/scene/scenenode.cppm
@@ -1,4 +1,22 @@
-/*
+module;
+#include "global_include/interfaces/ITexture_macros.h"
+#include <istream>
+#include <ostream>
+#include <string>
+#include <vector>
+
+export module eu07.simcore:scenenode;
+import eu07.glm;
+import :fwd;
+import :model3d;
+import eu07.rendering.geometrybank;
+import eu07.utilities.parser;
+import eu07.utilities.classes;
+import eu07.model.vertex;
+import eu07.utilities.uuid;
+
+export {
+/*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
 2.0. If a copy of the MPL was not
@@ -7,15 +25,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */

-#pragma once

-#include <vector>

-#include "utilities/Classes.h"
-#include "model/material.h"
-#include "model/vertex.h"
-#include "rendering/geometrybank.h"
-#include "../utilities/uuid.hpp"

 struct lighting_data {

@@ -446,3 +457,5 @@ basic_node::group() const {
 } // scene

 //---------------------------------------------------------------------------
+
+}  // export
--- a/scene/scenenodegroups.cpp
+++ b/scene/scenenodegroups.cpp
@@ -1,3 +1,21 @@
+module;
+#include <algorithm>
+#include "utilities/Globals_macros.h"
+#include <cstddef>
+#include <iterator>
+#include <memory>
+#include <ostream>
+#include <string>
+#include <typeinfo>
+#include <unordered_map>
+#include <utility>
+#include "global_include/interfaces/ITexture_macros.h"
+
+module eu07.scene.scenenodegroups;
+import eu07.simulation.simulation;
+import eu07.utilities.globals;
+import eu07.simcore;
+import eu07.widgets.map_objects;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,14 +25,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */

-#include "stdafx.h"
-#include "scene/scenenodegroups.h"

-#include "world/Event.h"
-#include "world/MemCell.h"

-#include "model/AnimModel.h"
-#include "widgets/map_objects.h"

 namespace scene {

--- a/scene/scenenodegroups.cppm
+++ b/scene/scenenodegroups.cppm
@@ -6,11 +6,23 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+#include <cstddef>
+#include <ostream>
+#include <stack>
+#include <string>
+#include <unordered_map>
+#include <vector>
+#include "global_include/interfaces/ITexture_macros.h"
+
+export module eu07.scene.scenenodegroups;
+import eu07.utilities.classes;
+import eu07.simcore;
+import eu07.widgets.map_objects;
+
+export {

-#pragma once

-#include "scene/scenenode.h"
-#include "widgets/map_objects.h"

 namespace scene {

@@ -76,3 +88,5 @@ extern node_groups Groups;
 } // scene

 //---------------------------------------------------------------------------
+
+}  // export
--- a/scene/sn_utils.cpp
+++ b/scene/sn_utils.cpp
@@ -1,9 +1,14 @@
+module;
+#include <cstdint>
+#include <istream>
+#include <ostream>
+
+module eu07.scene.sn_utils;
+import eu07.glm;
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */

-#include "stdafx.h"
-#include "scene/sn_utils.h"

 // sanity checks
 static_assert(std::numeric_limits<double>::is_iec559, "IEEE754 required");
--- a/scene/sn_utils.cppm
+++ b/scene/sn_utils.cppm
@@ -1,8 +1,15 @@
 /* This Source Code Form is subject to the terms of the Mozilla Public
 * License, v. 2.0. If a copy of the MPL was not distributed with this
 * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
-
+module;
 #include <string>
+#include <cstdint>
+
+export module eu07.scene.sn_utils;
+import eu07.glm;
+
+export {
+

 class sn_utils
 {
@@ -35,3 +42,5 @@ public:
 	static void s_vec3(std::ostream&, glm::vec3 const &);
    static void s_vec4(std::ostream&, glm::vec4 const &);
 };
+
+}  // export