Changeset 3529 in orxonox.OLD

Timestamp:

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

Author:

patrick

Message:

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

Location:

orxonox/trunk/src

Files:

• lib/coord/null_parent.cc (modified) (2 diffs)
• lib/coord/p_node.cc (modified) (5 diffs)
• lib/coord/p_node.h (modified) (3 diffs)
• story_entities/world.cc (modified) (6 diffs)

orxonox/trunk/src/lib/coord/null_parent.cc

@@ -36 +36 @@
    \todo this constructor is not jet implemented - do it
 */
-NullParent::NullParent () 
+NullParent::NullParent () : PNode("NullParent")
 {
+  printf("NullParent::NullParent() - making new NullParent, there can only be one..\n");
   this->parent = this;
   this->mode = ALL;
+  this->setName("NullParent");
 }
 
 
-NullParent::NullParent (Vector* absCoordinate)
+NullParent::NullParent (Vector* absCoordinate) : PNode("NullParent")
 {
   this->parent = this;
   this->mode = ALL;
   this->absCoordinate = *absCoordinate;
+  this->setName("NullParent");
 }
 
@@ -58 +61 @@
 NullParent::~NullParent () 
 {
-  delete singletonRef;
+  //delete singletonRef;
   singletonRef = NULL;
 }

orxonox/trunk/src/lib/coord/p_node.cc

@@ -40 +40 @@
   this->bAbsDirChanged = false;
   this->parent = NULL;
+
+  printf("PNode::PNode() - constructor, now adding\n");
+  NullParent* np = NullParent::getInstance();
+  np->addChild(this);
+  printf("PNode::PNode() - finished adding\n");
 }
 
@@ -63 +68 @@
 }
 
+
+/**
+   \brief this constructor is very special.
+   \param with the name of the class
+
+   this constuctor exists, because there was a little issue with a
+   PNode<->NullPointer relation. It is crutial, that this construcor
+   exists, and is never used except from the NullParent itself. If you
+   delete it, there will probably be a endless loop, because in the
+   default constcutor of PNode NullPointer is generated, and NullPointer
+   gerenates itself again and again... 
+   dont't think about it...
+   \todo patrick think about this one here...
+*/
+PNode::PNode(char* name)
+{
+  printf("PNode::PNode(char*) - start\n");
+  this->children = new tList<PNode>();
+  this->bRelCoorChanged = true;
+  this->bAbsCoorChanged = false;
+  this->bRelDirChanged = true;
+  this->bAbsDirChanged = false;
+  this->parent = NULL; 
+  printf("PNode::PNode(char*) - end\n");
+}
 
 /**
@@ -96 +126 @@
       pn = this->children->nextElement();
     } 
+  /* this deletes all children in the list */
   this->children->destroy ();
 }
@@ -280 +311 @@
 void PNode::addChild (PNode* pNode, parentingMode mode)
 {
-  if( pNode->parent == NULL )
+  if( pNode->parent != NULL )
     {
-      pNode->mode = mode;
-      pNode->parent = this;
-      this->children->add (pNode);
+      printf("PNode::addChild() - removing child from old parent \n");
+      PRINTF(2)("PNode::addChild() - reparenting node: removing it and adding it again\n");
+      pNode->parent->removeChild(pNode);
     }
-  else
-    {
-      PRINTF(1)("PNode::addChild() - this node has already been added - closed Loop MARK \n");
-    }
+  pNode->mode = mode;
+  pNode->parent = this;
+  this->children->add(pNode);
+  printf("PNode::addChild() - Parent added\n");
 }
 
@@ -358 +389 @@
 void PNode::update (float timeStamp)
 {
-  printf ("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+  //printf ("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
+  // printf("%s", this->objectName);
 
       if( this->mode == MOVEMENT || this->mode == ALL)

orxonox/trunk/src/lib/coord/p_node.h

@@ -23 +23 @@
 
 #include "stdincl.h"
+
 
 class PNode; /* forward decleration, so that parentEntry has access to PNode */
@@ -80 +81 @@
 
  protected:
+  PNode(char*);
+
   float timeStamp;         //!< this the timeStamp of when the abs{Coordinat, Direction} has been calculated
   char* objectName;        //!< The name of the Object
@@ -95 +98 @@
 
 #endif /* _P_NODE_H */
+ 

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);