pch migration to modules [wip]

application/application.cpp

@@ -1,4 +1,64 @@
-/*
+module;
+#include <filesystem>
+#include "glad/glad.h"
+#include <GLFW/glfw3.h>
+#include <random>
+#include <thread>
+#include "utilities/Globals_macros.h"
+#include "utilities/utilities_macros.h"
+#include "utilities/translation_macros.h"
+#include "version_info.h"
+#include <chrono>
+#include "utilities/translation_macros.h"
+#if WITH_DISCORD_RPC
+#include "ref/discord-rpc/include/discord_rpc.h"
+#endif
+#if WITH_DISCORD_RPC
+#include <discord_rpc.h>
+#endif
+#include <chrono>
+#include "utilities/translation_macros.h"
+#include "imgui/imgui.h"
+#include "utilities/crashreporter_macros.h"
+#include "widgets/imgui_scale.h"
+#include <iostream>
+#ifdef _WIN32
+#include <windows.h>
+#endif
+#ifdef __unix__
+#include <unistd.h>
+#endif
+#ifdef __unix__
+#include <sys/stat.h>
+#endif
+
+module eu07.application.application;
+import eu07.rendering.screenshot;
+import eu07.utilities.parser;
+import eu07.audio.sound;
+import eu07.glm;
+import eu07.application.drivermode;
+import eu07.application.editormode;
+import eu07.application.scenarioloadermode;
+import eu07.editor.editorterrainstreamer;
+import eu07.input.command;
+import eu07.launcher.launchermode;
+import eu07.model.texture;
+import eu07.simcore;
+import eu07.utilities.globals;
+import eu07.utilities.utilities;
+import eu07.simulation.simulation;
+import eu07.simulation.simulationsounds;
+import eu07.vehicle.train;
+import eu07.utilities.dictionary;
+import eu07.scene.sceneeditor;
+import eu07.rendering.renderer;
+import eu07.application.uilayer;
+import eu07.utilities.logs;
+import eu07.utilities.translation;
+import eu07.utilities.timer;
+import eu07.utilities.crashreporter;
+/*
 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,39 +67,14 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/application.h"
-#include "application/drivermode.h"
-#include "application/editormode.h"
-#include "application/scenarioloadermode.h"
-#include "launcher/launchermode.h"
 
-#include "utilities/Globals.h"
-#include "utilities/utilities.h"
-#include "simulation/simulation.h"
-#include "simulation/simulationsounds.h"
-#include "vehicle/Train.h"
-#include "utilities/dictionary.h"
-#include "scene/sceneeditor.h"
-#include "rendering/renderer.h"
-#include "application/uilayer.h"
-#include "utilities/Logs.h"
-#include "rendering/screenshot.h"
-#include "utilities/translation.h"
-#include "vehicle/Train.h"
-#include "utilities/Timer.h"
-#include "utilities/dictionary.h"
-#include "version_info.h"
-#include <chrono>
-#include "utilities/translation.h"
 
 #if WITH_DISCORD_RPC
-#include "ref/discord-rpc/include/discord_rpc.h"
-#include <discord_rpc.h>
 #endif
 
-#include <chrono>
-#include "utilities/translation.h"
+
+#ifdef _WIN32
+#endif
 
 #ifdef _WIN32
 #pragma comment(lib, "dsound.lib")
@@ -50,8 +85,6 @@ http://mozilla.org/MPL/2.0/.
 #endif
 
 #ifdef __unix__
-#include <unistd.h>
-#include <sys/stat.h>
 #endif
 
 eu07_application Application;

application/application.cppm

@@ -6,15 +6,28 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+#include <memory>
+#include <optional>
+#include <string>
+#include <vector>
+#include "scripting/PyInt_macros.h"
+#include <GLFW/glfw3.h>
+#include <stack>
+
+export module eu07.application.application;
+import eu07.network.manager;
+import eu07.application.applicationmode;
+import eu07.scripting.pyint;
+import eu07.utilities.headtrack;
+#ifdef WITH_UART
+import eu07.utilities.uart;
+#endif
+
+export {
+
 
-#pragma once
-
-#include "application/applicationmode.h"
-#include "scripting/PyInt.h"
-#include "network/manager.h"
-#include "utilities/headtrack.h"
 #ifdef WITH_UART
-#include "utilities/uart.h"
 #endif
 
 class eu07_application {
@@ -130,3 +143,5 @@ private:
 };
 
 extern eu07_application Application;
+
+}  // export

application/applicationmode.cppm

@@ -7,12 +7,16 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include "application/uilayer.h"
 
 // component implementing specific mode of application behaviour
 // base interface
+module;
+#include <memory>
+
+export module eu07.application.applicationmode;
+import eu07.application.uilayer;
+export {
 class application_mode {
 
 public:
@@ -57,3 +61,5 @@ protected:
 // members
     std::shared_ptr<ui_layer> m_userinterface;
 };
+
+}  // export

application/driverhints.cpp

@@ -1,4 +1,14 @@
-/*
+module;
+#include <typeinfo>
+#include <cstdlib>
+#include "utilities/Globals_macros.h"
+#include "utilities/utilities_macros.h"
+
+module eu07.simcore;
+import eu07.application.driverhints;
+import eu07.utilities.globals;
+import eu07.utilities.utilities;
+/*
 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,10 +17,6 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "vehicle/Driver.h"
-#include "utilities/Globals.h"
-#include "utilities/utilities.h"
 
 void
 TController::hint( driver_hint const Value, hintpredicate const Predicate, float const Predicateparameter ) {

application/driverhints.cppm

@@ -0,0 +1,17 @@
+module;
+
+export module eu07.application.driverhints;
+
+export {
+
+// The hint list is an X-macro file expanded once here for the enumerators and
+// again, with a different DRIVER_HINT_DEF, for the texts in driverhints_texts.h.
+#define DRIVER_HINT_DEF(a, b) a,
+
+enum class driver_hint {
+    #include "application/driverhints_def.h"
+};
+
+#undef DRIVER_HINT_DEF
+
+}  // export

application/driverhints.h

@@ -1,21 +0,0 @@
-#ifndef DRIVER_HINT_INCL
-#define DRIVER_HINT_INCL
-#define DRIVER_HINT_DEF(a, b) a,
-
-enum class driver_hint {
-    #include "application/driverhints_def.h"
-};
-
-#undef DRIVER_HINT_DEF
-#endif
-
-#ifdef DRIVER_HINT_CONTENT
-#define DRIVER_HINT_DEF(a, b) b,
-
-const char *driver_hints_texts[] =
-{
-    #include "application/driverhints_def.h"
-};
-
-#undef DRIVER_HINT_DEF
-#endif

application/driverhints_texts.h

@@ -0,0 +1,15 @@
+#pragma once
+
+// The hint texts are built by re-expanding the X-macro list with a different
+// DRIVER_HINT_DEF. A module cannot do that on a consumer's behalf -- the macro
+// state would not cross the boundary -- so this stays a plain header, included
+// in the global module fragment of the single translation unit that needs it.
+
+#define DRIVER_HINT_DEF(a, b) b,
+
+const char *driver_hints_texts[] =
+{
+    #include "application/driverhints_def.h"
+};
+
+#undef DRIVER_HINT_DEF

application/drivermode.cpp

@@ -1,4 +1,37 @@
-/*
+module;
+#include <GLFW/glfw3.h>
+#include <algorithm>
+#include <cmath>
+#include <cstdint>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include "utilities/Globals_macros.h"
+#include "utilities/translation_macros.h"
+#include "vehicle/DynObj_macros.h"
+
+module eu07.application.drivermode;
+import eu07.application.uitranscripts;
+import eu07.application.uilayer;
+import eu07.audio.sound;
+import eu07.utilities.utilities;
+import eu07.application.driveruilayer;
+import eu07.utilities.globals;
+import eu07.application.application;
+import eu07.utilities.translation;
+import eu07.simulation.simulation;
+import eu07.simulation.simulationtime;
+import eu07.simulation.simulationenvironment;
+import eu07.simcore;
+import eu07.rendering.lightarray;
+import eu07.rendering.particles;
+import eu07.vehicle.train;
+import eu07.input.messaging;
+import eu07.utilities.timer;
+import eu07.rendering.renderer;
+import eu07.utilities.logs;
+/*
 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,28 +40,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/drivermode.h"
-#include "application/driveruilayer.h"
 
-#include "utilities/Globals.h"
-#include "application/application.h"
-#include "utilities/translation.h"
-#include "simulation/simulation.h"
-#include "simulation/simulationtime.h"
-#include "simulation/simulationenvironment.h"
-#include "scene/scene.h"
-#include "rendering/lightarray.h"
-#include "rendering/particles.h"
-#include "vehicle/Train.h"
-#include "vehicle/Driver.h"
-#include "vehicle/DynObj.h"
-#include "model/Model3d.h"
-#include "world/Event.h"
-#include "input/messaging.h"
-#include "utilities/Timer.h"
-#include "rendering/renderer.h"
-#include "utilities/Logs.h"
 /*
 namespace input {
 

application/drivermode.cppm

@@ -1,4 +1,30 @@
-/*
+module;
+#include <array>
+#include <memory>
+#include <string>
+#include <utility>
+
+export module eu07.application.drivermode;
+import eu07.utilities.motiontelemetry;
+import eu07.glm;
+import eu07.input.command;
+import eu07.simcore;
+import eu07.application.applicationmode;
+import eu07.input.driverkeyboardinput;
+import eu07.input.drivermouseinput;
+import eu07.input.gamepadinput;
+import eu07.console;
+import eu07.vehicle.camera;
+import eu07.utilities.classes;
+#ifdef WITH_UART
+import eu07.utilities.uart;
+#endif
+#ifdef WITH_ZMQ
+import eu07.input.zmq_input;
+#endif
+
+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,21 +33,11 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include "application/applicationmode.h"
 
-#include "input/driverkeyboardinput.h"
-#include "input/drivermouseinput.h"
-#include "input/gamepadinput.h"
-#include "Console.h"
-#include "vehicle/Camera.h"
-#include "utilities/Classes.h"
 #ifdef WITH_UART
-#include "utilities/uart.h"
 #endif
 #ifdef WITH_ZMQ
-#include "input/zmq_input.h"
 #endif
 
 class driver_mode : public application_mode {
@@ -117,3 +133,5 @@ private:
 	command_relay m_relay;
 	std::string change_train; // train name awaiting entering
 };
+
+}  // export

application/driveruilayer.cpp

@@ -1,4 +1,20 @@
-/*
+module;
+#include "imgui/imgui.h"
+#include <GLFW/glfw3.h>
+#include <string>
+#include "utilities/Globals_macros.h"
+#include "utilities/translation_macros.h"
+
+module eu07.application.driveruilayer;
+import eu07.utilities.utilities;
+import eu07.utilities.globals;
+import eu07.application.application;
+import eu07.utilities.translation;
+import eu07.simulation.simulation;
+import eu07.vehicle.train;
+import eu07.simcore;
+import eu07.rendering.renderer;
+/*
 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,16 +23,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/driveruilayer.h"
 
-#include "utilities/Globals.h"
-#include "application/application.h"
-#include "utilities/translation.h"
-#include "simulation/simulation.h"
-#include "vehicle/Train.h"
-#include "model/AnimModel.h"
-#include "rendering/renderer.h"
 
 driver_ui::driver_ui()
 {

application/driveruilayer.cppm

@@ -1,4 +1,19 @@
-/*
+module;
+
+export module eu07.application.driveruilayer;
+import eu07.application.uilayer;
+import eu07.application.driveruipanels;
+import eu07.input.command;
+import eu07.widgets.vehiclelist;
+import eu07.widgets.vehicleparams;
+import eu07.widgets.map;
+import eu07.widgets.time;
+import eu07.widgets.trainingcard;
+import eu07.widgets.perfgraphs;
+import eu07.widgets.cameraview_extcam;
+
+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,19 +22,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include "application/uilayer.h"
-#include "application/driveruipanels.h"
-#include "input/command.h"
 
-#include "widgets/vehiclelist.h"
-#include "widgets/vehicleparams.h"
-#include "widgets/map.h"
-#include "widgets/time.h"
-#include "widgets/trainingcard.h"
-#include "widgets/perfgraphs.h"
-#include "widgets/cameraview_extcam.h"
 
 class driver_ui : public ui_layer {
 
@@ -70,3 +74,5 @@ private:
 	ui::time_panel m_timepanel;
 	ui::cameraview_panel m_cameraviewpanel;
 };
+
+}  // export

application/driveruipanels.cpp

@@ -1,4 +1,47 @@
-/*
+module;
+#include <GLFW/glfw3.h>
+#include <algorithm>
+#include <cmath>
+#include <limits>
+#include <string>
+#include <vector>
+#include "utilities/Globals_macros.h"
+#include "utilities/translation_macros.h"
+#include "vehicle/DynObj_macros.h"
+#include "utilities/U8_macros.h"
+#include "application/driverhints_texts.h"
+#include "widgets/imgui_scale.h"
+
+module eu07.application.driveruipanels;
+import eu07.mczapkie.hamulce;
+import eu07.audio.sound;
+import eu07.utilities.color;
+import eu07.glm;
+import eu07.application.uilayer;
+import eu07.application.uitranscripts;
+import eu07.input.command;
+import eu07.utilities.utilities;
+import eu07.utilities.globals;
+import eu07.application.application;
+import eu07.utilities.translation;
+import eu07.simulation.simulation;
+import eu07.simulation.simulationtime;
+import eu07.simulation.simulationenvironment;
+import eu07.utilities.timer;
+import eu07.simcore;
+import eu07.vehicle.camera;
+import eu07.world.mtable;
+import eu07.vehicle.train;
+import eu07.rendering.renderer;
+import eu07.utilities.logs;
+import eu07.widgets.vehicleparams;
+import eu07.utilities.u8;
+import eu07.application.driverhints;
+#ifdef WITH_UART
+import eu07.utilities.uart;
+using namespace Mtable;
+#endif
+/*
 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,35 +50,10 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/driveruipanels.h"
 
-#include "utilities/Globals.h"
-#include "application/application.h"
-#include "utilities/translation.h"
-#include "simulation/simulation.h"
-#include "simulation/simulationtime.h"
-#include "simulation/simulationenvironment.h"
-#include "utilities/Timer.h"
-#include "world/Event.h"
-#include "world/TractionPower.h"
-#include "vehicle/Camera.h"
-#include "world/mtable.h"
-#include "vehicle/Train.h"
-#include "vehicle/Driver.h"
-#include "model/AnimModel.h"
-#include "vehicle/DynObj.h"
-#include "model/Model3d.h"
-#include "rendering/renderer.h"
-#include "utilities/Logs.h"
-#include "widgets/vehicleparams.h"
-#include "utilities/U8.h"
 
-#define DRIVER_HINT_CONTENT
-#include "application/driverhints.h"
 
 #ifdef WITH_UART
-#include "utilities/uart.h"
 #endif
 
 void

application/driveruipanels.cppm

@@ -1,4 +1,16 @@
-/*
+module;
+#include <string>
+#include <vector>
+
+export module eu07.application.driveruipanels;
+import eu07.simcore;
+import eu07.vehicle.camera;
+import eu07.vehicle.train;
+import eu07.application.uilayer;
+import eu07.utilities.classes;
+
+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,10 +19,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include "application/uilayer.h"
-#include "utilities/Classes.h"
 
 class drivingaid_panel : public ui_expandable_panel {
 
@@ -149,3 +158,5 @@ public:
     void update() override;
 	void render() override;
 };
+
+}  // export

application/editormode.cpp

@@ -1,4 +1,35 @@
-/*
+module;
+#include <GLFW/glfw3.h>
+#include <algorithm>
+#include <memory>
+#include <string>
+#include "utilities/Globals_macros.h"
+#include "imgui/imgui.h"
+#include "imgui/ImGuizmo.h"
+#include <array>
+#include <cmath>
+#include <functional>
+#include <limits>
+#include <vector>
+
+module eu07.application.editormode;
+import eu07.audio.sound;
+import eu07.rendering.geometrybank;
+import eu07.editor.editorsettings;
+import eu07.utilities.utilities;
+import eu07.glm;
+import eu07.application.application;
+import eu07.utilities.globals;
+import eu07.simulation.simulation;
+import eu07.simulation.simulationtime;
+import eu07.simulation.simulationenvironment;
+import eu07.utilities.timer;
+import eu07.console;
+import eu07.rendering.renderer;
+import eu07.utilities.float3d;
+import eu07.simcore;
+import eu07.utilities.logs;
+/*
 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,35 +38,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/editormode.h"
-#include "application/editoruilayer.h"
-
-#include "application/application.h"
-#include "editor/editorSettings.hpp"
-#include "utilities/Globals.h"
-#include "simulation/simulation.h"
-#include "simulation/simulationtime.h"
-#include "simulation/simulationenvironment.h"
-#include "utilities/Timer.h"
-#include "Console.h"
-#include "rendering/renderer.h"
-#include "model/AnimModel.h"
-#include "model/Model3d.h"
-#include "utilities/Float3d.h"
-#include "scene/scene.h"
 
 
-#include "imgui/imgui.h"
-#include "imgui/ImGuizmo.h"
-#include "utilities/Logs.h"
-#include <glm/gtc/type_ptr.hpp>
-#include <glm/gtc/matrix_transform.hpp>
-#include <array>
-#include <cmath>
-#include <functional>
-#include <limits>
-#include <vector>
+
 
 // Static member initialization
 TCamera editor_mode::Camera;

application/editormode.cppm

@@ -6,20 +6,29 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
-
-#pragma once
-
-#include "application/applicationmode.h"
-#include "input/editormouseinput.h"
-#include "input/editorkeyboardinput.h"
-#include "vehicle/Camera.h"
-#include "scene/sceneeditor.h"
-#include "scene/scenenode.h"
-#include "editor/editorTerrain.hpp"
-#include "editor/editorTerrainStreamer.hpp"
-
+module;
+#include <map>
+#include <vector>
 #include <memory>
 
+export module eu07.application.editormode;
+import eu07.glm;
+import eu07.editor.editorterrain;
+import eu07.input.command;
+import eu07.input.editorkeyboardinput;
+import eu07.utilities.uuid;
+import eu07.application.applicationmode;
+import eu07.input.editormouseinput;
+import eu07.vehicle.camera;
+import eu07.scene.sceneeditor;
+import eu07.simcore;
+import eu07.editor.editorterrainstreamer;
+
+export {
+
+
+
+
 class editor_mode : public application_mode
 {
 
@@ -205,3 +214,5 @@ class editor_mode : public application_mode
 	gizmo_operation m_gizmo_op{gizmo_operation::translate};      // current transform mode (translate/rotate/scale)
 	float m_gizmo_snap{1.0f};                                    // translation snap step (metres) applied while Ctrl is held
 };
+
+}  // export

application/editoruilayer.cpp

@@ -1,4 +1,13 @@
-/*
+module;
+#include <string>
+#include "utilities/Globals_macros.h"
+#include "utilities/utilities_macros.h"
+
+module eu07.simcore;
+import eu07.utilities.globals;
+import eu07.utilities.utilities;
+import eu07.rendering.renderer;
+/*
 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,13 +16,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/editoruilayer.h"
 
-#include "utilities/Globals.h"
-#include "utilities/utilities.h"
-#include "scene/scenenode.h"
-#include "rendering/renderer.h"
 
 editor_ui::editor_ui()
 {

application/editoruilayer.cppm

@@ -1,4 +1,13 @@
-/*
+module;
+#include <string>
+
+export module eu07.simcore:editoruilayer;
+import :fwd;
+import eu07.application.uilayer;
+import :editoruipanels;
+
+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 +16,11 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include "application/uilayer.h"
-#include "application/editoruipanels.h"
 
 namespace scene
 {
 
-class basic_node;
 
 }
 
@@ -46,3 +51,5 @@ class editor_ui : public ui_layer
 	brush_object_list m_brushobjects{"Brush properties", false};
 	scene::basic_node *m_node{nullptr}; // currently bound scene node, if any
 };
+
+}  // export

application/editoruipanels.cpp

@@ -1,4 +1,23 @@
-/*
+module;
+#include <random>
+#include <algorithm>
+#include <fstream>
+#include <ios>
+#include <string>
+#include <typeinfo>
+#include <utility>
+#include <vector>
+#include "global_include/interfaces/ITexture_macros.h"
+#include "utilities/Globals_macros.h"
+#include "widgets/imgui_scale.h"
+
+module eu07.simcore;
+import eu07.utilities.utilities;
+import eu07.scene.scenenodegroups;
+import eu07.utilities.globals;
+import eu07.vehicle.camera;
+import eu07.rendering.renderer;
+/*
 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,18 +26,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/editoruipanels.h"
-#include "scene/scenenodegroups.h"
 
-#include "utilities/Globals.h"
-#include "vehicle/Camera.h"
-#include "model/AnimModel.h"
-#include "world/Track.h"
-#include "world/Event.h"
-#include "world/MemCell.h"
-#include "application/editoruilayer.h"
-#include "rendering/renderer.h"
 
 void itemproperties_panel::update(scene::basic_node *Node)
 {

application/editoruipanels.cppm

@@ -1,4 +1,15 @@
-/*
+module;
+#include "global_include/interfaces/ITexture_macros.h"
+#include <memory>
+#include <vector>
+
+export module eu07.simcore:editoruipanels;
+import :fwd;
+import eu07.application.uilayer;
+import eu07.utilities.classes;
+
+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,10 +18,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include "application/uilayer.h"
-#include "utilities/Classes.h"
 /*
 // helper, associated bool is set when the primary value was changed and expects processing at the observer's leisure
 template<typename Type_>
@@ -128,4 +136,5 @@ class functions_panel : public ui_panel
 	scene::group_handle m_grouphandle{null_handle}; // scene group bound to the panel
 	std::string m_groupprefix;
 	std::vector<text_line> m_grouplines;
-};
+};
+}  // export

application/scenarioloadermode.cpp

@@ -1,3 +1,22 @@
+module;
+#include <GLFW/glfw3.h>
+#include <chrono>
+#include <string>
+#include <typeinfo>
+#include "utilities/Globals_macros.h"
+#include "utilities/translation_macros.h"
+
+module eu07.application.scenarioloadermode;
+import eu07.utilities.classes;
+import eu07.utilities.globals;
+import eu07.simulation.simulation;
+import eu07.simulation.simulationtime;
+import eu07.simulation.simulationenvironment;
+import eu07.application.application;
+import eu07.application.scenarioloaderuilayer;
+import eu07.rendering.renderer;
+import eu07.utilities.logs;
+import eu07.utilities.translation;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,18 +26,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/scenarioloadermode.h"
 
-#include "utilities/Globals.h"
-#include "simulation/simulation.h"
-#include "simulation/simulationtime.h"
-#include "simulation/simulationenvironment.h"
-#include "application/application.h"
-#include "application/scenarioloaderuilayer.h"
-#include "rendering/renderer.h"
-#include "utilities/Logs.h"
-#include "utilities/translation.h"
 
 scenarioloader_mode::scenarioloader_mode() {
     m_userinterface = std::make_shared<scenarioloader_ui>();

application/scenarioloadermode.cppm

@@ -6,11 +6,18 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+#include <chrono>
+#include <memory>
+
+export module eu07.application.scenarioloadermode;
+import eu07.simulation.simulationstateserializer;
+import eu07.application.applicationmode;
+import eu07.simulation.simulation;
+
+export {
 
-#pragma once
 
-#include "application/applicationmode.h"
-#include "simulation/simulation.h"
 
 class scenarioloader_mode : public application_mode {
 	std::shared_ptr<simulation::deserializer_state> state;
@@ -37,3 +44,5 @@ public:
     void on_event_poll() override { ; }
     bool is_command_processor() const override;
 };
+
+}  // export

application/scenarioloaderuilayer.cpp

@@ -1,3 +1,17 @@
+module;
+#include "glad/glad.h"
+#include "imgui/imgui.h"
+#include "utilities/Globals_macros.h"
+#include "utilities/translation_macros.h"
+#include <nlohmann/json.hpp>
+#include <sstream>
+
+module eu07.application.scenarioloaderuilayer;
+import eu07.glm;
+import eu07.utilities.utilities;
+import eu07.utilities.globals;
+import eu07.utilities.translation;
+import eu07.utilities.logs;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,13 +21,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "application/scenarioloaderuilayer.h"
 
-#include "utilities/Globals.h"
-#include "utilities/translation.h"
-#include <nlohmann/json.hpp>
-#include "utilities/Logs.h"
-#include <sstream>
 
 using json = nlohmann::json;
 

application/scenarioloaderuilayer.cppm

@@ -1,4 +1,14 @@
-/*
+module;
+#include "glad/glad.h"
+#include <string>
+#include <vector>
+
+export module eu07.application.scenarioloaderuilayer;
+import eu07.application.uilayer;
+import eu07.launcher.deferred_image;
+
+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,10 +17,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include "application/uilayer.h"
-#include "launcher/deferred_image.h"
 
 class scenarioloader_ui : public ui_layer {
 	int m_gradient_overlay_width;
@@ -36,3 +43,5 @@ private:
 	/// </summary>
 	std::string sceneryName;
 };
+
+}  // export

application/uilayer.cpp

@@ -1,4 +1,31 @@
-/*
+module;
+#include "glad/glad.h"
+#include <GLFW/glfw3.h>
+#include <memory>
+#include <optional>
+#include <string>
+#include "global_include/interfaces/ITexture_macros.h"
+#include <utility>
+#include "utilities/Globals_macros.h"
+#include "utilities/translation_macros.h"
+#include "imgui/imgui.h"
+#include "imgui/imgui_impl_glfw.h"
+#include "imgui/imgui.h"
+#include "widgets/imgui_scale.h"
+
+module eu07.application.uilayer;
+import eu07.simcore;
+import eu07.application.application;
+import eu07.application.editormode;
+import eu07.input.command;
+import eu07.utilities.utilities;
+import eu07.vehicle.camera;
+import eu07.utilities.globals;
+import eu07.rendering.renderer;
+import eu07.utilities.logs;
+import eu07.simulation.simulation;
+import eu07.utilities.translation;
+/*
 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 +34,9 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "application/uilayer.h"
 
-#include <utility>
 
-#include "utilities/Globals.h"
-#include "rendering/renderer.h"
-#include "utilities/Logs.h"
-#include "simulation/simulation.h"
-#include "utilities/translation.h"
-#include "application/application.h"
-#include "application/editormode.h"
 
-#include "imgui/imgui_impl_glfw.h"
 
 GLFWwindow *ui_layer::m_window{nullptr};
 ImGuiIO *ui_layer::m_imguiio{nullptr};

application/uilayer.cppm

@@ -1,4 +1,21 @@
-/*
+module;
+#include "global_include/interfaces/ITexture_macros.h"
+#include "glad/glad.h"
+#include <string>
+#include "imgui/imgui.h"
+#include <GLFW/glfw3.h>
+#include <deque>
+#include <list>
+#include <memory>
+#include <vector>
+
+export module eu07.application.uilayer;
+import eu07.glm;
+import eu07.global_include.interfaces.itexture;
+import eu07.model.texture;
+
+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,11 +24,33 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include <string>
-#include "model/Texture.h"
-#include "widgets/popup.h"
+
+// ui::popup and ui_panel refer to each other, so they have to share a module:
+// a forward declaration cannot cross a module boundary. popup only needs the
+// name, while ui_panel holds popups by value in a list and needs the definition.
+class ui_panel;
+
+namespace ui
+{
+
+class popup
+{
+	std::string m_id;
+	static int id;
+
+  public:
+	popup(ui_panel &panel);
+	virtual ~popup();
+
+    virtual bool render();
+
+  protected:
+	ui_panel &m_parent;
+	virtual void render_content() = 0;
+};
+
+} // namespace ui
 
 // GuiLayer -- basic user interface class. draws requested information on top of openGL screen
 
@@ -66,7 +105,6 @@ class ui_log_panel : public ui_panel {
 	void render_contents() override;
 };
 
-struct ImFont;
 class ui_layer {
 
 public:
@@ -162,3 +200,5 @@ protected:
     bool m_editor_hierarchy = false;
     bool m_editor_change_history = false;
 };
+
+}  // export

application/uitranscripts.cpp

@@ -1,9 +1,14 @@
-#include "stdafx.h"
-#include "application/uitranscripts.h"
+module;
+#include <string>
+#include "utilities/Globals_macros.h"
+#include "utilities/utilities_macros.h"
+#include <algorithm>
+
+module eu07.application.uitranscripts;
+import eu07.utilities.globals;
+import eu07.utilities.parser;
+import eu07.utilities.utilities;
 
-#include "utilities/Globals.h"
-#include "utilities/parser.h"
-#include "utilities/utilities.h"
 
 namespace ui {
 

application/uitranscripts.cppm

@@ -1,9 +1,13 @@
-
-#pragma once
-
+module;
 #include <deque>
 #include <string>
 
+export module eu07.application.uitranscripts;
+
+export {
+
+
+
 namespace ui {
 
 // klasa obsługująca linijkę napisu do dźwięku
@@ -38,4 +42,5 @@ private:
 
 extern TTranscripts Transcripts;
 
-} // namespace ui
+} // namespace ui
+}  // export