Added window_base::should_be_closed and using it in example applicati…

…ons.
cg-tuwien · Aug 14, 2023 · e74a804 · e74a804
1 parent f83983f
commit e74a804
Show file tree

Hide file tree

Showing 17 changed files with 33 additions and 15 deletions.
diff --git a/auto_vk_toolkit/include/window_base.hpp b/auto_vk_toolkit/include/window_base.hpp
@@ -113,6 +113,11 @@ namespace avk
 		 */
 		bool is_cursor_disabled() const;
 
+		/** Returns true if the window should be closed.
+		 *  Attention: Could be that a positive result is returned with a delay of 1 frame.
+		 */
+		bool should_be_closed();
+
 	protected:
 		/** Static variable which holds the ID that the next window will get assigned */
 		static uint32_t mNextWindowId;
@@ -149,5 +154,8 @@ namespace avk
 
 		// Whether or not the cursor is operating in disabled-mode
 		cursor mCursorMode;
+
+		// Initially false, set to true if window should close.
+		bool mShouldClose;
 	};
 }
diff --git a/auto_vk_toolkit/src/window_base.cpp b/auto_vk_toolkit/src/window_base.cpp
@@ -213,4 +213,14 @@ namespace avk
 		});
 	}
 
+	bool window_base::should_be_closed()
+	{
+		assert(handle());
+		context().dispatch_to_main_thread([this]{
+		    assert(handle());
+			// Note: The update of the value might not happen before the next frame:
+            this->mShouldClose = glfwWindowShouldClose(handle()->mHandle);
+		});
+		return mShouldClose;
+	}
 }
diff --git a/examples/compute_image_processing/source/compute_image_processing.cpp b/examples/compute_image_processing/source/compute_image_processing.cpp
@@ -245,7 +245,7 @@ class compute_image_processing_app : public avk::invokee
 			mUpdateToRenderDependency = std::move(semaphore);
 		}
 
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::composition_interface::current()->stop();
 		}

diff --git a/examples/framebuffer/source/framebuffer.cpp b/examples/framebuffer/source/framebuffer.cpp
@@ -132,7 +132,7 @@ class framebuffer_app : public avk::invokee
 		}
 
 		// On Esc pressed,
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/hello_world/source/hello_world.cpp b/examples/hello_world/source/hello_world.cpp
@@ -77,7 +77,7 @@ class draw_a_triangle_app : public avk::invokee
 		}
 
 		// On Esc pressed,
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/model_loader/source/model_loader.cpp b/examples/model_loader/source/model_loader.cpp
@@ -359,7 +359,7 @@ class model_loader_app : public avk::invokee
 			auto resolution = avk::context().main_window()->resolution();
 			avk::context().main_window()->set_cursor_pos({ resolution[0] / 2.0, resolution[1] / 2.0 });
 		}
