SceneNode::VisiblityTest now use Camera instead of Frustum

Former-commit-id: 71199e3e80c5fbd6116d5fedb13276480f4e4731

src/Nazara/Graphics/Camera.cpp

@@ -158,7 +158,6 @@ void NzCamera::SetFOV(float fov)
 
 void NzCamera::SetTarget(const NzRenderTarget* renderTarget)
 {
-	NazaraError(NzString::Pointer(m_target));
 	if (m_target)
 		m_target->RemoveListener(this);
 
@@ -307,9 +306,9 @@ void NzCamera::UpdateViewport() const
 	m_viewportUpdated = true;
 }
 
-bool NzCamera::VisibilityTest(const NzFrustumf& frustum)
+bool NzCamera::VisibilityTest(const NzCamera* camera)
 {
-	NazaraUnused(frustum);
+	NazaraUnused(camera);
 	//NazaraInternalError("SceneNode::IsVisible() called on Camera");
 	return false;
 }

src/Nazara/Graphics/Light.cpp

@@ -5,6 +5,7 @@
 #include <Nazara/Graphics/Light.hpp>
 #include <Nazara/Core/Error.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
+#include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Math/Basic.hpp>
 #include <Nazara/Math/Sphere.hpp>
 #include <Nazara/Renderer/Renderer.hpp>
@@ -307,7 +308,7 @@ void NzLight::UpdateBoundingVolume() const
 	m_boundingVolumeUpdated = true;
 }
 
-bool NzLight::VisibilityTest(const NzFrustumf& frustum)
+bool NzLight::VisibilityTest(const NzCamera* camera)
 {
 	switch (m_type)
 	{
@@ -319,13 +320,13 @@ bool NzLight::VisibilityTest(const NzFrustumf& frustum)
 				UpdateDerived();
 
 			// Un test sphérique est bien plus rapide et précis que celui de la bounding box
-			return frustum.Contains(NzSpheref(m_derivedPosition, m_radius));
+			return camera->GetFrustum().Contains(NzSpheref(m_derivedPosition, m_radius));
 
 		case nzLightType_Spot:
 			if (!m_boundingVolumeUpdated)
 				UpdateBoundingVolume();
 
-			return frustum.Contains(m_boundingVolume);
+			return camera->GetFrustum().Contains(m_boundingVolume);
 	}
 
 	NazaraError("Invalid light type (0x" + NzString::Number(m_type, 16) + ')');

src/Nazara/Graphics/Model.cpp

@@ -4,11 +4,11 @@
 
 #include <Nazara/Graphics/Model.hpp>
 #include <Nazara/Graphics/AbstractRenderQueue.hpp>
+#include <Nazara/Graphics/Camera.hpp>
 #include <Nazara/Graphics/Config.hpp>
 #include <Nazara/Utility/SkeletalMesh.hpp>
 #include <Nazara/Utility/StaticMesh.hpp>
 #include <memory>
-#include <tuple>
 #include <Nazara/Graphics/Debug.hpp>
 
 bool NzModelParameters::IsValid() const
@@ -671,7 +671,7 @@ void NzModel::UpdateBoundingVolume() const
 	m_boundingVolumeUpdated = true;
 }
 
-bool NzModel::VisibilityTest(const NzFrustumf& frustum)
+bool NzModel::VisibilityTest(const NzCamera* camera)
 {
 	#if NAZARA_GRAPHICS_SAFE
 	if (!IsDrawable())
@@ -687,7 +687,7 @@ bool NzModel::VisibilityTest(const NzFrustumf& frustum)
 	if (!m_boundingVolumeUpdated)
 		UpdateBoundingVolume();
 
-	return frustum.Contains(m_boundingVolume);
+	return camera->GetFrustum().Contains(m_boundingVolume);
 }
 
 NzModelLoader::LoaderList NzModel::s_loaders;

src/Nazara/Graphics/Scene.cpp

@@ -76,8 +76,8 @@ void NzScene::Cull()
 
 	m_impl->visibleUpdateList.clear();
 
-	// Frustum culling
-	RecursiveFrustumCull(m_impl->renderTechnique->GetRenderQueue(), m_impl->activeCamera->GetFrustum(), &m_impl->root);
+	// Frustum culling/Viewport culling
+	RecursiveCameraCull(m_impl->renderTechnique->GetRenderQueue(), m_impl->activeCamera, &m_impl->root);
 
 	///TODO: Occlusion culling
 
@@ -209,21 +209,22 @@ NzScene::operator const NzSceneNode&() const
 	return m_impl->root;
 }
 
-void NzScene::RecursiveFrustumCull(NzAbstractRenderQueue* renderQueue, const NzFrustumf& frustum, NzNode* node)
+void NzScene::RecursiveCameraCull(NzAbstractRenderQueue* renderQueue, const NzCamera* camera, NzNode* node)
 {
 	for (NzNode* child : node->GetChilds())
 	{
 		if (child->GetNodeType() == nzNodeType_Scene)
 		{
 			NzSceneNode* sceneNode = static_cast<NzSceneNode*>(child);
+
 			///TODO: Empêcher le rendu des enfants si le parent est cullé selon un flag
-			sceneNode->UpdateVisibility(frustum);
+			sceneNode->UpdateVisibility(camera);
 			if (sceneNode->IsVisible())
 				sceneNode->AddToRenderQueue(renderQueue);
 		}
 
 		if (child->HasChilds())
-			RecursiveFrustumCull(renderQueue, frustum, child);
+			RecursiveCameraCull(renderQueue, camera, child);
 	}
 }
 

src/Nazara/Graphics/SceneNode.cpp

@@ -97,11 +97,11 @@ void NzSceneNode::Update()
 {
 }
 
-void NzSceneNode::UpdateVisibility(const NzFrustumf& frustum)
+void NzSceneNode::UpdateVisibility(const NzCamera* camera)
 {
 	bool wasVisible = m_visible;
 
-	m_visible = VisibilityTest(frustum);
+	m_visible = VisibilityTest(camera);
 
 	if (m_visible != wasVisible)
 		OnVisibilityChange(m_visible);

src/Nazara/Graphics/SceneRoot.cpp

@@ -41,9 +41,9 @@ void NzSceneRoot::Unregister()
 	NazaraInternalError("SceneNode::Unregister() called on SceneRoot");
 }
 
-bool NzSceneRoot::VisibilityTest(const NzFrustumf& frustum)
+bool NzSceneRoot::VisibilityTest(const NzCamera* camera)
 {
-	NazaraUnused(frustum);
+	NazaraUnused(camera);
 
 	return true; // Toujours visible
 }

src/Nazara/Graphics/SkyboxBackground.cpp

@@ -204,6 +204,7 @@ void NzSkyboxBackground::Draw(const NzScene* scene) const
 	skyboxMatrix.SetTranslation(NzVector3f::Zero());
 
 	NzRenderer::SetIndexBuffer(m_indexBuffer);
+	NzRenderer::SetMatrix(nzMatrixType_Projection, camera->GetProjectionMatrix());
 	NzRenderer::SetMatrix(nzMatrixType_View, skyboxMatrix);
 	NzRenderer::SetMatrix(nzMatrixType_World, NzMatrix4f::Scale(NzVector3f(camera->GetZNear())));
 	NzRenderer::SetRenderStates(states);