Merge branch 'main' into public

Author: cklosters

demos/vinyl/data/vinyl.json

@@ -707,10 +707,9 @@
         {
             "Type": "nap::Snapshot",
             "mID": "Snapshot",
-            "Width": 1920,
-            "Height": 1080,
-            "MaxCellWidth": 1920,
-            "MaxCellHeight": 1080,
+            "Width": 3840,
+            "Height": 2160,
+            "Divisor": 4,
             "OutputDirectory": "snapshots",
             "ImageFileFormat": "PNG",
             "TextureFormat": "RGBA8",

modules/napparametergui/src/parametergui.cpp

@@ -25,7 +25,6 @@ namespace nap
 	{
 		if (ImGui::BeginPopupModal("Load", nullptr, ImGuiWindowFlags_AlwaysAutoResize))
 		{
-			mPresets = mParameterService.getPresets(*mParameterGroup);
 			if (!mPresets.empty() && mSelectedPresetIndex == -1)
 				mSelectedPresetIndex = 0;
 
@@ -36,27 +35,32 @@ namespace nap
 				return true;
 			}, &mPresets, mPresets.size());
 
-			if (ImGui::Button("OK"))
+			if (!mPresets.empty())
 			{
-				utility::ErrorState errorState;
-				if (mParameterService.loadPreset(*mParameterGroup, mPresets[mSelectedPresetIndex], errorState))
-					ImGui::CloseCurrentPopup();
-				else
-					ImGui::OpenPopup("Failed to load preset");
-
-				if (ImGui::BeginPopupModal("Failed to load preset"))
+				if (ImGui::Button("OK"))
 				{
-					ImGui::Text(errorState.toString().c_str());
-					if (ImGui::Button("OK"))
+					utility::ErrorState errorState;
+					if (mParameterService.loadPreset(*mParameterGroup, mPresets[mSelectedPresetIndex], errorState))
 					{
 						ImGui::CloseCurrentPopup();
 					}
+					else
+						ImGui::OpenPopup("Failed to load preset");
 
-					ImGui::EndPopup();
+					if (ImGui::BeginPopupModal("Failed to load preset"))
+					{
+						ImGui::Text(errorState.toString().c_str());
+						if (ImGui::Button("OK"))
+						{
+							ImGui::CloseCurrentPopup();
+						}
+
+						ImGui::EndPopup();
+					}
 				}
+				ImGui::SameLine();
 			}
 
-			ImGui::SameLine();
 			if (ImGui::Button("Cancel"))
 			{
 				restorePresetState();
@@ -123,36 +127,39 @@ namespace nap
 
 			if (ImGui::Button("OK"))
 			{
-				utility::ErrorState errorState;
-				if (mParameterService.savePreset(*mParameterGroup, mPresets[mSelectedPresetIndex], errorState))
+				if (mSelectedPresetIndex != -1)
 				{
-					ImGui::CloseCurrentPopup();
-					std::string previous_selection = mPresets[mSelectedPresetIndex];
-
-					// After we have retrieved the filenames from the service, the list may be in a different order,
-					// so we search for the item in the list to find the selected index.
-					mPresets = mParameterService.getPresets(*mParameterGroup);
-					for (int index = 0; index < mPresets.size(); ++index)
+					utility::ErrorState errorState;
+					if (mParameterService.savePreset(*mParameterGroup, mPresets[mSelectedPresetIndex], errorState))
 					{
-						if (mPresets[index] == previous_selection)
+						ImGui::CloseCurrentPopup();
+						std::string previous_selection = mPresets[mSelectedPresetIndex];
+
+						// After we have retrieved the filenames from the service, the list may be in a different order,
+						// so we search for the item in the list to find the selected index.
+						mPresets = mParameterService.getPresets(*mParameterGroup);
+						for (int index = 0; index < mPresets.size(); ++index)
 						{
-							mSelectedPresetIndex = index;
-							break;
+							if (mPresets[index] == previous_selection)
+							{
+								mSelectedPresetIndex = index;
+								break;
+							}
 						}
-					}
 
-				}
-				else
-				{
-					ImGui::OpenPopup("Failed to save preset");
-				}
+					}
+					else
+					{
+						ImGui::OpenPopup("Failed to save preset");
+					}
 
-				if (ImGui::BeginPopupModal("Failed to save preset"))
-				{
-					ImGui::Text(errorState.toString().c_str());
-					if (ImGui::Button("OK"))
-						ImGui::CloseCurrentPopup();
-					ImGui::EndPopup();
+					if (ImGui::BeginPopupModal("Failed to save preset"))
+					{
+						ImGui::Text(errorState.toString().c_str());
+						if (ImGui::Button("OK"))
+							ImGui::CloseCurrentPopup();
+						ImGui::EndPopup();
+					}
 				}
 			}
 
@@ -181,7 +188,7 @@ namespace nap
 	}
 
 