-		if (!mQuakeCam.is_enabled() && avk::input().key_pressed(avk::key_code::escape)) {
+		if (!mQuakeCam.is_enabled() && avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/multi_invokee_rendering/source/multi_invokee_rendering.cpp b/examples/multi_invokee_rendering/source/multi_invokee_rendering.cpp
@@ -69,7 +69,7 @@ class multi_invokee_rendering_app : public avk::invokee
 	void update() override
 	{
 		// On Esc pressed,
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/multiple_queues/source/multiple_queues.cpp b/examples/multiple_queues/source/multiple_queues.cpp
@@ -116,7 +116,7 @@ class multiple_queues_app : public avk::invokee
 	void update() override
 	{
 		// On Esc pressed,
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/orca_loader/source/orca_loader.cpp b/examples/orca_loader/source/orca_loader.cpp
@@ -509,7 +509,7 @@ class orca_loader_app : public avk::invokee
 			auto resolution = avk::context().main_window()->resolution();
 			avk::context().main_window()->set_cursor_pos({ resolution[0] / 2.0, resolution[1] / 2.0 });
 		}
-		if (!mQuakeCam.is_enabled() && avk::input().key_pressed(avk::key_code::escape)) {
+		if (!mQuakeCam.is_enabled() && avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/present_from_compute/source/present_from_compute.cpp b/examples/present_from_compute/source/present_from_compute.cpp
@@ -162,7 +162,7 @@ class present_from_compute_app : public avk::invokee
 		mUiQueueSelectionPrevFrame = mUiQueueSelection;
 
 		// On Esc pressed,
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/ray_query_in_ray_tracing_shaders/source/ray_query_in_ray_tracing_shaders.cpp b/examples/ray_query_in_ray_tracing_shaders/source/ray_query_in_ray_tracing_shaders.cpp
@@ -246,7 +246,7 @@ class ray_query_in_ray_tracing_shaders_invokee : public avk::invokee
 			auto pos = mQuakeCam.translation();
 			LOG_INFO(fmt::format("Current camera position: {}", avk::to_string(pos)));
 		}
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/ray_tracing_custom_intersection/source/ray_tracing_custom_intersection.cpp b/examples/ray_tracing_custom_intersection/source/ray_tracing_custom_intersection.cpp
@@ -313,7 +313,7 @@ class ray_tracing_custom_intersection_app : public avk::invokee
 			auto pos = mQuakeCam.translation();
 			LOG_INFO(fmt::format("Current camera position: {}", avk::to_string(pos)));
 		}
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/ray_tracing_with_shadows_and_ao/source/ray_tracing_with_shadows_and_ao.cpp b/examples/ray_tracing_with_shadows_and_ao/source/ray_tracing_with_shadows_and_ao.cpp
@@ -247,7 +247,7 @@ class ray_tracing_with_shadows_and_ao_invokee : public avk::invokee
 			auto pos = mQuakeCam.translation();
 			LOG_INFO(fmt::format("Current camera position: {}", avk::to_string(pos)));
 		}
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/skinned_meshlets/source/skinned_meshlets.cpp b/examples/skinned_meshlets/source/skinned_meshlets.cpp
@@ -550,7 +550,7 @@ class skinned_meshlets_app : public avk::invokee
 			auto resolution = avk::context().main_window()->resolution();
 			avk::context().main_window()->set_cursor_pos({ resolution[0] / 2.0, resolution[1] / 2.0 });
 		}
-		if (!mQuakeCam.is_enabled() && avk::input().key_pressed(avk::key_code::escape)) {
+		if (!mQuakeCam.is_enabled() && avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/static_meshlets/source/static_meshlets.cpp b/examples/static_meshlets/source/static_meshlets.cpp
@@ -413,7 +413,7 @@ class static_meshlets_app : public avk::invokee
 			auto resolution = avk::context().main_window()->resolution();
 			avk::context().main_window()->set_cursor_pos({ resolution[0] / 2.0, resolution[1] / 2.0 });
 		}
-		if (!mQuakeCam.is_enabled() && avk::input().key_pressed(avk::key_code::escape)) {
+		if (!mQuakeCam.is_enabled() && avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/texture_cubemap/source/texture_cubemap.cpp b/examples/texture_cubemap/source/texture_cubemap.cpp
@@ -298,7 +298,7 @@ class texture_cubemap_app : public avk::invokee
 
 	void update() override
 	{
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// Stop the current composition:
 			avk::current_composition()->stop();
 		}

diff --git a/examples/vertex_buffers/source/vertex_buffers.cpp b/examples/vertex_buffers/source/vertex_buffers.cpp
@@ -102,7 +102,7 @@ class vertex_buffers_app : public avk::invokee
 	void update() override
 	{
 		// On Esc pressed,
-		if (avk::input().key_pressed(avk::key_code::escape)) {
+		if (avk::input().key_pressed(avk::key_code::escape) || avk::context().main_window()->should_be_closed()) {
 			// stop the current composition:
 			avk::current_composition()->stop();
 		}