Browse Source

Start this branch

Panagiotis Christopoulos Charitos 7 years ago
parent
commit
770db80162
2 changed files with 12 additions and 0 deletions
  1. 9 0
      src/anki/scene/SceneGraph.cpp
  2. 3 0
      src/anki/scene/SceneGraph.h

+ 9 - 0
src/anki/scene/SceneGraph.cpp

@@ -7,6 +7,7 @@
 #include <anki/scene/CameraNode.h>
 #include <anki/scene/ModelNode.h>
 #include <anki/scene/SectorNode.h>
+#include <anki/scene/Octree.h>
 #include <anki/core/Trace.h>
 #include <anki/physics/PhysicsWorld.h>
 #include <anki/resource/ResourceManager.h>
@@ -61,6 +62,11 @@ SceneGraph::~SceneGraph()
 		m_alloc.deleteInstance(m_sectors);
 		m_sectors = nullptr;
 	}
+
+	if(m_octree)
+	{
+		m_alloc.deleteInstance(m_octree);
+	}
 }
 
 Error SceneGraph::init(AllocAlignedCallback allocCb,
@@ -94,6 +100,9 @@ Error SceneGraph::init(AllocAlignedCallback allocCb,
 
 	m_maxReflectionProxyDistance = config.getNumber("scene.imageReflectionMaxDistance");
 
+	m_octree = m_alloc.newInstance<Octree>(m_alloc);
+	m_octree->init(Vec3(-1000.0f), Vec3(1000.0f), 5); // TODO
+
 	// Init the default main camera
 	ANKI_CHECK(newSceneNode<PerspectiveCameraNode>("mainCamera", m_defaultMainCam));
 	m_defaultMainCam->setAll(toRad(60.0f), toRad(60.0f), 0.1f, 1000.0f);

+ 3 - 0
src/anki/scene/SceneGraph.h

@@ -27,6 +27,7 @@ class SectorGroup;
 class ConfigSet;
 class PerspectiveCameraNode;
 class UpdateSceneNodesCtx;
+class Octree;
 
 /// @addtogroup scene
 /// @{
@@ -254,6 +255,8 @@ private:
 	EventManager m_events;
 	SectorGroup* m_sectors;
 
+	Octree* m_octree = nullptr;
+
 	Atomic<U32> m_objectsMarkedForDeletionCount;
 
 	F32 m_maxReflectionProxyDistance = 0.0;