-	void ParameterGUI::showParameters(ParameterGroup& parameterGroup)
+	void ParameterGUI::showParameters(ParameterGroup& parameterGroup, int depth)
 	{
 		for (auto& parameter : parameterGroup.mParameters)
 		{
@@ -193,13 +200,24 @@ namespace nap
 			ImGui::PopID();
 		}
 
+		// Add indentation if depth is higher than zero
+		if (depth > 0)
+		{
+			ImGui::Indent(ImGui::GetStyle().FramePadding.x + 1.0f);
+		}
 		for (auto& child : parameterGroup.mChildren)
 		{
 			if (ImGui::CollapsingHeader(child->mID.c_str()))
 			{
-				showParameters(*child);
+			    // Increment the current depth to keep track of the indentation level
+				showParameters(*child, depth+1);
 			}
 		}
+		// Undo previously added indentation
+		if (depth > 0)
+		{
+			ImGui::Unindent(ImGui::GetStyle().FramePadding.x + 1.0f);
+		}
 	}
 
 
@@ -226,7 +244,6 @@ namespace nap
 						ImGui::CloseCurrentPopup();
 					ImGui::EndPopup();
 				}
-
 			}
 			else
 			{
@@ -249,6 +266,7 @@ namespace nap
 		{
 			ImGui::OpenPopup("Load");
 			savePresetState();
+			mPresets = mParameterService.getPresets(*mParameterGroup);
 		}
 
 		handleLoadPresetPopup();
@@ -275,10 +293,34 @@ namespace nap
 	}
 
 
+	bool ParameterGUI::load(std::string preset, utility::ErrorState& errorState)
+	{
+		if (!errorState.check(mParameterGroup != nullptr, "No parameter group to reference"))
+			return false;
+
+		mPresets = mParameterService.getPresets(*mParameterGroup);
+		if (!errorState.check(!mPresets.empty(), "No presets found"))
+			return false;
+
+		const auto it = std::find(mPresets.begin(), mPresets.end(), preset);
+		if (!errorState.check(it != mPresets.end(), "Preset %s not found", preset.c_str()))
+			return false;
+
+		if (!mParameterService.loadPreset(*mParameterGroup, *it, errorState))
+		{
+			errorState.fail("Failed to load preset %s", (*it).c_str());
+			return false;
+		}
+
+		mSelectedPresetIndex = it - mPresets.begin();
+		return true;
+	}
+
+
 	bool ParameterGUI::init(utility::ErrorState& errorState)
 	{
 		if (!errorState.check(mParameterGroup != nullptr, "No parameter group to display"))
 			return false;
 		return true;
 	}
-}
+}

modules/napparametergui/src/parametergui.h

@@ -37,6 +37,14 @@ namespace nap
 		 */
 		void show(bool newWindow = true);
 
+		/**
+		 * Load a preset programmatically
+		 * @param preset the filename of the preset to load
+		 * @param errorState contains the error if the preset load failed
+		 * @return if the preset loaded successfully
+		 */
+		bool load(std::string preset, utility::ErrorState& errorState);
+
 		/**
 		 * Initializes the parameter GUI
 		 * @param errorState contains the error if initialization failed
@@ -79,9 +87,11 @@ namespace nap
 		void restorePresetState();
 
 		/**
-		 * Display all parameters as GUI elements.
+		 * Display all parameters as GUI elements. This function is recursive.
+		 * @param parameterGroup the parameter group to display
+		 * @param depth the current recursion depth. This is zero by default and is incremented automatically when dealing with nested parameter groups.
 		 */
-		void showParameters(ParameterGroup& parameterGroup);
+		void showParameters(ParameterGroup& parameterGroup, int depth = 0);
 
 	private:
 		ParameterService&							mParameterService;					///< The parameter service

modules/naprender/src/perspcameracomponent.cpp

@@ -9,6 +9,7 @@
 #include <glm/gtc/matrix_transform.hpp> 
 #include <entity.h>
 #include "transformcomponent.h"
+#include "mathutils.h"
 
 RTTI_BEGIN_CLASS(nap::PerpCameraProperties)
 	RTTI_PROPERTY("FieldOfView",		&nap::PerpCameraProperties::mFieldOfView,		nap::rtti::EPropertyMetaData::Default)
@@ -185,31 +186,18 @@ namespace nap
 		return projection;
 	}
 
+
 	// Helper function to calculate either left/right or top/bottom camera planes. The output is the physical location of the near plane in camera space.
 	static void calculateCameraPlanes(float fov, float aspectRatio, float nearPlane, int numDimensions, int location, float& min, float& max)
 	{
 		assert(location < numDimensions);
 		assert(numDimensions > 0);
 
-		const float start_angle = -fov * 0.5f;
-		const float split_angle = fov / (float)numDimensions;
-		const float min_angle = start_angle + split_angle * (float)location;
-		const float max_angle = min_angle + split_angle;
-		min = glm::tan(min_angle) * aspectRatio * nearPlane;
-		max = glm::tan(max_angle) * aspectRatio * nearPlane;
-	}
+		const float angle_extent = fov * 0.5f;
+		const float near_extent = glm::tan(angle_extent) * aspectRatio * nearPlane;
 
