Panagiotis Christopoulos Charitos 8 лет назад
Родитель
Сommit
82883a1daa

+ 1 - 1
src/anki/core/App.cpp

@@ -395,7 +395,7 @@ Error App::mainLoop()
 		// User update
 		ANKI_CHECK(userMainLoop(quit));
 
-		ANKI_CHECK(m_scene->update(prevUpdateTime, crntTime, *m_renderer));
+		ANKI_CHECK(m_scene->update(prevUpdateTime, crntTime));
 
 		ANKI_CHECK(m_renderer->render(*m_scene));
 

+ 2 - 2
src/anki/scene/SceneGraph.cpp

@@ -185,7 +185,7 @@ void SceneGraph::deleteNodesMarkedForDeletion()
 	}
 }
 
-Error SceneGraph::update(F32 prevUpdateTime, F32 crntTime, MainRenderer& renderer)
+Error SceneGraph::update(F32 prevUpdateTime, F32 crntTime)
 {
 	ANKI_ASSERT(m_mainCam);
 	ANKI_TRACE_START_EVENT(SCENE_UPDATE);
@@ -231,7 +231,7 @@ Error SceneGraph::update(F32 prevUpdateTime, F32 crntTime, MainRenderer& rendere
 	ANKI_CHECK(threadPool.waitForAllThreadsToFinish());
 	ANKI_TRACE_STOP_EVENT(SCENE_NODES_UPDATE);
 
-	doVisibilityTests(*m_mainCam, *this, renderer.getOffscreenRenderer());
+	doVisibilityTests(*m_mainCam, *this);
 
 	ANKI_TRACE_STOP_EVENT(SCENE_UPDATE);
 	return ErrorCode::NONE;

+ 1 - 1
src/anki/scene/SceneGraph.h

@@ -119,7 +119,7 @@ public:
 		return *m_stagingAlloc;
 	}
 
-	ANKI_USE_RESULT Error update(F32 prevUpdateTime, F32 crntTime, MainRenderer& renderer);
+	ANKI_USE_RESULT Error update(F32 prevUpdateTime, F32 crntTime);
 
 	SceneNode& findSceneNode(const CString& name);
 	SceneNode* tryFindSceneNode(const CString& name);

+ 1 - 1
src/anki/scene/Visibility.cpp

@@ -567,7 +567,7 @@ void VisibilityTestResults::combineWith(SceneFrameAllocator<U8> alloc, WeakArray
 	}
 }
 
-void doVisibilityTests(SceneNode& fsn, SceneGraph& scene, const Renderer& r)
+void doVisibilityTests(SceneNode& fsn, SceneGraph& scene)
 {
 	ANKI_TRACE_START_EVENT(SCENE_VISIBILITY_TESTS);
 

+ 1 - 17
src/anki/scene/Visibility.h

@@ -21,22 +21,6 @@ class Renderer;
 /// @addtogroup scene
 /// @{
 
-/// Visibility test type
-enum VisibilityTest
-{
-	VT_RENDERABLES = 1 << 0,
-	VT_ONLY_SHADOW_CASTERS = 1 << 1,
-	VT_LIGHTS = 1 << 2
-};
-
-/// Visible by
-enum VisibleBy
-{
-	VB_NONE = 0,
-	VB_CAMERA = 1 << 0,
-	VB_LIGHT = 1 << 1
-};
-
 /// Visible node pointer with some more info
 /// @note Keep this structure as small as possible
 class VisibleNode
@@ -174,7 +158,7 @@ private:
 };
 
 /// Do visibility tests.
-void doVisibilityTests(SceneNode& frustumable, SceneGraph& scene, const Renderer& renderer);
+void doVisibilityTests(SceneNode& frustumable, SceneGraph& scene);
 /// @}
 
 } // end namespace anki