pch migration to modules [wip]

launcher/deferred_image.cppm

@@ -1,7 +1,16 @@
-#pragma once
+module;
+#include "glad/glad.h"
+#include <string>
+#include "global_include/interfaces/ITexture_macros.h"
+
+export module eu07.launcher.deferred_image;
+import eu07.glm;
+import eu07.global_include.interfaces.itexture;
+import eu07.model.texture;
+import eu07.rendering.renderer;
+
+export {
 
-#include "model/Texture.h"
-#include "rendering/renderer.h"
 
 class deferred_image {
 public:
@@ -46,3 +55,5 @@ private:
 	mutable std::string path;
 	mutable texture_handle image = 0;
 };
+
+}  // export

launcher/keymapper.cpp

@@ -1,6 +1,17 @@
-#include "stdafx.h"
-#include "keymapper.h"
-#include "simulation/simulation.h"
+module;
+#include "utilities/translation_macros.h"
+#include <string>
+#include <tuple>
+#include <utility>
+#include "utilities/Globals_macros.h"
+#include "imgui/imgui.h"
+
+module eu07.launcher.keymapper;
+import eu07.utilities.utilities;
+import eu07.utilities.translation;
+import eu07.input.keyboardinput;
+import eu07.utilities.globals;
+import eu07.simulation.simulation;
 
 ui::keymapper_panel::keymapper_panel()
     : ui_panel(STR("Keymapper"), false)

launcher/keymapper.cppm

@@ -1,7 +1,13 @@
-#pragma once
+module;
+#include <string>
+
+export module eu07.launcher.keymapper;
+import eu07.input.command;
+import eu07.application.uilayer;
+import eu07.input.driverkeyboardinput;
+
+export {
 
-#include "application/uilayer.h"
-#include "input/driverkeyboardinput.h"
 
 namespace ui
 {
@@ -19,3 +25,5 @@ private:
 	const std::string panelname = (title.empty() ? m_name : title) + "###" + m_name;
 };
 } // namespace ui
+
+}  // export

launcher/launchermode.cpp

