Changeset 3277 in orxonox.OLD for orxonox/branches/parenting/src/world.cc

Timestamp:

Dec 25, 2004, 1:44:31 AM (21 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: worldentity is now derived from parentnode, pNode added into the world class, not yet used activly.. this will be a mess…

File:

• orxonox/branches/parenting/src/world.cc (modified) (11 diffs)

orxonox/branches/parenting/src/world.cc

@@ -67 +67 @@
   this->entities->destroy();
 
+  /* FIX the parent list has to be cleared - not possible if we got the old list also*/
+  //this->nullParent->destroy ();
+
   delete this->entities;
   delete this->localCamera;
@@ -82 +85 @@
 
   /* this is only for test purposes */
-  //this->debug ();
+  this->debug ();
 }
 
@@ -128 +131 @@
         case DEBUG_WORLD_0:
           {
+            this->nullParent = new NullParent ();
+
             // create some path nodes
             this->pathnodes = new Vector[6];
@@ -146 +151 @@
             // !\todo old track-system has to be removed
 
-            //this->nullParent = new NullParent ();
-
             // create a player
             WorldEntity* myPlayer = new Player();
@@ -160 +163 @@
             this->localCamera = new Camera(this);
             this->getCamera()->bind (myPlayer); 
-
+            
+            /*
             Placement* plc = new Placement;
             plc->r = Vector(100, 10, 10);
@@ -166 +170 @@
             WorldEntity* env = new Environment();
             this->spawn(env, plc);
+            */
 
             break;
@@ -171 +176 @@
         case DEBUG_WORLD_1:
           {
+            this->nullParent = new NullParent ();
+
             // create some path nodes
             this->pathnodes = new Vector[6];
@@ -622 +629 @@
   p3->debug ();
   p4->debug ();
+
+  p1->destroy ();
+  
+  
   /*
   WorldEntity* entity;
@@ -778 +789 @@
   WorldEntity* owner;
 
+  if( this->nullParent != NULL)
+    this->nullParent->addChild (entity);
+
   entities->add (entity);
   zeroloc.dist = 0;
@@ -800 +814 @@
 void World::spawn(WorldEntity* entity, Location* loc)
 {
+  if( this->nullParent != NULL)
+    this->nullParent->addChild (entity);
+
   Location zeroLoc;
   WorldEntity* owner;
@@ -828 +845 @@
 void World::spawn(WorldEntity* entity, Placement* plc)
 {
+  if( this->nullParent != NULL)
+    this->nullParent->addChild (entity);
+
   Placement zeroPlc;
   WorldEntity* owner;