Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 330 vs 331 for /trunk/Source Code/Graphs/SceneGraph.cpp

Diff revisions: vs.
  @@ -7,7 +7,7 @@
7 7 namespace Divide {
8 8 SceneGraph::SceneGraph()
9 9 {
10 - _root = New SceneGraphNode(this, New SceneRoot(), "ROOT");
10 + _root = MemoryManager_NEW SceneGraphNode(this, MemoryManager_NEW SceneRoot(), "ROOT");
11 11 _root->getComponent<RenderingComponent>()->castsShadows(false);
12 12 _root->getComponent<RenderingComponent>()->receivesShadows(false);
13 13 _root->setBBExclusionMask(TYPE_SKY |
  @@ -25,18 +25,18 @@
25 25 // Should recursively call unload on the entire scene graph
26 26 _root->unload();
27 27 // Should recursively call delete on the entire scene graph
28 - MemoryManager::SAFE_DELETE(_root);
28 + MemoryManager::DELETE(_root);
29 29 // Delete the root scene node
30 - MemoryManager::SAFE_DELETE(root);
30 + MemoryManager::DELETE(root);
31 31 }
32 32
33 33 void SceneGraph::idle() {
34 34 for (SceneGraphNode*& it : _pendingDeletionNodes) {
35 35 it->unload();
36 36 it->getParent()->removeNode(it);
37 - MemoryManager::SAFE_DELETE(it);
38 37 }
39 - _pendingDeletionNodes.clear();
38 +
39 + MemoryManager::DELETE_VECTOR(_pendingDeletionNodes);
40 40 }
41 41
42 42 void SceneGraph::sceneUpdate(const U64 deltaTime, SceneState& sceneState){