Changeset 3529 in orxonox.OLD for orxonox/trunk/src/story_entities

Timestamp:

Mar 13, 2005, 10:39:28 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: zero-loop problem in pnode, dynamic pnode realocation. unstable, segfault when changing level.

File:

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

orxonox/trunk/src/story_entities/world.cc

@@ -42 +42 @@
 {
   this->init(name, -1);
+  printf("World::World - generating Nullparent\n");
+  NullParent* np = NullParent::getInstance();
 }
 
@@ -67 +69 @@
 
   this->localCamera->destroy();
-  this->nullParent->destroy();  
+  this->nullParent->destroy();
+  delete this->nullParent;
   //delete this->skySphere;
 
@@ -252 +255 @@
             this->nullParent->setName ("NullParent");
 
-
-
             // create a player
             WorldEntity* myPlayer = new Player();
@@ -804 +805 @@
 void World::spawn(WorldEntity* entity)
 {
-  if( this->nullParent != NULL && entity->parent == NULL)
-    this->nullParent->addChild (entity);
-
+  this->nullParent->addChild (entity);
   this->entities->add (entity);
-
   entity->postSpawn ();
 }
@@ -821 +819 @@
 void World::spawn(WorldEntity* entity, Vector* absCoor, Quaternion* absDir)
 {
+  this->nullParent->addChild (entity);
+  this->entities->add (entity);
+
   entity->setAbsCoor (absCoor);
   entity->setAbsDir (absDir);
-  
-  if( this->nullParent != NULL && entity->parent == NULL)
-    this->nullParent->addChild (entity);
-
-  this->entities->add (entity);
 
   entity->postSpawn ();
@@ -845 +841 @@
 {
 
-  if( parentNode != NULL && entity->parent == NULL)
+  if( parentNode != NULL)
     {
       parentNode->addChild (entity);