Cameraz

08_HelloSwapchain/main.cpp

@@ -160,6 +160,7 @@ class HelloSwapchainApp final : public examples::SimpleWindowedApplication
 				auto window = m_winMgr->createWindow(std::move(params));
 				// uncomment for some nasty testing of swapchain creation!
 				//m_winMgr->minimize(window.get());
+
 				const_cast<std::remove_const_t<decltype(m_surface)>&>(m_surface) = CSmoothResizeSurface<CSwapchainResources>::create(CSurfaceVulkanWin32::create(smart_refctd_ptr(m_api),move_and_static_cast<IWindowWin32>(window)));
 			}
 			return {{m_surface->getSurface()/*,EQF_NONE*/}};

61_UI/CMakeLists.txt

@@ -15,4 +15,25 @@ if(NBL_BUILD_IMGUI)
 
 	nbl_create_executable_project("${NBL_EXTRA_SOURCES}" "" "${NBL_INCLUDE_SERACH_DIRECTORIES}" "${NBL_LIBRARIES}" "${NBL_EXECUTABLE_PROJECT_CREATION_PCH_TARGET}")
 	LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} geometryCreatorSpirvBRD)
+
+	if(NBL_EMBED_BUILTIN_RESOURCES)
+		set(_BR_TARGET_ ${EXECUTABLE_NAME}_builtinResourceData)
+		set(RESOURCE_DIR "app_resources")
+
+		get_filename_component(_SEARCH_DIRECTORIES_ "${CMAKE_CURRENT_SOURCE_DIR}" ABSOLUTE)
+		get_filename_component(_OUTPUT_DIRECTORY_SOURCE_ "${CMAKE_CURRENT_BINARY_DIR}/src" ABSOLUTE)
+		get_filename_component(_OUTPUT_DIRECTORY_HEADER_ "${CMAKE_CURRENT_BINARY_DIR}/include" ABSOLUTE)
+
+		file(GLOB_RECURSE BUILTIN_RESOURCE_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}" CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${RESOURCE_DIR}/*")
+		foreach(RES_FILE ${BUILTIN_RESOURCE_FILES})
+			LIST_BUILTIN_RESOURCE(RESOURCES_TO_EMBED "${RES_FILE}")
+		endforeach()
+
+		ADD_CUSTOM_BUILTIN_RESOURCES(${_BR_TARGET_} RESOURCES_TO_EMBED "${_SEARCH_DIRECTORIES_}" "${RESOURCE_DIR}" "nbl::this_example::builtin" "${_OUTPUT_DIRECTORY_HEADER_}" "${_OUTPUT_DIRECTORY_SOURCE_}")
+
+		LINK_BUILTIN_RESOURCES_TO_TARGET(${EXECUTABLE_NAME} ${_BR_TARGET_})
+	endif()
+
+	add_dependencies(${EXECUTABLE_NAME} argparse)
+	target_include_directories(${EXECUTABLE_NAME} PUBLIC $<TARGET_PROPERTY:argparse,INTERFACE_INCLUDE_DIRECTORIES>)
 endif()

61_UI/app_resources/cameras.json

