From 6d980ee4ec41e602f4c96b231b0f4932e33a95f4 Mon Sep 17 00:00:00 2001 From: Benjamin Palko Date: Sun, 6 Oct 2024 22:18:51 -0400 Subject: [PATCH] rename program to WindowSystem and move --- src/main.cpp | 4 ++-- src/meson.build | 2 +- src/systems/meson.build | 7 ++++++- src/{program.cpp => systems/window-system.cpp} | 7 ++++--- src/{program.hpp => systems/window-system.hpp} | 6 +++--- 5 files changed, 16 insertions(+), 10 deletions(-) rename src/{program.cpp => systems/window-system.cpp} (65%) rename src/{program.hpp => systems/window-system.hpp} (51%) diff --git a/src/main.cpp b/src/main.cpp index f95e6c9..b51934e 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,7 +2,7 @@ #include #include -#include "program.hpp" +#include "systems/window-system.hpp" void error_callback(int error_code, const char *description) { fmt::print("[ERROR - {}] {}\n", error_code, description); @@ -54,7 +54,7 @@ int main() { } ShaderSystem shaderSystem = ShaderSystem(); - Program program = Program(window, shaderSystem); + WindowSystem program = WindowSystem(window, shaderSystem); program.Loop(); diff --git a/src/meson.build b/src/meson.build index dd34cd3..bb1cc6f 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,2 +1,2 @@ -sources = files('main.cpp', 'program.cpp', 'program.hpp') +sources = files('main.cpp') subdir('systems') diff --git a/src/systems/meson.build b/src/systems/meson.build index 0277d1f..e42b237 100644 --- a/src/systems/meson.build +++ b/src/systems/meson.build @@ -1 +1,6 @@ -sources += files('shader-system.cpp', 'shader-system.hpp') +sources += files( + 'shader-system.cpp', + 'shader-system.hpp', + 'window-system.cpp', + 'window-system.hpp', +) diff --git a/src/program.cpp b/src/systems/window-system.cpp similarity index 65% rename from src/program.cpp rename to src/systems/window-system.cpp index 9785013..626abc0 100644 --- a/src/program.cpp +++ b/src/systems/window-system.cpp @@ -1,11 +1,12 @@ -#include "program.hpp" +#include "window-system.hpp" -Program::Program(GLFWwindow *window, class ShaderSystem shaderSystem) { +WindowSystem::WindowSystem(GLFWwindow *window, + class ShaderSystem shaderSystem) { this->window = window; this->shaderSystem = shaderSystem; } -int Program::Loop() { +int WindowSystem::Loop() { while (!glfwWindowShouldClose(window)) { int width, height; glfwGetFramebufferSize(window, &width, &height); diff --git a/src/program.hpp b/src/systems/window-system.hpp similarity index 51% rename from src/program.hpp rename to src/systems/window-system.hpp index 04e33c5..9fd6f59 100644 --- a/src/program.hpp +++ b/src/systems/window-system.hpp @@ -1,12 +1,12 @@ #define GLFW_INCLUDE_NONE #include -#include "systems/shader-system.hpp" +#include "shader-system.hpp" -class Program { +class WindowSystem { GLFWwindow *window; ShaderSystem shaderSystem; public: - Program(GLFWwindow *window, class ShaderSystem shaderSystem); + WindowSystem(GLFWwindow *window, class ShaderSystem shaderSystem); int Loop(); };