Merge remote-tracking branch 'refs/remotes/origin/master' into reflection-mapping

2017-05-11 20:52:04 +02:00
parent 1305e8434a dd4466081f
commit 75d57b3c29
64 changed files with 1087 additions and 604 deletions
--- a/SDK/src/NDK/Components/CameraComponent.cpp
+++ b/SDK/src/NDK/Components/CameraComponent.cpp
@@ -93,6 +93,17 @@ namespace Ndk
 		return m_projectionMatrix;
 	}

+
+	/*!
+	* \brief Gets the projection type of the camera
+	* \return Projection type of the camera
+	*/
+	Nz::ProjectionType CameraComponent::GetProjectionType() const
+	{
+		return m_projectionType;
+	}
+
+
 	/*!
 	* \brief Gets the target of the camera
 	* \return A constant reference to the render target of the camera