@@ -0,0 +1,162 @@
+{
+    "cameras": [
+      {
+        "type": "FPS",
+        "position": [-2.438, 1.995, -3.130],
+        "orientation": [0.195, 0.311, -0.065, 0.928]
+      },
+      {
+        "type": "Orbit",
+        "position": [-2.017, 0.386, 0.684],
+        "target": [0, 0, 0]
+      },
+      {
+        "type": "Free",
+        "position": [2.116, 0.826, 1.152],
+        "orientation": [0.095, -0.835, 0.152, 0.521]
+      }
+    ],
+    "projections": [
+      {
+        "type": "perspective",
+        "fov": 40.0,
+        "zNear": 0.1,
+        "zFar": 110.0
+      },
+      {
+        "type": "orthographic",
+        "orthoWidth": 16.0,
+        "zNear": 0.1,
+        "zFar": 110.0
+      }
+    ],
+    "viewports": [
+      {
+        "projection": 0,
+        "controllers": {
+          "keyboard": 0,
+          "mouse": 0
+        }
+      },
+      {
+        "projection": 1,
+        "controllers": {
+          "keyboard": 1,
+          "mouse": 0
+        }
+      },
+      {
+        "projection": 0,
+        "controllers": {
+          "keyboard": 2
+        }
+      },
+      {
+        "projection": 1,
+        "controllers": {
+          "keyboard": 1
+        }
+      },
+      {
+        "projection": 0,
+        "controllers": {
+          "keyboard": 3,
+          "mouse": 1
+        }
+      },
+      {
+        "projection": 1,
+        "controllers": {
+          "keyboard": 3,
+          "mouse": 1
+        }
+      }
+    ],
+    "planars": [
+      {
+        "camera": 0,
+        "viewports": [0, 1]
+      },
+      {
+        "camera": 1,
+        "viewports": [4, 5]
+      },
+      {
+        "camera": 2,
+        "viewports": [2, 3]
+      }
+    ],
+    "controllers": {
+      "keyboard": [
+        {
+          "mappings": {
+            "W": "MoveForward",
+            "S": "MoveBackward",
+            "A": "MoveLeft",
+            "D": "MoveRight",
+            "I": "TiltDown",
+            "K": "TiltUp",
+            "J": "PanLeft",
+            "L": "PanRight"
+          }
+        },
+        {
+          "mappings": {
+            "W": "MoveUp",
+            "S": "MoveDown",
+            "A": "MoveLeft",
+            "D": "MoveRight"
+          }
+        },
+        {
+          "mappings": {
+            "W": "MoveForward",
+            "S": "MoveBackward",
+            "A": "MoveLeft",
+            "D": "MoveRight",
+            "E": "MoveUp",
+            "Q": "MoveDown",
+            "I": "TiltDown",
+            "K": "TiltUp",
+            "J": "PanLeft",
+            "L": "PanRight",
+            "U": "RollRight",
+            "O": "RollLeft"
+          }
+        },
+        {
+          "mappings": {
+            "W": "MoveRight",
+            "S": "MoveLeft",
+            "A": "MoveDown",
+            "D": "MoveUp",
+            "E": "MoveForward",
+            "Q": "MoveBackward"
+          }
+        }
+      ],
+      "mouse": [
+        {
+          "mappings": {
+            "RELATIVE_POSITIVE_MOVEMENT_X": "PanRight",
+            "RELATIVE_NEGATIVE_MOVEMENT_X": "PanLeft",
+            "RELATIVE_POSITIVE_MOVEMENT_Y": "TiltUp",
+            "RELATIVE_NEGATIVE_MOVEMENT_Y": "TiltDown"
+          }
+        },
+        {
+          "mappings": {
+            "RELATIVE_POSITIVE_MOVEMENT_X": "MoveUp",
+            "RELATIVE_NEGATIVE_MOVEMENT_X": "MoveDown",
+            "RELATIVE_POSITIVE_MOVEMENT_Y": "MoveRight",
+            "RELATIVE_NEGATIVE_MOVEMENT_Y": "MoveLeft",
+            "VERTICAL_POSITIVE_SCROLL": "MoveForward",
+            "HORIZONTAL_POSITIVE_SCROLL": "MoveForward",
+            "VERTICAL_NEGATIVE_SCROLL": "MoveBackward",
+            "HORIZONTAL_NEGATIVE_SCROLL": "MoveBackward"
+          }
+        }
+      ]
+    }
+  }
+

61_UI/include/common.hpp

@@ -3,13 +3,24 @@
 
 #include <nabla.h>
 
+#include <bitset>
+
 // common api
-#include "CCamera.hpp"
+#include "camera/CFPSCamera.hpp"
+#include "camera/CFreeLockCamera.hpp"
+#include "camera/COrbitCamera.hpp"
 #include "SimpleWindowedApplication.hpp"
-#include "CEventCallback.hpp"
+#include "InputSystem.hpp"
+
+#include "camera/CCubeProjection.hpp"
+#include "camera/CLinearProjection.hpp"
+#include "camera/CPlanarProjection.hpp"
 
 // the example's headers
-#include "transform.hpp"
+#include "nbl/ui/ICursorControl.h"
+#include "nbl/ext/ImGui/ImGui.h"
+#include "imgui/imgui_internal.h"
+#include "imguizmo/ImGuizmo.h"
 #include "CGeomtryCreatorScene.hpp"
 
 using namespace nbl;