move to using GlVixen

WinteryFox · Nov 10, 2023 · fc154a5 · fc154a5
1 parent c89503a
commit fc154a5
Show file tree

Hide file tree

Showing 10 changed files with 86 additions and 10 deletions.
diff --git a/.idea/QtSettings.xml b/.idea/QtSettings.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/editor.xml b/.idea/editor.xml
diff --git a/.idea/sonarlint.xml b/.idea/sonarlint.xml
diff --git a/src/engine/Window.cpp b/src/engine/Window.cpp
@@ -179,4 +179,8 @@ namespace Vixen {
     void Window::getFramebufferSize(int &width, int &height) {
         glfwGetFramebufferSize(window, &width, &height);
     }
+
+    void Window::maximize() const {
+        glfwMaximizeWindow(window);
+    }
 }
diff --git a/src/engine/Window.h b/src/engine/Window.h
@@ -57,6 +57,8 @@ namespace Vixen {
          */
         void center() const;
 
+        void maximize() const;
+
         void setWindowedMode(Mode mode) const;
 
         std::unique_ptr<Monitor> getMonitor() const;

diff --git a/src/engine/gl/GlVixen.cpp b/src/engine/gl/GlVixen.cpp
@@ -3,8 +3,9 @@
 namespace Vixen::Gl {
     GlVixen::GlVixen(const std::string &appTitle, const glm::vec3 &appVersion)
             : Vixen(appTitle, appVersion),
-              window(GlWindow(appTitle, 720, 480, false)) {
+              window(GlWindow(appTitle, 640, 480, false)) {
         window.center();
+        window.maximize();
         window.setVisible(true);
     }
 }
diff --git a/src/engine/gl/GlVixen.h b/src/engine/gl/GlVixen.h
@@ -4,9 +4,10 @@
 
 namespace Vixen::Gl {
     class GlVixen : public Vixen {
-        GlWindow window;
 
     public:
         GlVixen(const std::string &appTitle, const glm::vec3 &appVersion);
+
+        GlWindow window;
     };
 }
diff --git a/src/engine/gl/test/main.cpp b/src/engine/gl/test/main.cpp
@@ -4,6 +4,7 @@
 #include "../GlShaderProgram.h"
 #include "GlBuffer.h"
 #include "../GlVertexArrayObject.h"
+#include "GlVixen.h"
 #include <unistd.h>
 
 #ifdef _WIN32
@@ -23,9 +24,7 @@ int main() {
 #endif
     spdlog::set_level(spdlog::level::trace);
 
-    auto window = Vixen::Gl::GlWindow("Vixen OpenGL Test", 1920, 1080, true);
-    window.center();
-    window.setVisible(true);
+    auto vixen = Vixen::Gl::GlVixen("Vixen OpenGL Test", {1, 0, 0});
 
     std::ifstream vertexStream("../../src/editor/shaders/triangle.vert");
     std::string vertexSource((std::istreambuf_iterator<char>(vertexStream)), std::istreambuf_iterator<char>());
@@ -95,15 +94,15 @@ int main() {
 
     double old = glfwGetTime();
     uint32_t fps;
-    while (!window.shouldClose()) {
-        window.clear();
+    while (!vixen.window.shouldClose()) {
+        vixen.window.clear();
 
         program.bind();
         vao.bind();
         glDrawElements(GL_TRIANGLES, static_cast<GLsizei>(indices.size()), GL_UNSIGNED_INT, (void *) vao.indexOffset);
 
-        window.update();
-        window.swap();
+        vixen.window.update();
+        vixen.window.swap();
 
         fps++;
         double now = glfwGetTime();

diff --git a/src/engine/vk/VkVixen.cpp b/src/engine/vk/VkVixen.cpp
@@ -3,7 +3,7 @@
 namespace Vixen::Vk {
     VkVixen::VkVixen(const std::string &appTitle, glm::vec3 appVersion)
             : Vixen(appTitle, appVersion),
-              window(VkWindow(appTitle, 1920, 1080, false)),
+              window(VkWindow(appTitle, 640, 480, false)),
               instance(Instance(appTitle, appVersion, window.requiredExtensions)),
               surface(instance.surfaceForWindow(window)),
               device(std::make_shared<Device>(
@@ -14,6 +14,7 @@ namespace Vixen::Vk {
               )),
               swapchain(device, 3) {
         window.center();
+        window.maximize();
         window.setVisible(true);
     }
 }