Added a monitor refresh rate getter.

Removed superfluous get and setters for Window framerate cap.

Author: MStachowicz

source/Application.cpp

@@ -55,7 +55,7 @@ void Application::simulation_loop(uint16_t physics_ticks_per_second, uint16_t re
 		duration_since_last_input_tick   += duration_since_last_frame;
 
 		// Check for dynamic framerate cap changes from the window
-		uint16_t current_framerate_cap = m_window.get_framerate_cap();
+		uint16_t current_framerate_cap = m_window.m_framerate_cap;
 		render_rate_unlimited = current_framerate_cap == 0;
 		render_timestep = render_rate_unlimited ? Duration::zero() : std::chrono::microseconds{1s} / current_framerate_cap;
 

source/Platform/Window.cpp

@@ -22,10 +22,10 @@ namespace Platform
 		, m_last_size_windowed{0, 0}     // init in body
 		, m_fullscreen{false}
 		, m_VSync{false}
-		, m_framerate_cap{0} // 0 = unlimited
 		, m_close_requested{false}
 		, m_handle{nullptr}
 		, m_input{p_input_state}
+		, m_framerate_cap{get_primary_monitor_refresh_rate()}
 		, m_show_menu_bar{false}
 	{
 		glfwWindowHint(GLFW_RESIZABLE, GL_TRUE);
@@ -160,11 +160,6 @@ namespace Platform
 		m_VSync = p_enabled;
 	}
 
-	void Window::set_framerate_cap(uint16_t p_framerate_cap)
-	{
-		m_framerate_cap = p_framerate_cap;
-	}
-
 	void Window::toggle_fullscreen()
 	{
 		m_fullscreen = !m_fullscreen;
@@ -266,4 +261,16 @@ namespace Platform
 		const GLFWvidmode* mode = glfwGetVideoMode(glfwGetPrimaryMonitor());
 		return {static_cast<unsigned int>(mode->width), static_cast<unsigned int>(mode->height)};
 	}
+	uint16_t Window::get_primary_monitor_refresh_rate()
+	{
+		if (auto monitor = glfwGetPrimaryMonitor())
+			if (auto video_mode = glfwGetVideoMode(monitor))
+			{
+				int refresh_rate = video_mode->refreshRate;
+				if (refresh_rate > 0 && refresh_rate <= std::numeric_limits<decltype(refresh_rate)>::max())
+					return static_cast<uint16_t>(refresh_rate);
+			}
+
+		return 0;
+	}
 } // namespace Platform

source/Platform/Window.hpp

@@ -16,12 +16,13 @@ namespace Platform
 
 		bool m_fullscreen;
 		bool m_VSync; // Whether VSync is on for the window.
-		uint16_t m_framerate_cap; // Target framerate cap (0 = unlimited).
 		bool m_close_requested;
 		GLFWwindow* m_handle;
 		Input& m_input; // Window requires access to Input to use it in GLFW callbacks from glfwGetWindowUserPointer.
 
 	public:
+		uint16_t m_framerate_cap; // Target framerate cap (0 = unlimited).
+
 		// Creates a OS window of p_width and p_height.
 		// Takes an Input and sets its GLFW callback functions. Input depends on a Window.
 		// Window construction requires GLFW and ImGui to be initialised before.
@@ -31,9 +32,6 @@ namespace Platform
 		void set_VSync(bool p_enabled);
 		bool get_VSync() const { return m_VSync; };
 
-		void set_framerate_cap(uint16_t p_framerate_cap);
-		uint16_t get_framerate_cap() const { return m_framerate_cap; };
-
 		glm::uvec2 size() const;
 		void on_size_callback(const glm::uvec2& p_new_size);
 		void set_size(const glm::uvec2& p_new_size);
@@ -55,6 +53,7 @@ namespace Platform
 
 		// Get the max resolution of the primary monitor.
 		static glm::uvec2 get_max_resolution();
+		static uint16_t get_primary_monitor_refresh_rate();
 
 		bool m_show_menu_bar;
 	};

source/UI/Editor.cpp

@@ -631,12 +631,12 @@ namespace UI
 			if (ImGui::Checkbox("VSync", &VSync))
 				m_window.set_VSync(VSync);
 
-			int framerate_cap = static_cast<int>(m_window.get_framerate_cap());
+			int framerate_cap = m_window.m_framerate_cap;
 			if (ImGui::InputInt("Framerate cap (0 = unlimited)", &framerate_cap))
 			{
-				if (framerate_cap < 0)
+				if (framerate_cap < 0 || framerate_cap > std::numeric_limits<decltype(m_window.m_framerate_cap)>::max())
 					framerate_cap = 0;
-				m_window.set_framerate_cap(static_cast<uint16_t>(framerate_cap));
+				m_window.m_framerate_cap = static_cast<uint16_t>(framerate_cap);
 			}
 
 			ImGui::SeparatorText("Renderer");
@@ -647,7 +647,7 @@ namespace UI
 				debug_options.m_show_light_positions = false;
 				debug_options.m_show_mesh_normals    = false;
 				m_window.set_VSync(true);
-				m_window.set_framerate_cap(0);
+				m_window.m_framerate_cap = 0;
 				m_openGL_renderer.reset_debug_options();
 			}
 		}