@@ -1,9 +1,13 @@
-#include "stdafx.h"
-#include "launcher/launchermode.h"
-#include "launcher/launcheruilayer.h"
-#include "application/application.h"
-#include "simulation/simulation.h"
-#include "utilities/Globals.h"
+module;
+#include <GLFW/glfw3.h>
+#include <memory>
+#include "utilities/Globals_macros.h"
+
+module eu07.launcher.launchermode;
+import eu07.launcher.launcheruilayer;
+import eu07.application.application;
+import eu07.simulation.simulation;
+import eu07.utilities.globals;
 
 launcher_mode::launcher_mode()
 {

launcher/launchermode.cppm

@@ -6,10 +6,14 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+
+export module eu07.launcher.launchermode;
+import eu07.application.applicationmode;
+
+export {
 
-#pragma once
 
-#include "application/applicationmode.h"
 
 class launcher_mode : public application_mode {
 
@@ -34,3 +38,5 @@ public:
 	void on_event_poll() override { ; }
 	bool is_command_processor() const override { return false; }
 };
+
+}  // export

launcher/launcheruilayer.cpp

@@ -1,7 +1,13 @@
-#include "stdafx.h"
-#include "launcher/launcheruilayer.h"
-#include "application/application.h"
-#include "utilities/translation.h"
+module;
+#include "utilities/Globals_macros.h"
+#include "utilities/translation_macros.h"
+#include "imgui/imgui.h"
+
+module eu07.launcher.launcheruilayer;
+import eu07.utilities.globals;
+import eu07.glm;
+import eu07.application.application;
+import eu07.utilities.translation;
 
 launcher_ui::launcher_ui() : m_scenery_scanner(m_vehicles_bank), m_scenerylist_panel(m_scenery_scanner)
 {

launcher/launcheruilayer.cppm

@@ -6,15 +6,19 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+
+export module eu07.launcher.launcheruilayer;
+import eu07.application.uilayer;
+import eu07.launcher.scenery_list;
+import eu07.launcher.keymapper;
+import eu07.launcher.vehicle_picker;
+import eu07.launcher.textures_scanner;
+import eu07.launcher.scenery_scanner;
+
+export {
 
-#pragma once
 
-#include "application/uilayer.h"
-#include "launcher/scenery_list.h"
-#include "launcher/keymapper.h"
-#include "launcher/vehicle_picker.h"
-#include "launcher/textures_scanner.h"
-#include "launcher/scenery_scanner.h"
 
 class launcher_ui : public ui_layer {
 public:
@@ -36,3 +40,5 @@ private:
 
 	ui_panel *m_current_panel;
 };
+
+}  // export

launcher/scenery_list.cpp

@@ -1,14 +1,23 @@
-#include "stdafx.h"
-#include "scenery_list.h"
+module;
+#include "utilities/Globals_macros.h"
+#include <vector>
+#include "global_include/interfaces/ITexture_macros.h"
 #include "imgui/imgui.h"
-#include "utilities/utilities.h"
-#include "rendering/renderer.h"
-#include "application/application.h"
-#include "utilities/Logs.h"
-#include "utilities/translation.h"
-
+#include "utilities/utilities_macros.h"
+#include "utilities/translation_macros.h"
 #include <filesystem>
 
+module eu07.launcher.scenery_list;
+import eu07.utilities.globals;
+import eu07.glm;
+import eu07.launcher.textures_scanner;
+import eu07.utilities.utilities;
+import eu07.rendering.renderer;
+import eu07.application.application;
+import eu07.utilities.logs;
+import eu07.utilities.translation;
+
+
 ui::scenerylist_panel::scenerylist_panel(scenery_scanner &scanner)
     : ui_panel(STR("Scenario list"), false), scanner(scanner), placeholder_mini("textures/mini/other")
 {

launcher/scenery_list.cppm

@@ -1,9 +1,17 @@
-#pragma once
+module;
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <string>
+
+export module eu07.launcher.scenery_list;
+import eu07.launcher.deferred_image;
+import eu07.input.driverkeyboardinput;
+import eu07.application.uilayer;
+import eu07.launcher.scenery_scanner;
+
+export {
 
-#include "input/driverkeyboardinput.h"
-#include "application/uilayer.h"
-#include "scenery_scanner.h"
-#include "widgets/popup.h"
 
 namespace ui
 {
@@ -70,3 +78,5 @@ private:
 	void purge_selected_trainset();
 };
 } // namespace ui
+
+}  // export

launcher/scenery_scanner.cpp

@@ -1,6 +1,14 @@
-#include "stdafx.h"
-#include "scenery_scanner.h"
-#include "utilities/Logs.h"
+module;
+#include <algorithm>
+#include <cstddef>
+#include <filesystem>
+#include <memory>
+#include <sstream>
+#include <string>
+
+module eu07.launcher.scenery_scanner;
+import eu07.utilities.utilities;
+import eu07.utilities.logs;
 
 scenery_scanner::scenery_scanner(ui::vehicles_bank &bank)
     : bank(bank)

launcher/scenery_scanner.cppm

@@ -1,9 +1,16 @@
-#pragma once
-
+module;
+#include <map>
+#include <vector>
 #include <filesystem>
-#include "model/Texture.h"
-#include "utilities/parser.h"
-#include "textures_scanner.h"
+
+export module eu07.launcher.scenery_scanner;
+import eu07.global_include.interfaces.itexture;
+import eu07.model.texture;
+import eu07.utilities.parser;
+import eu07.launcher.textures_scanner;
+
+export {
+
 
 struct dynamic_desc {
 	std::string name;
@@ -69,3 +76,5 @@ private:
 
 	ui::vehicles_bank &bank;
 };
+
+}  // export

launcher/textures_scanner.cpp

@@ -1,6 +1,15 @@
-#include "stdafx.h"
-#include "textures_scanner.h"
-#include "utilities/utilities.h"
+module;
+#include <algorithm>
+#include <unordered_map>
+#include <filesystem>
+#include <fstream>
+#include <memory>
+#include <string>
+#include "utilities/utilities_macros.h"
+
+module eu07.launcher.textures_scanner;
+import eu07.rendering.geometrybank;
+import eu07.utilities.utilities;
 
 void ui::vehicles_bank::scan_textures()
 {

launcher/textures_scanner.cppm

@@ -1,6 +1,17 @@
-#pragma once
+module;
+#include <filesystem>
+#include <map>
+#include <memory>
+#include <string>
+#include <unordered_map>
+#include <vector>
+#include <set>
+
+export module eu07.launcher.textures_scanner;
+import eu07.launcher.deferred_image;
+
+export {
 
-#include "deferred_image.h"
 
 namespace ui {
 enum class vehicle_type {
@@ -95,3 +106,5 @@ private:
 	std::string ctx_model;
 };
 }
+
+}  // export

launcher/vehicle_picker.cpp

@@ -1,7 +1,19 @@
-#include "stdafx.h"
-#include "launcher/vehicle_picker.h"
-#include "rendering/renderer.h"
-#include "utilities/translation.h"
+module;
+#include "glad/glad.h"
+#include "imgui/imgui.h"
+#include <algorithm>
+#include <cstdint>
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+#include "utilities/translation_macros.h"
+
+module eu07.launcher.vehicle_picker;
+import eu07.utilities.utilities;
+import eu07.glm;
+import eu07.rendering.renderer;
+import eu07.utilities.translation;
 
 ui::vehiclepicker_panel::vehiclepicker_panel()
     : ui_panel(STR("Select vehicle"), false), placeholder_mini("textures/mini/other")

launcher/vehicle_picker.cppm

@@ -1,8 +1,19 @@
-#pragma once
+module;
+#include <array>
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+#include "utilities/translation_macros.h"
+
+export module eu07.launcher.vehicle_picker;
+import eu07.launcher.deferred_image;
+import eu07.application.uilayer;
+import eu07.launcher.textures_scanner;
+import eu07.utilities.translation;
+
+export {
 
-#include "application/uilayer.h"
-#include "textures_scanner.h"
-#include "utilities/translation.h"
 
 namespace ui {
 
@@ -63,3 +74,5 @@ private:
 	bool skin_filter(const skin_set *skin, std::vector<search_info> &info_list);
 };
 } // namespace ui
+
+}  // export