Project structure no longer depends on big huge precompiled header file

* Merge branch 'only_pch_branch' into issue95

* updated cmake file

* removed wrong inline spec.

* Fix: Lifetime of command buffer used in `imgui_manager::upload_fonts` is now handled

* Fix: Better flags for renderpass created in `window::construct_backbuffers`

* Updated ImGui (which got rid of a validation error in the compute_image_processing example).

* Initializing mHighlightMeshlets in the skinned_meshlets example.

* Just messing around with imgui

* Upgraded to `actions/checkout@v3` in cross-platform-check.yml

* Replaced imgui.cpp with original file once again

* Stupidly playing around with ImGui includes, hoping to be able to fix GCC

* fetch imgui from github repo on cmake build

* fix imgui source paths on windows

* add imgui_tables.cpp to imgui sources

* Code formatting improved

* #include tweaks

* Removed #include <auto_vk_toolkit.hpp> from many files.

* Don't need the /Zm1000 compiler flag anymore for MSVC

(Which specifies precompiled header memory allocation limit)

* #including auto_vk_toolkit in settings.hpp and windows_base.hpp

Not sure if I know what I'm doing...

* Updated nlohmann/json.hpp, which allows to use `c++latest`

* Not forcing including `cg_stdafx.hpp` in both configurations: Debug and Release

* Linked to latest Auto-Vk after some #include changes

* Those files that do not get the `cg_stdafx.hpp` forced include must also be set to not use precompiled headers.

* Switching #include style to using quotes instead of angle brackets for Auto-Vk and Auto-Vk-Toolkit files

* Deleted all the nlohmann/json files again, becase we're going to use the single-file version of it.

* Added single header version of nlohmann/json.hpp

* Towards supporting AVK_USE_SYNCHRONIZATION2_INSTEAD_OF_CORE

* Some adaptions based on latest Auto-Vk changes

---------

Co-authored-by: Johannes Unterguggenberger <johannes.unterguggenberger@gmail.com>
Co-authored-by: Lukas Herzberger <herzberger.lukas@gmail.com>

.github/workflows/cross-platform-check.yml

@@ -39,7 +39,7 @@ jobs:
 
     steps:
       - name: Checkout repository and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
@@ -114,9 +114,9 @@ jobs:
         vulkan-sdk: ["latest", "1.2.176.1"]
 
     steps:
-      # IMPORTANT: apparently checkout@v2 pulls to ${{ github.event.repository.name }}/${{ github.event.repository.name }} instead of just ${{ github.event.repository.name }} on windows
+      # IMPORTANT: apparently checkout@v3 pulls to ${{ github.event.repository.name }}/${{ github.event.repository.name }} instead of just ${{ github.event.repository.name }} on windows
       - name: Checkout repository and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 
@@ -170,9 +170,9 @@ jobs:
         vulkan-sdk: ["latest", "1.2.176.1"]
 
     steps:
-      # IMPORTANT: apparently checkout@v2 pulls to ${{ github.event.repository.name }}/${{ github.event.repository.name }} instead of just ${{ github.event.repository.name }} on windows
+      # IMPORTANT: apparently checkout@v3 pulls to ${{ github.event.repository.name }}/${{ github.event.repository.name }} instead of just ${{ github.event.repository.name }} on windows
       - name: Checkout repository and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: recursive
 

CMakeLists.txt