-	// Helper function to calculate either left/right or top/bottom camera planes. The output is the physical location of the near plane in camera space.
-	static void calculateCameraPlanes(float fov, float aspectRatio, float nearPlane, float rectDimMin, float rectDimMax, float& min, float& max)
-	{
-		assert(rectDimMin >= 0.f);
-		assert(rectDimMax >= 0.f);
-
-		const float start_angle = -fov * 0.5f;
-		const float min_angle = start_angle + fov * rectDimMin;
-		const float max_angle = start_angle + fov * rectDimMax;
-		min = glm::tan(min_angle) * aspectRatio * nearPlane;
-		max = glm::tan(max_angle) * aspectRatio * nearPlane;
+		min = math::lerp(-near_extent, near_extent, location / static_cast<float>(numDimensions));
+		max = math::lerp(-near_extent, near_extent, (location+1) / static_cast<float>(numDimensions));
 	}
 
 	// Hook up attribute changes
@@ -241,7 +229,7 @@ namespace nap
 	}
 
 
-	// Use this function to split the projection into a grid of same-sized rectangles.
+	// Use this function to split the projection into a regular grid
 	void PerspCameraComponentInstance::setGridDimensions(int numRows, int numColumns)
 	{
 		if (numColumns != mProperties.mGridDimensions.x || numRows != mProperties.mGridDimensions.y)
@@ -290,11 +278,10 @@ namespace nap
 			const float aspect_ratio = ((float)(getRenderTargetSize().x * mProperties.mGridDimensions.x)) / ((float)(getRenderTargetSize().y * mProperties.mGridDimensions.y));
 
 			float left, right, top, bottom;
-
 			calculateCameraPlanes(fov, aspect_ratio, near_plane, mProperties.mGridDimensions.x, mProperties.mGridLocation.x, left, right);
 			calculateCameraPlanes(fov, 1.0f, near_plane, mProperties.mGridDimensions.y, mProperties.mGridLocation.y, bottom, top);
-
 			mRenderProjectionMatrix = createASymmetricProjection(near_plane, far_plane, left, right, top, bottom);
+
 			mProjectionMatrix = glm::perspective(fov, aspect_ratio, near_plane, far_plane);
 			mDirty = false;
 		}
@@ -327,4 +314,4 @@ namespace nap
 		components.push_back(RTTI_OF(TransformComponent));
 	}
 
-}
+}

modules/naprender/src/perspcameracomponent.h

@@ -84,15 +84,15 @@ namespace nap
 		virtual const glm::mat4 getViewMatrix() const override;
 
 		/**
-		 * Use this function to split the projection into a grid of squares. This can be used to render to multiple screens 
+		 * Use this function to split the projection into a regular grid. This can be used to render to multiple screens
 		 * with a single camera. Use setGridLocation to set the horizontal and vertical index into this grid.
 		 * @param numRows the number of cells in the horizontal
 		 * @param numColumns the number of cells in the vertical direction.
 		 */
 		void setGridDimensions(int numRows, int numColumns);
 
 		/**
-		* Sets the horizontal and vertical index into the projection grid as set by setSplitDimensions.
+		* Sets the horizontal and vertical index into the projection grid as set by setGridDimensions.
 		*/
 		void setGridLocation(int row, int column);
 
@@ -129,10 +129,12 @@ namespace nap
 		void updateProjectionMatrices() const;
 
 	protected:
-		mutable glm::mat4x4				mProjectionMatrix;			// The composed projection matrix
-		mutable glm::mat4x4				mRenderProjectionMatrix;	// The composed projection matrix used by the renderer
-		mutable bool					mDirty = true;				// If the projection matrix needs to be recalculated
-		PerpCameraProperties			mProperties;				// These properties are copied from the resource to the instance. When these are changed, only the instance is affected
-		TransformComponentInstance*		mTransformComponent;		// Cached transform component
+		mutable glm::mat4x4				mProjectionMatrix;						// The composed projection matrix
+		mutable glm::mat4x4				mRenderProjectionMatrix;				// The composed projection matrix used by the renderer
+		mutable bool					mDirty = true;							// If the projection matrix needs to be recalculated
+		PerpCameraProperties			mProperties;							// These properties are copied from the resource to the instance. When these are changed, only the instance is affected
+		TransformComponentInstance*		mTransformComponent;					// Cached transform component
+
+		bool							mPerpendicularRenderProjection = true;	// Whether the render projection matrix should be projected onto a perpendicular surface
 	};
 }