pch migration to modules [wip]

input/command.cpp

@@ -1,3 +1,17 @@
+module;
+#include <GLFW/glfw3.h>
+#include <cstdint>
+#include <string>
+#include <unordered_map>
+#include "utilities/Globals_macros.h"
+
+module eu07.input.command;
+import eu07.utilities.utilities;
+import eu07.utilities.globals;
+import eu07.utilities.logs;
+import eu07.utilities.timer;
+import eu07.simulation.simulation;
+import eu07.vehicle.train;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,14 +21,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "input/command.h"
 
-#include "utilities/Globals.h"
-#include "utilities/Logs.h"
-#include "utilities/Timer.h"
-#include "simulation/simulation.h"
-#include "vehicle/Train.h"
 
 namespace simulation {
 

input/command.cppm

@@ -6,12 +6,19 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
-
-#pragma once
-
+module;
 #include <unordered_map>
 #include <queue>
 #include <unordered_set>
+#include <cstdint>
+#include <string>
+
+export module eu07.input.command;
+import eu07.glm;
+
+export {
+
+
 
 enum class user_command
 {
@@ -536,3 +543,5 @@ private:
 };
 
 //---------------------------------------------------------------------------
+
+}  // export

input/driverkeyboardinput.cpp

@@ -1,3 +1,8 @@
+module;
+#include <GLFW/glfw3.h>
+
+module eu07.input.driverkeyboardinput;
+import eu07.input.command;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,8 +12,6 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "input/driverkeyboardinput.h"
 
 bool
 driverkeyboard_input::init() {

input/driverkeyboardinput.cppm

@@ -6,10 +6,14 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+
+export module eu07.input.driverkeyboardinput;
+import eu07.input.keyboardinput;
+
+export {
 
-#pragma once
 
-#include "input/keyboardinput.h"
 
 class driverkeyboard_input : public keyboard_input {
 
@@ -25,3 +29,5 @@ protected:
 };
 
 //---------------------------------------------------------------------------
+
+}  // export

input/drivermouseinput.cpp

@@ -1,3 +1,34 @@
+module;
+#include <filesystem>
+#include <GLFW/glfw3.h>
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <functional>
+#include <string>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+#include "utilities/Globals_macros.h"
+#include "utilities/Globals_macros.h"
+#include "utilities/utilities_macros.h"
+#ifdef _WIN32
+#include <windows.h>
+#endif
+
+module eu07.input.drivermouseinput;
+import eu07.utilities.parser;
+import eu07.mczapkie.hamulce;
+import eu07.utilities.globals;
+import eu07.application.application;
+import eu07.utilities.timer;
+import eu07.simulation.simulation;
+import eu07.vehicle.train;
+import eu07.simcore;
+import eu07.rendering.renderer;
+import eu07.application.uilayer;
+import eu07.utilities.logs;
+import eu07.utilities.utilities;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,20 +38,10 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "input/drivermouseinput.h"
 
-#include "utilities/Globals.h"
-#include "application/application.h"
-#include "utilities/Globals.h"
-#include "utilities/Timer.h"
-#include "simulation/simulation.h"
-#include "vehicle/Train.h"
-#include "model/AnimModel.h"
-#include "rendering/renderer.h"
-#include "application/uilayer.h"
-#include "utilities/Logs.h"
-#include "utilities/utilities.h"
+
+#ifdef _WIN32
+#endif
 
 auto const EU07_CONTROLLER_MOUSESLIDERSIZE{ 0.6 };
 

input/drivermouseinput.cppm

@@ -7,12 +7,20 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include <unordered_map>
-#include "input/command.h"
 
 // virtual slider; value determined by position of the mouse
+module;
+#include <unordered_map>
+#include <GLFW/glfw3.h>
+#include <string>
+#include <array>
+
+export module eu07.input.drivermouseinput;
+import eu07.glm;
+import eu07.input.command;
+
+export {
 class mouse_slider {
 
 public:
@@ -111,4 +119,5 @@ private:
     bool m_pickwaiting;
 };
 
-//---------------------------------------------------------------------------
+//---------------------------------------------------------------------------
+}  // export

input/editorkeyboardinput.cpp

@@ -1,3 +1,9 @@
+module;
+#include <GLFW/glfw3.h>
+
+module eu07.input.editorkeyboardinput;
+import eu07.input.command;
+import eu07.editor.editorsettings;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,9 +13,6 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "input/editorkeyboardinput.h"
-#include "editor/editorSettings.hpp"
 
 bool
 editorkeyboard_input::init() {

input/editorkeyboardinput.cppm

@@ -6,10 +6,14 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+
+export module eu07.input.editorkeyboardinput;
+import eu07.input.keyboardinput;
+
+export {
 
-#pragma once
 
-#include "input/keyboardinput.h"
 
 class editorkeyboard_input : public keyboard_input {
 
@@ -28,3 +32,5 @@ protected:
 };
 
 //---------------------------------------------------------------------------
+
+}  // export

input/editormouseinput.cpp

@@ -1,3 +1,8 @@
+module;
+#include <GLFW/glfw3.h>
+
+module eu07.input.editormouseinput;
+import eu07.glm;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,8 +12,6 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "input/editormouseinput.h"
 
 bool
 editormouse_input::init() {

input/editormouseinput.cppm

@@ -6,10 +6,16 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
+module;
+#include <GLFW/glfw3.h>
+#include <array>
+
+export module eu07.input.editormouseinput;
+import eu07.input.command;
+import eu07.glm;
+export {
 
-#pragma once
 
-#include "input/command.h"
 
 class editormouse_input {
 
@@ -43,3 +49,5 @@ private:
 };
 
 //---------------------------------------------------------------------------
+
+}  // export

input/gamepadinput.cpp

@@ -1,3 +1,18 @@
+module;
+#include <filesystem>
+#include <cmath>
+#include <cstdlib>
+#include <string>
+#include "utilities/utilities_macros.h"
+#include <GLFW/glfw3.h>
+#include <functional>
+
+module eu07.input.gamepadinput;
+import eu07.glm;
+import eu07.utilities.logs;
+import eu07.utilities.timer;
+import eu07.utilities.utilities;
+import eu07.utilities.parser;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,12 +22,6 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "input/gamepadinput.h"
-#include "utilities/Logs.h"
-#include "utilities/Timer.h"
-#include "utilities/utilities.h"
-#include "utilities/parser.h"
 
 glm::vec2 circle_to_square( glm::vec2 const &Point, int const Roundness = 0 ) {
 

input/gamepadinput.cppm

@@ -6,12 +6,18 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
-
-#pragma once
-
+module;
+#include <string>
+#include <unordered_map>
 #include <vector>
-#include "input/command.h"
-#include "utilities/parser.h"
+
+export module eu07.input.gamepadinput;
+import eu07.input.command;
+import eu07.utilities.parser;
+
+export {
+
+
 
 class gamepad_input {
 
@@ -93,3 +99,5 @@ private:
 };
 
 //---------------------------------------------------------------------------
+
+}  // export

input/keyboardinput.cpp

@@ -1,3 +1,22 @@
+module;
+#include <filesystem>
+#include <array>
+#include <cstddef>
+#include <fstream>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
+#include "utilities/Globals_macros.h"
+#include "utilities/utilities_macros.h"
+#include <GLFW/glfw3.h>
+
+module eu07.input.keyboardinput;
+import eu07.rendering.geometrybank;
+import eu07.utilities.globals;
+import eu07.utilities.logs;
+import eu07.utilities.parser;
+import eu07.utilities.utilities;
 /*
 This Source Code Form is subject to the
 terms of the Mozilla Public License, v.
@@ -7,12 +26,6 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "input/keyboardinput.h"
-#include "utilities/Globals.h"
-#include "utilities/Logs.h"
-#include "utilities/parser.h"
-#include "utilities/utilities.h"
 
 namespace input {
 

input/keyboardinput.cppm

@@ -6,12 +6,21 @@ distributed with this file, You can
 obtain one at
 http://mozilla.org/MPL/2.0/.
 */
-
-#pragma once
-
+module;
 #include <unordered_map>
 #include <array>
-#include "input/command.h"
+#include <GLFW/glfw3.h>
+#include <map>
+#include <string>
+
+export module eu07.input.keyboardinput;
+import eu07.glm;
+import eu07.application.uitranscripts;
+import eu07.input.command;
+
+export {
+
+
 
 namespace input {
 
@@ -22,12 +31,7 @@ extern bool key_shift;
 
 }
 
-namespace ui {
-class keymapper_panel;
-}
-
 class keyboard_input {
-    friend class ui::keymapper_panel;
 
 public:
 // types
@@ -79,8 +83,11 @@ protected:
         default_bindings() = 0;
     bool
         recall_bindings();
+public:
+    // the keymapper widget rebinds keys through this
     void
         bind();
+protected:
 
 // members
 	bindingsetup_sequence m_bindingsetups;
@@ -114,3 +121,5 @@ private:
 };
 
 //---------------------------------------------------------------------------
+
+}  // export

input/messaging.cpp

@@ -1,4 +1,27 @@
-/*
+module;
+#include "winheaders.h"
+#include "utilities/utilities_macros.h"
+#include <typeinfo>
+#include <GLFW/glfw3.h>
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <string>
+#include "utilities/Globals_macros.h"
+#include "vehicle/DynObj_macros.h"
+
+module eu07.input.messaging;
+import eu07.utilities.utilities;
+import eu07.glm;
+import eu07.input.command;
+import eu07.utilities.globals;
+import eu07.application.application;
+import eu07.simulation.simulation;
+import eu07.simulation.simulationtime;
+import eu07.simcore;
+import eu07.world.mtable;
+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,18 +30,7 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#include "stdafx.h"
-#include "input/messaging.h"
 
-#include "utilities/Globals.h"
-#include "application/application.h"
-#include "simulation/simulation.h"
-#include "simulation/simulationtime.h"
-#include "world/Event.h"
-#include "vehicle/DynObj.h"
-#include "vehicle/Driver.h"
-#include "world/mtable.h"
-#include "utilities/Logs.h"
 
 #ifdef _WIN32
 extern "C"

input/messaging.cppm

@@ -1,4 +1,12 @@
-/*
+module;
+#include <string>
+#include "winheaders.h"
+
+export module eu07.input.messaging;
+import eu07.simcore;
+
+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,12 +15,8 @@ obtain one at
 http://mozilla.org/MPL/2.0/.
 */
 
-#pragma once
 
-#include <string>
-#include "winheaders.h"
 
-class TDynamicObject;
 
 namespace multiplayer {
 
@@ -51,3 +55,5 @@ void WyslijObsadzone(); // -> skladanie wielu pojazdow
 } // multiplayer
 
 //---------------------------------------------------------------------------
+
+}  // export

input/zmq_input.cpp

@@ -1,10 +1,18 @@
-#include "stdafx.h"
-#include "input/zmq_input.h"
-#include "utilities/Globals.h"
-#include "utilities/Logs.h"
-#include "simulation/simulation.h"
-#include "simulation/simulationtime.h"
-#include "vehicle/Train.h"
+module;
+#include "utilities/Globals_macros.h"
+#include <cstddef>
+#include <sstream>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <utility>
+
+module eu07.input.zmq_input;
+import eu07.utilities.globals;
+import eu07.utilities.logs;
+import eu07.simulation.simulation;
+import eu07.simulation.simulationtime;
+import eu07.vehicle.train;
 
 zmq_input::zmq_input()
 {

input/zmq_input.cppm

@@ -1,7 +1,18 @@
-#pragma once
-
+module;
 #include <zmq_addon.hpp>
-#include "input/command.h"
+#include <chrono>
+#include <map>
+#include <optional>
+#include <string>
+#include <tuple>
+#include <unordered_map>
+#include <vector>
+
+export module eu07.input.zmq_input;
+import eu07.input.command;
+
+export {
+
 
 class zmq_input
 {
@@ -75,3 +86,5 @@ public:
     zmq_input();
     void poll();
 };
+
+}  // export