@@ -104,15 +104,6 @@ set(avk_toolkit_Sources
         external/universal/src/FileWatcher/FileWatcherOSX.cpp
         external/universal/src/FileWatcher/FileWatcherWin32.cpp
 
-        # ImGui
-        external/universal/src/imgui.cpp
-        external/universal/src/imgui_demo.cpp
-        external/universal/src/imgui_draw.cpp
-        external/universal/src/imgui_impl_glfw.cpp
-        external/universal/src/imgui_impl_vulkan.cpp
-        external/universal/src/imgui_tables.cpp
-        external/universal/src/imgui_widgets.cpp
-
         # Auto-Vk-Toolkit framework files:
         auto_vk_toolkit/src/animation.cpp
         auto_vk_toolkit/src/bezier_curve.cpp
@@ -140,6 +131,7 @@ set(avk_toolkit_Sources
         auto_vk_toolkit/src/quake_camera.cpp
         auto_vk_toolkit/src/swapchain_resized_event.cpp
         auto_vk_toolkit/src/transform.cpp
+        auto_vk_toolkit/src/timer_globals.cpp
         auto_vk_toolkit/src/updater.cpp
         auto_vk_toolkit/src/varying_update_timer.cpp
         auto_vk_toolkit/src/vk_convenience_functions.cpp
@@ -183,6 +175,15 @@ find_package(Vulkan REQUIRED)
 target_link_libraries(${PROJECT_NAME} ${avk_toolkit_IncludeScope}
     Vulkan::Vulkan)
 
+# Dear ImGui
+include(cmake/imgui.cmake)
+if (UNIX)
+    target_include_directories(${PROJECT_NAME} ${avk_toolkit_IncludeScope}
+            ${avk_toolkit_imguiIncludeDirectories})
+endif(UNIX)
+target_sources(${PROJECT_NAME} ${avk_toolkit_SourceScope}
+        ${avk_toolkit_imguiSources})
+
 # stb
 # NOTE: Windows builds use a modified version of stb (including a small custom DLL).
 #   Since this version doesn't work on Linux, the Linux build process generates its own STB shared library.

auto_vk_toolkit/include/animation.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+#include "model_types.hpp"
 
 namespace avk
 {

auto_vk_toolkit/include/auto_vk_toolkit.hpp

@@ -110,146 +110,8 @@
 #define DISPATCH_LOADER_EXT_TYPE vk::DispatchLoaderDynamic
 #define VULKAN_HPP_DISPATCH_LOADER_DYNAMIC 1
 #define AVK_USE_VMA
-#include <avk/avk.hpp>
+#include "avk/avk.hpp"
 
 // -------------------- Auto-Vk-Toolkit Includes --------------------
 #include "format_for.hpp"
-#include "conversion_utils.hpp"
-
-#include "context_state.hpp"
-
-#include "cursor.hpp"
-
-#include "context_generic_glfw_types.hpp"
-#include "window_base.hpp"
-
 #include "window.hpp"
-#include "context_generic_glfw.hpp"
-
-#include "math_utils.hpp"
-#include "key_code.hpp"
-#include "key_state.hpp"
-#include "timer_frame_type.hpp"
-#include "timer_interface.hpp"
-#include "fixed_update_timer.hpp"
-#include "varying_update_timer.hpp"
-#include "input_buffer.hpp"
-#include "composition_interface.hpp"
-
-#include "vk_convenience_functions.hpp"
-
-#include "settings.hpp"
-#include "context_vulkan.hpp"
-
-namespace avk
-{
-#pragma region global data representing the currently active composition
-	/**	@brief Get the current timer, which represents the current game-/render-time
-	 *	This can be nullptr! Use time() for a version which will not return nullptr.
-	 */
-	inline timer_interface*& timer_reference()
-	{
-		static timer_interface* sTimer = nullptr;
-		return sTimer;
-	}
-
-
-	/**	@brief Sets a new timer.
-	 *	ATTENTION: This timer must live until the end of the application!
-	 */
-	inline void set_timer(timer_interface* const aPointerToNewTimer)
-	{
-		timer_reference() = aPointerToNewTimer;
-	}
-
-	extern void set_default_timer();
-
-	/**	@brief Get the current timer, which represents the current game-/render-time
-	 */
-	inline timer_interface& time()
-	{
-		// If there is no timer set AT THE FIRST INVOCATION, one will be set.
-		// But at subsequent invocations, no further checks are performed.
-		static bool sInitialCheckPerformed = []() {
-			if (nullptr == timer_reference()) {
-				set_default_timer();
-			}
-			return true;
-		}();
-
-		// In every subsequent invocation, just return whatever timer is set:
-		return *timer_reference();
-	}
-
-	/** @brief Get the current frame's input data
-	 *	\remark This is just a shortcut to @ref composition_interface::current()->input();
-	 */
-	inline input_buffer& input()
-	{
-		return composition_interface::current()->input();
-	}
-
-	/** @brief Get access to the currently active objects
-	 *	\remark This is just a shortcut to @ref *composition_interface::current();
-	 */
-	inline composition_interface* current_composition()
-	{
-		return composition_interface::current();
-	}
-
-	inline auto& context()
-	{
-		static context_vulkan sContext;
-		return sContext;
-	}
-#pragma endregion
-}
-
-namespace avk {
-	class serializer;
-}
-
-#include "event_data.hpp"
-#include "event.hpp"
-#include "files_changed_event.hpp"
-#include "swapchain_resized_event.hpp"
-#include "swapchain_changed_event.hpp"
-#include "swapchain_format_changed_event.hpp"
-#include "concurrent_frames_count_changed_event.hpp"
-#include "swapchain_additional_attachments_changed_event.hpp"
-#include "destroying_events.hpp"
-#include "updater.hpp"
-
-#include "invokee.hpp"
-#include "sequential_invoker.hpp"
-
-#include "transform.hpp"
-#include "camera.hpp"
-#include "quake_camera.hpp"
-#include "material_config.hpp"
-#include "material_gpu_data.hpp"
-#include "material_gpu_data_ext.hpp"
-#include "material.hpp"
-#include "lightsource.hpp"
-#include "lightsource_gpu_data.hpp"
-#include "model_types.hpp"
-#include "animation.hpp"
-#include "model.hpp"
-#include "orca_scene.hpp"
-#include "serializer.hpp"
-#include "image_data.hpp"
-#include "material_image_helpers.hpp"
-#include "meshlet_helpers.hpp"
-
-#include "composition.hpp"
-#include "configure_and_compose.hpp"
-
-#include "imgui_manager.hpp"
-
-#include "cp_interpolation.hpp"
-#include "bezier_curve.hpp"
-#include "catmull_rom_spline.hpp"
-#include "quadratic_uniform_b_spline.hpp"
-#include "cubic_uniform_b_spline.hpp"
-
-// ReSharper restore CppUnusedIncludeDirective

auto_vk_toolkit/include/bezier_curve.hpp

@@ -1,5 +1,7 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+
+#include "cp_interpolation.hpp"
 
 namespace avk
 {

auto_vk_toolkit/include/camera.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+#include "transform.hpp"
 
 namespace avk
 {

auto_vk_toolkit/include/catmull_rom_spline.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+#include "cp_interpolation.hpp"
 
 namespace avk
 {

auto_vk_toolkit/include/composition.hpp

@@ -1,5 +1,9 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+#include "invokee.hpp"
+#include "composition_interface.hpp"
+#include "context_vulkan.hpp"
+#include "timer_interface.hpp"
 
 #define SINGLE_THREADED 1
 
@@ -372,12 +376,12 @@ namespace avk
 
 					// TODO: This is a bit (read: a lot) stupid, that this is tied to the main_window => support multiple windows here gracefully:
 					int width = 0, height = 0;
-				    glfwGetFramebufferSize(avk::context().main_window()->handle()->mHandle, &width, &height);
+				    glfwGetFramebufferSize(context().main_window()->handle()->mHandle, &width, &height);
 				    while (width == 0 || height == 0) {
-				        glfwGetFramebufferSize(avk::context().main_window()->handle()->mHandle, &width, &height);
+				        glfwGetFramebufferSize(context().main_window()->handle()->mHandle, &width, &height);
 				        glfwWaitEvents();
 				    }
-					avk::context().main_window()->update_resolution();
+					context().main_window()->update_resolution();
 
 #if !SINGLE_THREADED
 					// resume render_thread:

auto_vk_toolkit/include/composition_interface.hpp

@@ -1,5 +1,9 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+#include <string>
+
+#include "input_buffer.hpp"
+#include "avk/avk_error.hpp"
 
 namespace avk
 {
@@ -126,4 +130,12 @@ namespace avk
 		/** The (single) currently active composition_interface */
 		static composition_interface* sCurrentComposition;
 	};
+
+	static inline composition_interface* current_composition() {
+		return composition_interface::current();
+	}
+
+	static inline input_buffer& input() {
+		return composition_interface::current()->input();
+	}
 }

auto_vk_toolkit/include/concurrent_frames_count_changed_event.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+#include "window.hpp"
+#include "event.hpp"
 
 namespace avk
 {

auto_vk_toolkit/include/configure_and_compose.hpp

@@ -1,5 +1,6 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+#include "composition.hpp"
 
 namespace avk
 {

auto_vk_toolkit/include/context_generic_glfw.hpp

@@ -1,5 +1,9 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+#include "context_state.hpp"
+#include "context_generic_glfw_types.hpp"
+
+class cursor;
 
 namespace avk
 {

auto_vk_toolkit/include/context_generic_glfw_types.hpp

@@ -1,6 +1,5 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
-
+#include "avk/avk_error.hpp"
 #include <GLFW/glfw3.h>
 
 namespace avk

auto_vk_toolkit/include/context_state.hpp

@@ -1,5 +1,4 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
 
 namespace avk
 {

auto_vk_toolkit/include/context_vulkan.hpp

@@ -1,5 +1,7 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
+
+#include "context_generic_glfw.hpp"
+#include "settings.hpp"
 
 namespace avk
 {	
@@ -13,7 +15,13 @@ namespace avk
 	class context_vulkan : public context_generic_glfw, public avk::root
 	{
 	public:
+		static context_vulkan& get() {
+			static context_vulkan instance;
+			return instance;
+		};
+	private:
 		context_vulkan() = default;
+	public:		
 		context_vulkan(const context_vulkan&) = delete;
 		context_vulkan(context_vulkan&&) = delete;
 		context_vulkan& operator=(const context_vulkan&) = delete;
@@ -95,7 +103,7 @@ namespace avk
 #if defined(AVK_USE_VMA)
 		const VmaAllocator& memory_allocator() const override                   { return mMemoryAllocator; }
 #else
-		const std::tuple<vk::PhysicalDevice, vk::Device>& memory_allocator() override { return mMemoryAllocator; }
+		const std::tuple<vk::PhysicalDevice, vk::Device>& memory_allocator() const override { return mMemoryAllocator; }
 #endif
 
 		const std::vector<uint32_t>& all_queue_family_indices() const { return mDistinctQueueFamilies; }
@@ -293,4 +301,9 @@ namespace avk
 
 	};
 
+	static inline auto& context() {
+		return avk::context_vulkan::get();
+	}
 }
+
+

auto_vk_toolkit/include/conversion_utils.hpp

@@ -1,5 +1,4 @@
 #pragma once
-#include <auto_vk_toolkit.hpp>
 
 namespace avk
 {