extend mitsuba format with camera move speed

Author: devshgraphicsprogramming

examples_tests/22.RaytracedAO/main.cpp

@@ -115,6 +115,7 @@ int main()
 
 	// TODO: Move into renderer?
 	bool rightHandedCamera = true;
+	float moveSpeed = core::nan<float>();
 	auto camera = smgr->addCameraSceneNode(nullptr);
 	auto isOkSensorType = [](const ext::MitsubaLoader::CElementSensor& sensor) -> bool {
 		return sensor.type == ext::MitsubaLoader::CElementSensor::Type::PERSPECTIVE || sensor.type == ext::MitsubaLoader::CElementSensor::Type::THINLENS;
@@ -204,6 +205,7 @@ int main()
 			camera->setProjectionMatrix(core::matrix4SIMD::buildProjectionMatrixPerspectiveFovRH(core::radians(realFoVDegrees), aspectRatio, nearClip, persp->farClip));
 		else
 			camera->setProjectionMatrix(core::matrix4SIMD::buildProjectionMatrixPerspectiveFovLH(core::radians(realFoVDegrees), aspectRatio, nearClip, persp->farClip));
+		moveSpeed = persp->moveSpeed;
 	}
 	else
 	{
@@ -271,7 +273,9 @@ int main()
 		core::vector3df_SIMD ptu[] = {core::vectorSIMDf().set(camera->getPosition()),camera->getTarget(),camera->getUpVector()};
 		auto proj = camera->getProjectionMatrix();
 
-		camera = smgr->addCameraSceneNodeFPS(nullptr, 80.f, core::min(extent.X, extent.Y, extent.Z) * 0.0001f);
+		if (core::isnan(moveSpeed))
+			moveSpeed = core::min(extent.X,extent.Y,extent.Z)*0.0001f;
+		camera = smgr->addCameraSceneNodeFPS(nullptr,80.f,moveSpeed);
 		camera->setPosition(ptu[0].getAsVector3df());
 		camera->setTarget(ptu[1].getAsVector3df());
 		camera->setUpVector(ptu[2]);

include/nbl/ext/MitsubaLoader/CElementSensor.h

@@ -37,6 +37,7 @@ class CElementSensor : public IElement
 		};
 	struct ShutterSensor
 	{
+		float moveSpeed = core::nan<float>();
 		float shutterOpen = 0.f;
 		float shutterClose = 0.f;
 	};

src/nbl/ext/MitsubaLoader/CElementSensor.cpp

@@ -163,6 +163,7 @@ bool CElementSensor::addProperty(SNamedPropertyElement&& _property)
 	};
 	auto setShutterOpen		= SET_PROPERTY_TEMPLATE(shutterOpen,SNamedPropertyElement::Type::FLOAT,ShutterSensor);
 	auto setShutterClose	= SET_PROPERTY_TEMPLATE(shutterClose,SNamedPropertyElement::Type::FLOAT,ShutterSensor);
+	auto setMoveSpeed		= SET_PROPERTY_TEMPLATE(moveSpeed,SNamedPropertyElement::Type::FLOAT,ShutterSensor);
 	auto setNearClip		= SET_PROPERTY_TEMPLATE(nearClip,SNamedPropertyElement::Type::FLOAT,CameraBase);
 	auto setFarClip			= SET_PROPERTY_TEMPLATE(farClip,SNamedPropertyElement::Type::FLOAT,CameraBase);
 	auto setFocusDistance	= SET_PROPERTY_TEMPLATE(focusDistance,SNamedPropertyElement::Type::FLOAT,DepthOfFieldBase);
@@ -176,6 +177,7 @@ bool CElementSensor::addProperty(SNamedPropertyElement&& _property)
 		{"fovAxis",			setFovAxis},
 		{"shutterOpen",		setShutterOpen},
 		{"shuttterClose",	setShutterClose},
+		{"moveSpeed",		setMoveSpeed},
 		{"nearClip",		setNearClip},
 		{"farClip",			setFarClip},
 		{"focusDistance",	setFocusDistance},