From 3486163025e93f9f6793475ede3ef67368e1eb54 Mon Sep 17 00:00:00 2001 From: Nathan Date: Sat, 15 Mar 2025 18:57:04 -0500 Subject: [PATCH] begin work on window module --- .../src/calculator.cpp | 0 .../assets/viking_room.obj | 0 .../assets/viking_room.png | Bin modules/{mainGUI => MainGUI}/src/gui.cpp | 0 modules/{mainGUI => MainGUI}/src/gui.h | 0 modules/{print => Print}/src/print.cpp | 0 modules/{print => Print}/src/print.h | 0 .../{testMenu => TestMenu}/src/testMenu.cpp | 0 modules/{testMenu => TestMenu}/src/testMenu.h | 0 .../src/Renderer/window.h} | 0 .../src/WindowImpl/GLFW/windowGLFW.h} | 0 modules/Window/src/WindowImpl/WindowImpl.h | 4 ++++ modules/Window/src/WindowModule.cpp | 11 +++++++++++ modules/Window/src/WindowModule.h | 18 ++++++++++++++++++ 14 files changed, 33 insertions(+) rename modules/GUImodules/{calculator => Calculator}/src/calculator.cpp (100%) rename modules/{mainGUI => MainGUI}/assets/viking_room.obj (100%) rename modules/{mainGUI => MainGUI}/assets/viking_room.png (100%) rename modules/{mainGUI => MainGUI}/src/gui.cpp (100%) rename modules/{mainGUI => MainGUI}/src/gui.h (100%) rename modules/{print => Print}/src/print.cpp (100%) rename modules/{print => Print}/src/print.h (100%) rename modules/{testMenu => TestMenu}/src/testMenu.cpp (100%) rename modules/{testMenu => TestMenu}/src/testMenu.h (100%) rename modules/{renderer/src/renderer.cpp => Window/src/Renderer/window.h} (100%) rename modules/{renderer/src/renderer.h => Window/src/WindowImpl/GLFW/windowGLFW.h} (100%) create mode 100644 modules/Window/src/WindowImpl/WindowImpl.h create mode 100644 modules/Window/src/WindowModule.cpp create mode 100644 modules/Window/src/WindowModule.h diff --git a/modules/GUImodules/calculator/src/calculator.cpp b/modules/GUImodules/Calculator/src/calculator.cpp similarity index 100% rename from modules/GUImodules/calculator/src/calculator.cpp rename to modules/GUImodules/Calculator/src/calculator.cpp diff --git a/modules/mainGUI/assets/viking_room.obj b/modules/MainGUI/assets/viking_room.obj similarity index 100% rename from modules/mainGUI/assets/viking_room.obj rename to modules/MainGUI/assets/viking_room.obj diff --git a/modules/mainGUI/assets/viking_room.png b/modules/MainGUI/assets/viking_room.png similarity index 100% rename from modules/mainGUI/assets/viking_room.png rename to modules/MainGUI/assets/viking_room.png diff --git a/modules/mainGUI/src/gui.cpp b/modules/MainGUI/src/gui.cpp similarity index 100% rename from modules/mainGUI/src/gui.cpp rename to modules/MainGUI/src/gui.cpp diff --git a/modules/mainGUI/src/gui.h b/modules/MainGUI/src/gui.h similarity index 100% rename from modules/mainGUI/src/gui.h rename to modules/MainGUI/src/gui.h diff --git a/modules/print/src/print.cpp b/modules/Print/src/print.cpp similarity index 100% rename from modules/print/src/print.cpp rename to modules/Print/src/print.cpp diff --git a/modules/print/src/print.h b/modules/Print/src/print.h similarity index 100% rename from modules/print/src/print.h rename to modules/Print/src/print.h diff --git a/modules/testMenu/src/testMenu.cpp b/modules/TestMenu/src/testMenu.cpp similarity index 100% rename from modules/testMenu/src/testMenu.cpp rename to modules/TestMenu/src/testMenu.cpp diff --git a/modules/testMenu/src/testMenu.h b/modules/TestMenu/src/testMenu.h similarity index 100% rename from modules/testMenu/src/testMenu.h rename to modules/TestMenu/src/testMenu.h diff --git a/modules/renderer/src/renderer.cpp b/modules/Window/src/Renderer/window.h similarity index 100% rename from modules/renderer/src/renderer.cpp rename to modules/Window/src/Renderer/window.h diff --git a/modules/renderer/src/renderer.h b/modules/Window/src/WindowImpl/GLFW/windowGLFW.h similarity index 100% rename from modules/renderer/src/renderer.h rename to modules/Window/src/WindowImpl/GLFW/windowGLFW.h diff --git a/modules/Window/src/WindowImpl/WindowImpl.h b/modules/Window/src/WindowImpl/WindowImpl.h new file mode 100644 index 0000000..a0f1e2c --- /dev/null +++ b/modules/Window/src/WindowImpl/WindowImpl.h @@ -0,0 +1,4 @@ + + + +class WindowImpl {}; diff --git a/modules/Window/src/WindowModule.cpp b/modules/Window/src/WindowModule.cpp new file mode 100644 index 0000000..9689bf9 --- /dev/null +++ b/modules/Window/src/WindowModule.cpp @@ -0,0 +1,11 @@ +#include "windowModule.h" + +WindowModule::WindowModule(void* h, App& a) : Module(h, a) { + name = "Window"; +} + +WindowModule::~WindowModule() {} + +void WindowModule::run() { + +} diff --git a/modules/Window/src/WindowModule.h b/modules/Window/src/WindowModule.h new file mode 100644 index 0000000..60921f4 --- /dev/null +++ b/modules/Window/src/WindowModule.h @@ -0,0 +1,18 @@ +#include "../../../include/Archimedes.h" +#include "WindowImpl/WindowImpl.h" + +class WindowModule : Module { + + public: + WindowModule(void*, App&); + + ~WindowModule(); + + void run(); + + private: + + WindowImpl window; + + Renderer renderer; +};