Changeset 3554 in orxonox.OLD for orxonox

Timestamp:

Mar 15, 2005, 12:21:28 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: nicer constructor

Location:

orxonox/trunk/src/lib/coord

Files:

• null_parent.cc (modified) (2 diffs)
• p_node.cc (modified) (1 diff)
• p_node.h (modified) (1 diff)

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

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

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

@@ -48 +48 @@
 PNode::PNode (Vector* absCoordinate, PNode* parent )
 {
+  this->init(parent);
+
   this->absCoordinate = *absCoordinate;
-  this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
-  
-  this->init(parent);
-
-  parent->addChild (this);
-}
-
-
-/**
-   \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)
-{
-  this->init(NULL);
+  if (parent != NULL)
+    {
+      this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+      parent->addChild (this);
+    }
+  else 
+    this->relCoordinate = Vector(0,0,0);
 }
 

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

@@ -87 +87 @@
 
  protected:
-  PNode(char*);
-
   float timeStamp;         //!< this the timeStamp of when the abs{Coordinat, Direction} has been calculated
   char* objectName;        //!< The name of the Object