Changeset 6074 in orxonox.OLD for trunk/src/story_entities/world.cc

Timestamp:

Dec 12, 2005, 11:34:02 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: taken out NullParent.
THE TRUNK IS NOT RUNNING FOR THE TIME BEING. DO NOT BE ALARMED, THIS IS TEMPORARY

File:

• trunk/src/story_entities/world.cc (modified) (6 diffs)

trunk/src/story_entities/world.cc

@@ -24 +24 @@
 
 #include "p_node.h"
-#include "null_parent.h"
 #include "pilot_node.h"
 #include "world_entity.h"
@@ -144 +143 @@
 
   // erease everything that is left.
-  delete NullParent::getInstance();
+  delete PNode::getNullParent();
 
   //secondary cleanup of PNodes;
@@ -222 +221 @@
 
   LightManager::getInstance();
-  NullParent::getInstance ();
+  PNode::getNullParent();
 
   AnimationPlayer::getInstance(); // initializes the animationPlayer
@@ -508 +507 @@
 
   /* update the object position before game start - so there are no wrong coordinates used in the first processing */
-  NullParent::getInstance()->updateNode (0.001f);
-  NullParent::getInstance()->updateNode (0.001f);
+  PNode::getNullParent()->updateNode (0.001f);
+  PNode::getNullParent()->updateNode (0.001f);
 
 }
@@ -766 +765 @@
   GarbageCollector::getInstance()->update();
   GraphicsEngine::getInstance()->update(this->dtS);
-  NullParent::getInstance()->updateNode (this->dtS);
+  PNode::getNullParent()->updateNode (this->dtS);
 
   SoundEngine::getInstance()->update();
@@ -823 +822 @@
 
   if (unlikely(this->showPNodes))
-    NullParent::getInstance()->debugDraw(0);
+    PNode::getNullParent()->debugDraw(0);
 
   GraphicsEngine::getInstance()->draw();