General Refactoring and HSGIL update

AsulconS · Sep 16, 2023 · e286316 · e286316
1 parent 8ea8995
commit e286316
Show file tree

Hide file tree

Showing 11 changed files with 114 additions and 24 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.12)
+cmake_minimum_required(VERSION 3.20)
 
 # Disable CYGWIN Legacy Warning
 set(CMAKE_LEGACY_CYGWIN_WIN32 0)
@@ -13,8 +13,8 @@ set(FULL_VERSION ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH})
 # Project info
 project(SPH VERSION ${FULL_VERSION})
 
-# Set C++11 as the standard
-set(CMAKE_CXX_STANDARD 11)
+# Set C++17 as the standard
+set(CMAKE_CXX_STANDARD 17)
 
 # Output Dir
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY $<1:${CMAKE_SOURCE_DIR}>)
@@ -28,6 +28,13 @@ macro(build_cpp_source filename)
     )
     target_include_directories(${filename} PRIVATE include)
     target_include_directories(${filename} PRIVATE include/HSGIL/external)
+    if(SPH_BUILD STREQUAL "Debug")
+        target_link_directories(${filename} PRIVATE lib/Debug)
+    elseif(SPH_BUILD STREQUAL "Release")
+        target_link_directories(${filename} PRIVATE lib/Release)
+    else()
+        message(FATAL_ERROR "Please, specify a valid build mode (Debug|Release)")
+    endif()
     if(WIN32)
         target_link_libraries(${filename} LINK_PUBLIC hsgil opengl32)
     else()

diff --git a/default.png b/default.png
diff --git a/fluid.cpp b/fluid.cpp
@@ -223,6 +223,7 @@ int main()
     gil::Timer timer(true);
 
     glm::vec3 viewPos {0.2f, 0.4f, 0.8f};
+    glm::vec3 boundaries = glm::vec3{sim.boundaryWidth, sim.boundaryHeight, sim.boundaryDepth};
 
     gil::Shader shader("water");
     gil::Shader volcanoShader("volcano");
