Merge pull request #55 from nightingazer/refactor

Refactor

Author: A

.idea/codeStyles/Project.xml

@@ -1,18 +1,20 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.7)
-project(AGE VERSION 1.0.0 LANGUAGES C CXX)
+
+project(AGE VERSION 1.0.0 LANGUAGES CXX)
 
 set(CMAKE_CXX_STANDARD_REQUIRED 23)
 
 add_library(age_core STATIC)
 
 target_include_directories(age_core INTERFACE include PUBLIC src vendor/imgui vendor/glm/ vendor/stb_image)
 
-file(GLOB_RECURSE _AGE_CORE_SRCS src/agepch.h src/agepch.cpp src/Age/*.cpp src/Age/*.h vendor/stb_image/stb_image.cpp vendor/stb_image/stb_image.h)
+file(GLOB_RECURSE _AGE_CORE_SRCS src/agepch.cpp src/agepch.h  src/Age/*.cpp src/Age/*.h vendor/stb_image/stb_image.cpp vendor/stb_image/stb_image.h)
 list(REMOVE_ITEM _AGE_CORE_SRCS ${REMOVE_CMAKE})
 
 file(GLOB _IMGUI_SRCS vendor/imgui/*.cpp vendor/imgui/*.h)
 
 target_sources(age_core PRIVATE ${_AGE_CORE_SRCS} ${_IMGUI_SRCS})
+target_precompile_headers(age_core PUBLIC src/agepch.h)
 
 option(AGE_INCLUDE_OPENGL "If ON, OpenGL-specific implementations will be added to the project" ON)
 option(AGE_INCLUDE_VULCAN "If ON, Vulcan-specific implementations will be added to the project" OFF)
@@ -77,16 +79,23 @@ if (AGE_INCLUDE_OPENGL)
     message(STATUS "Including OpenGl")
     add_subdirectory(vendor/GLFW)
 
+    add_library(age_core_glad STATIC)
+
     target_link_libraries(age_core PUBLIC glfw ${GLFW_LIBRARIES})
 
     file(GLOB _IMGUI_BE vendor/imgui/backends/imgui_impl_opengl3* vendor/imgui/backends/imgui_impl_glfw.*)
-    file(GLOB _AGE_OPENGL_PLATFORM_SRCS src/Platform/OpenGL/* vendor/GLAD/src/glad.c)
+    file(GLOB _AGE_OPENGL_PLATFORM_SRCS src/Platform/OpenGL/*)
+    file(GLOB _AGE_OPENGL_PLATFORM_C_SRCS vendor/GLAD/src/glad.c)
 
     target_sources(age_core PRIVATE ${_IMGUI_BE} ${_AGE_OPENGL_PLATFORM_SRCS})
+    target_sources(age_core_glad PRIVATE ${_AGE_OPENGL_PLATFORM_C_SRCS})
 
-    target_include_directories(age_core PUBLIC vendor/GLFW/include vendor/GLAD/include vendor/imgui vendor/GLAD/include)
+    target_include_directories(age_core PUBLIC vendor/GLFW/include vendor/imgui)
+    target_include_directories(age_core_glad PUBLIC vendor/GLAD/include)
 
     target_compile_definitions(age_core PUBLIC AGE_INCLUDE_OPENGL)
+
+    target_link_libraries(age_core PUBLIC age_core_glad)
 endif ()
 
 target_compile_definitions(age_core PUBLIC AGE_RENDER_PLATFORM_${AGE_RENDER_PLATFORM})

AGE/CMakeLists.txt

@@ -6,7 +6,6 @@
 
 #include "Application.h"
 
-#include "Age/Debug/Assert.h"
 #include "Age/Debug/DebugLayer.h"
 #include "Age/ImGui/ImGuiLayer.h"
 #include "Age/Renderer/Renderer.h"
@@ -106,4 +105,4 @@ namespace AGE {
 
     return m_Timer.Uptime();
   }
-}// namespace AGE
+}// namespace AGE

AGE/src/Age/Core/Application.cpp

@@ -26,16 +26,16 @@ namespace AGE {
     void PushLayer(Layer* layer);
     void PushOverlay(Layer* layer);
 
-    Scope<AGE::Window>& Window();
+    Scope <AGE::Window>& Window();
+    Timestep Uptime();
 
     static Application* Instance();
 
-    Timestep Uptime();
-
   private:
     bool OnWindowClose(WindowCloseEvent& e);
 
-    Scope<AGE::Window> m_Window;
+  private:
+    Scope <AGE::Window> m_Window;
 
     bool       m_Running;
     LayerStack m_LayerStack;

AGE/src/Age/Core/Application.h

@@ -1,10 +1,11 @@
 //
 // Created by alex on 29.08.22.
 //
+#include "agepch.h"
 
 #include "Layer.h"
 
 namespace AGE {
   Layer::Layer(const age_string_t& debugName) : m_DebugName(debugName) {}
   Layer::~Layer() = default;
-}// namespace AGE
+}// namespace AGE

AGE/src/Age/Core/Layer.cpp

@@ -16,20 +16,30 @@ namespace AGE {
   void DebugLayer::OnUpdate(Timestep ts) {
     AGE_PROFILE_FUNCTION();
 
-    float fps = 1000.0f / ts.Milliseconds();
+    constexpr float fpsTextUpdateThresholdSeconds{0.1f};
+    static float lastFpsUpdateSeconds{0.0f};
+    static float lastFps{1000.0f / ts.Milliseconds()};
+
+    lastFpsUpdateSeconds += ts;
+    if(lastFpsUpdateSeconds >= fpsTextUpdateThresholdSeconds) {
+      lastFpsUpdateSeconds = 0.0f;
+      lastFps = 1000.0f / ts.Milliseconds();
+    }
 
-    m_FpsPlot.LastUpdate += ts.Seconds();
+    m_FpsPlot.LastUpdateSeconds += ts.Seconds();
 
-    if (m_FpsPlot.LastUpdate >= m_FpsPlot.RefreshTime) {
-      m_FpsPlot.LastUpdate = 0;
-      m_FpsPlot.InsertNewFps(fps);
+    if (m_FpsPlot.LastUpdateSeconds >= m_FpsPlot.RefreshTimeSeconds) {
+      m_FpsPlot.LastUpdateSeconds = 0;
+      m_FpsPlot.InsertNewFps(1000.0f / ts.Milliseconds());
     }
 
     ImGui::Begin("Debug");
     Scope<Window>& window = Application::Instance()->Window();
-    ImGui::Text("MainWindow: %s (%i, %i)", window->Title().c_str(), (int)window->Width(), (int)window->Height());
-    ImGui::Text("FPS: %f", fps);
-    ImGui::Text("Delta Time: %fs", ts.Seconds());
+    ImGui::Text(
+        "MainWindow: %s (%i, %i)", window->Title().c_str(), (int)window->Width(),
+        (int)window->Height());
+    ImGui::Text("FPS: %.2f", lastFps);
+    ImGui::Text("Delta Time: %.2fms", ts.Milliseconds());
 
     m_FpsPlot.Render();
 
@@ -56,27 +66,27 @@ namespace AGE {
       m_MinValue = fps;
     }
 
-    if (m_LastInsertIndex >= m_Data.max_size()) {
+    if (m_NextIndex >= m_Data.max_size()) {
       for (std::size_t i = 0; i < m_Data.max_size() - 1; i++) {
         m_Data[i] = m_Data[i + 1];
       }
 
       m_Data[m_Data.max_size() - 1] = fps;
     } else {
-      m_Data[m_LastInsertIndex] = fps;
-      m_LastInsertIndex++;
+      m_Data[m_NextIndex] = fps;
+      m_NextIndex++;
     }
   }
 
   void FpsPlot::Render() {
     AGE_PROFILE_FUNCTION();
 
     float scaleMax = *std::max_element(m_Data.begin(), m_Data.end());
-    ImGui::Text("Max FPS: %f", m_MaxValue);
-    ImGui::Text("Min FPS: %f", m_MinValue);
+    ImGui::Text("Max FPS: %.2f", m_MaxValue);
+    ImGui::Text("Min FPS: %.2f", m_MinValue);
 
 
-    ImGui::SliderFloat("Refresh Rate(sec)", &RefreshTime, 0.0f, 5.0f);
+    ImGui::SliderFloat("Refresh Rate(sec)", &RefreshTimeSeconds, 0.0f, 5.0f);
     ImGui::PlotLines(
         "FPS",
         m_Data.data(),
@@ -88,4 +98,4 @@ namespace AGE {
         ImVec2(0, 50)
     );
   }
-}// namespace AGE
+}// namespace AGE

AGE/src/Age/Debug/DebugLayer.cpp

@@ -15,12 +15,12 @@ namespace AGE {
     void InsertNewFps(float fps);
     void Render();
 
-    float LastUpdate{0};
-    float RefreshTime{0.25f};
+    float LastUpdateSeconds{0};
+    float RefreshTimeSeconds{0.25f};
 
   private:
     std::array<float, 60> m_Data;
-    std::size_t           m_LastInsertIndex{0};
+    std::size_t           m_NextIndex{0};
     float                 m_MaxValue{0};
     float                 m_MinValue{FLT_MAX};
   };

AGE/src/Age/Debug/DebugLayer.h

@@ -60,7 +60,7 @@ namespace AGE {
 
   class  EventDispatcher {
   public:
-    EventDispatcher(Event& event) : event_{event} {}
+    EventDispatcher(Event& event) : m_Event{event} {}
 
     /**
 		 * @brief Dispatches event
@@ -72,16 +72,16 @@ namespace AGE {
 		 */
     template<typename E, typename F>
     bool Dispatch(const F& func) {
-      if (event_.EventType() == E::StaticType()) {
-        event_.Handled |= func(static_cast<E&>(event_));
+      if (m_Event.EventType() == E::StaticType()) {
+        m_Event.Handled |= func(static_cast<E&>(m_Event));
         return true;
       }
 
       return false;
     }
 
   private:
-    Event& event_;
+    Event& m_Event;
   };
 
    inline std::ostream& operator<<(std::ostream& os, const Event& e) {

AGE/src/Age/Events/Event.h

@@ -10,17 +10,13 @@
 #include "Age/ImGui/ImGuiLayer.h"
 
 #include "Age/Core/Application.h"
-#include "Age/Core/Input.h"
 
 
 namespace AGE {
   bool ImGuiLayer::IsInitialized{false};
 
   ImGuiLayer::ImGuiLayer(age_string_t name) : Layer(name) {}
 
-  ImGuiLayer::~ImGuiLayer() {
-  }
-
   void ImGuiLayer::OnAttach() {
     IMGUI_CHECKVERSION();
     ImGui::CreateContext();
@@ -77,4 +73,4 @@ namespace AGE {
       IsInitialized = true;
     }
   }
-}// namespace AGE
+}// namespace AGE

AGE/src/Age/ImGui/ImGuiLayer.cpp

@@ -21,7 +21,7 @@ namespace AGE {
   class ImGuiLayer : public Layer {
   public:
     ImGuiLayer(age_string_t name = "ImGui");
-    ~ImGuiLayer() override;
+    ~ImGuiLayer() override = default;
 
     void OnAttach() override;
     void OnDetach() override;

AGE/src/Age/ImGui/ImGuiLayer.h

@@ -40,8 +40,8 @@ namespace AGE {
   uint32_t shader_data_size(ShaderDataType type);
 
   /**
-   * @brief Converts ShaderDataType objects to corresponding ShaderDataType but with only one component.
-   * For example, Float4 will be converted to Float.
+   * @brief Extracts a base type data from the ShaderDataType.
+   * @details Removes data about count of elements in ShaderDataType. For example Float4 input will return Float.
    * @param type - type to be converted
    * @return The same ShaderDataType but with one component.
    */

AGE/src/Age/Renderer/Buffer.h

@@ -31,9 +31,9 @@ namespace AGE {
     inline glm::vec3 Position() const { return m_Position; }
     inline float Rotation() const { return m_Rotation; }
 
-    inline const glm::mat4& GetProjectionMatrix() const { return m_ProjectionMatrix; }
-    inline const glm::mat4& GetViewMatrix() const { return m_ViewMatrix; }
-    inline const glm::mat4& GetViewProjectionMatrix() const { return m_ViewProjectionMatrix; }
+    inline const glm::mat4& ProjectionMatrix() const { return m_ProjectionMatrix; }
+    inline const glm::mat4& ViewMatrix() const { return m_ViewMatrix; }
+    inline const glm::mat4& ViewProjectionMatrix() const { return m_ViewProjectionMatrix; }
 
   private:
     void RecalculateViewMatrix();

AGE/src/Age/Renderer/OrthographicCamera.h

@@ -2,6 +2,8 @@
 // Created by alex on 18.10.22.
 //
 
+#include "agepch.h"
+
 #include "OrthographicCameraController.h"
 #include <glm/trigonometric.hpp>
 
@@ -89,4 +91,4 @@ namespace AGE {
     OnResize((float)e.Width(), (float)e.Height());
     return false;
   }
-} // AGE
+} // AGE

AGE/src/Age/Renderer/OrthographicCameraController.cpp

@@ -28,7 +28,7 @@ namespace AGE {
     OrthographicCamera& GetCamera() { return m_Camera; }
     const OrthographicCamera& GetCamera() const { return m_Camera; }
 
-    float GetZoomLevel() const { return m_ZoomLevel; }
+    float ZoomLevel() const { return m_ZoomLevel; }
     void SetZoomLevel(float level) { m_ZoomLevel = level; }
 
   private:

AGE/src/Age/Renderer/OrthographicCameraController.h

@@ -4,7 +4,6 @@
 
 #include "agepch.h"
 
-#include "Age/Debug/Assert.h"
 #include "RenderAPI.h"
 
 #ifdef AGE_INCLUDE_OPENGL
@@ -33,4 +32,4 @@ namespace AGE {
 
     return nullptr;
   }
-} // AGE
+} // AGE

AGE/src/Age/Renderer/RenderAPI.cpp

@@ -19,7 +19,7 @@ namespace AGE {
   void Renderer::BeginScene(OrthographicCamera& camera) {
     AGE_PROFILE_FUNCTION();
 
-    s_SceneData->ViewProjectionMatrix = camera.GetViewProjectionMatrix();
+    s_SceneData->ViewProjectionMatrix = camera.ViewProjectionMatrix();
   }
 
   void Renderer::EndScene() {