@@ -234,19 +235,28 @@ int main()
 
     while(window.isActive())
     {
+        // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
+        // Pre Processing
+        // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
         window.pollEvents();
+        if (inputHandler.onKeyTriggered(gil::KEY_ESCAPE))
+        {
+            window.close();
+            continue;
+        }
+        float deltaTime = timer.getDeltaTime();
 
         // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
         // Input Processing
         // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
         yRotControl = 0.0f;
-        if(inputHandler.onKeyDown(gil::KEY_A))
+        if(inputHandler.onKeyDown(gil::KEY_Q))
         {
-            yRotControl -= 1.0f;
+            yRotControl += 1.0f;
         }
-        if(inputHandler.onKeyDown(gil::KEY_D))
+        if(inputHandler.onKeyDown(gil::KEY_E))
         {
-            yRotControl += 1.0f;
+            yRotControl -= 1.0f;
         }
 
         // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -327,30 +337,23 @@ int main()
         // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
         glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
-        glm::mat4 view;
-        glm::mat4 model;
-
-        float deltaTime = timer.getDeltaTime();
+        glm::mat4 model = glm::mat4(1.0f);
         yRotationAngle += yRotControl * yRotationWeight * deltaTime;
-        glm::vec4 nvp4 = glm::rotate(glm::mat4(1.0f), yRotationAngle, glm::vec3{0.0f, 1.0f, 0.0f}) * glm::vec4{viewPos.x, viewPos.y, viewPos.z, 1.0f};
-        glm::vec3 nvp3 = {nvp4.x, nvp4.y, nvp4.z};
-        view = glm::lookAt(nvp3, glm::vec3{0.0f, 0.0f, 0.0f}, glm::vec3{0.0f, 1.0f, 0.0f});
 
         shader.use();
-        shader.setMat4("view", view);
         for(unsigned int i = 0; i < sim.particles.size(); ++i)
         {
             Particle& pi = sim.particles[i];
 
-            model = glm::mat4(1.0f);
-            model = glm::translate(model, glm::vec3{pi.r.x, pi.r.y, pi.r.z});
+            model = glm::rotate(glm::mat4(1.0f), yRotationAngle, glm::vec3{0.0f, 1.0f, 0.0f});
+            model = glm::translate(model, glm::vec3{pi.r.x, pi.r.y, pi.r.z} - 0.5f * boundaries);
             shader.setMat4("model", model);
 
             float zColorDepth {pi.r.z / sim.boundaryDepth};
             shader.setVec3("colorDepth", {zColorDepth, zColorDepth, zColorDepth});
 
             glBindVertexArray(sim.VAO);
-                glDrawArrays(GL_POINTS, 0, sim.particles.size());
+                glDrawArrays(GL_POINTS, 0, (GLsizei)sim.particles.size());
             glBindVertexArray(0);
         }
 

diff --git a/include/HSGIL/config/common.hpp b/include/HSGIL/config/common.hpp
@@ -51,5 +51,6 @@ namespace luis  = gil;
 namespace erick = gil;
 namespace yober = gil;
 namespace pogdo = gil;
+namespace zhong = gil;
 
 #endif // HSGIL_COMMON_HPP
diff --git a/include/HSGIL/math/vec2.hpp b/include/HSGIL/math/vec2.hpp
@@ -42,8 +42,8 @@ struct Vec2f
  */
 struct Vec2i
 {
-    int x;
-    int y;
+    uint32 x;
+    uint32 y;
 };
 
 using Vec2 = Vec2f;

diff --git a/include/HSGIL/window/customization.hpp b/include/HSGIL/window/customization.hpp
@@ -0,0 +1,37 @@
+/********************************************************************************
+ *                                                                              *
+ * HSGIL - Handy Scalable Graphics Integration Library                          *
+ * Copyright (c) 2019-2022 Adrian Bedregal                                      *
+ *                                                                              *
+ * This software is provided 'as-is', without any express or implied            *
+ * warranty. In no event will the authors be held liable for any damages        *
+ * arising from the use of this software.                                       *
+ *                                                                              *
+ * Permission is granted to anyone to use this software for any purpose,        *
+ * including commercial applications, and to alter it and redistribute it       *
+ * freely, subject to the following restrictions:                               *
+ *                                                                              *
+ * 1. The origin of this software must not be misrepresented; you must not      *
+ *    claim that you wrote the original software. If you use this software      *
+ *    in a product, an acknowledgment in the product documentation would be     *
+ *    appreciated but is not required.                                          *
+ * 2. Altered source versions must be plainly marked as such, and must not be   *
+ *    misrepresented as being the original software.                            *
+ * 3. This notice may not be removed or altered from any source distribution.   *
+ *                                                                              *
+ ********************************************************************************/
+
+#ifndef HSGIL_WINDOW_CUSTOMIZATION_HPP
+#define HSGIL_WINDOW_CUSTOMIZATION_HPP
+
+namespace gil
+{
+enum class WindowStyle {
+    WINDOWED_STYLE,
+    BORDERLESS_STYLE,
+    BORDERLESS_FULLSCREEN_STYLE
+};
+
+} // namespace gil
+
+#endif // HSGIL_WINDOW_CUSTOMIZATION_HPP
diff --git a/include/HSGIL/window/iWindow.hpp b/include/HSGIL/window/iWindow.hpp
@@ -28,6 +28,7 @@
 #include <HSGIL/config/common.hpp>
 
 #include <HSGIL/window/inputHandler.hpp>
+#include <HSGIL/window/customization.hpp>
 
 namespace gil
 {
@@ -48,7 +49,7 @@ class HSGIL_API IWindow
      * @param t_title 
      * @param t_eventHandler 
      */
-    IWindow(const uint32 t_width, const uint32 t_height, const char* t_title, InputHandler* t_inputHandler) : m_width {t_width}, m_height {t_height}, m_title {t_title}, m_ready {false}, m_inputHandler {t_inputHandler} {}
+    IWindow(const uint32 t_width, const uint32 t_height, const char* t_title, WindowStyle t_style, InputHandler* t_inputHandler) : m_windowWidth {t_width}, m_windowHeight {t_height}, m_title {t_title}, m_style {t_style}, m_ready {false}, m_inputHandler {t_inputHandler} {}
     /**
      * @brief Destroy the Window object
      * 
@@ -91,6 +92,18 @@ class HSGIL_API IWindow
      * @return float value containing the current aspect ratio
      */
     virtual float getAspectRatio() const = 0;
+    /**
+     * @brief Get the Window Rect object as Vec2i
+     * 
+     * @return Vec2i vector containing width and height of the window in pixels
+     */
+    virtual Vec2i getWindowRect() const = 0;
+    /**
+     * @brief Get the Workspace Rect object as Vec2i
+     * 
+     * @return Vec2i vector containing width and height of the viewport in pixels
+     */
+    virtual Vec2i getViewportRect() const = 0;
 
 protected:
     /**
@@ -99,9 +112,12 @@ class HSGIL_API IWindow
      */
     virtual void initializeWindow() = 0;
 
-    uint32 m_width;
-    uint32 m_height;
+    uint32 m_windowWidth;
+    uint32 m_windowHeight;
+    uint32 m_viewportWidth;
+    uint32 m_viewportHeight;
     const char* m_title;
+    WindowStyle m_style;
 
     bool m_ready;
 

diff --git a/include/HSGIL/window/renderingWindow.hpp b/include/HSGIL/window/renderingWindow.hpp
@@ -30,6 +30,7 @@
 #include <HSGIL/window/iWindow.hpp>
 #include <HSGIL/window/inputEvents.hpp>
 #include <HSGIL/window/inputHandler.hpp>
+#include <HSGIL/window/customization.hpp>
 
 namespace gil
 {
@@ -49,7 +50,7 @@ class HSGIL_API RenderingWindow : public IWindow
      * @param t_width 
      * @param t_height 
      */
-    explicit RenderingWindow(const uint32 t_width = 800u, const uint32 t_height = 600u, const char* t_title = "Untitled", InputHandler* t_inputHandler = nullptr);
+    explicit RenderingWindow(const uint32 t_width = 800u, const uint32 t_height = 600u, const char* t_title = "Untitled", WindowStyle t_style = WindowStyle::WINDOWED_STYLE, InputHandler* t_inputHandler = nullptr);
     /**
      * @brief Destroy the RenderingWindow object
      * 
@@ -98,6 +99,18 @@ class HSGIL_API RenderingWindow : public IWindow
      * @return float 
      */
     virtual float getAspectRatio() const override;
+    /**
+     * @brief Get the Window Rect object as Vec2i
+     * 
+     * @return Vec2i vector containing width and height of the window in pixels
+     */
+    virtual Vec2i getWindowRect() const override;
+    /**
+     * @brief Get the Workspace Rect object as Vec2i
+     * 
+     * @return Vec2i vector containing width and height of the viewport in pixels
+     */
+    virtual Vec2i getViewportRect() const override;
 
 protected:
     /**

diff --git a/lib/Debug/hsgil.pdb b/lib/Debug/hsgil.pdb
diff --git a/main.cpp b/main.cpp
@@ -316,6 +316,11 @@ int main()
     while(window.isActive())
     {
         window.pollEvents();
+        if (inputHandler.onKeyTriggered(gil::KEY_ESCAPE))
+        {
+            window.close();
+            continue;
+        }
 
         // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
         // Input Processing

diff --git a/old.cpp b/old.cpp
@@ -180,6 +180,9 @@ int main()
         return EXIT_FAILURE;
     }
 
+    gil::InputHandler inputHandler;
+    window.setInputHandler(inputHandler);
+
     SIM_State sim;
     sim.nParticles = 100000;
 
@@ -209,6 +212,11 @@ int main()
     while(window.isActive())
     {
         window.pollEvents();
+        if (inputHandler.onKeyTriggered(gil::KEY_ESCAPE))
+        {
+            window.close();
+            continue;
+        }
 
         // ---------------------------------------------------------------------------------------------------------------------------------------------------------------
         // Compute Density-Pressure