Changeset 6048 in orxonox.OLD for trunk/src/lib/coord/p_node.h

Timestamp:

Dec 11, 2005, 3:04:04 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: some fixes, to PNode and world.

File:

• trunk/src/lib/coord/p_node.h (modified) (4 diffs)

trunk/src/lib/coord/p_node.h

@@ -43 +43 @@
   // REPARENTING
   PNODE_REPARENT_TO_NULLPARENT         = 0x0010,    //!< Reparents to the NullParent, if the Parent is Removed.
-  PNODE_REPARENT_TO_PARANTS_PARENT     = 0x0020,    //!< Reparents the Node to the parents (old) parent it the parent gets removed.
+  PNODE_REPARENT_TO_PARENTS_PARENT     = 0x0020,    //!< Reparents the Node to the parents (old) parent it the parent gets removed.
   PNODE_REPARENT_DELETE_CHILDREN       = 0x0040,    //!< Deletes the Children of the node when This Node is Removed. (Use with care).
   PNODE_REPARENT_KEEP_POSITION         = 0x0080,    //!< Tries to keep the Position if the Node is reparented.
@@ -51 +51 @@
   PNODE_PROHIBIT_CHILD_DELETE          = 0x0100,    //!< Prohibits the Children from being deleted if this Node gets deleted.
   PNODE_PROHIBIT_DELETE_WITH_PARENT    = 0x0200,    //!< Prohibits the Node to be deleted if the Parent is. Child will be reparented according to the Repaenting-Rules
-  PNODE_REPARENT_CHILDREN_ON_DELETE    = 0x0400,    //!< Reparents the Children of the Node to 
+  PNODE_REPARENT_CHILDREN_ON_DELETE    = 0x0400,    //!< Reparents the Children of the Node to
   PNODE_REPARANT_CHILDREN_ON_REMOVE    = 0x0800,    //!< Reparents the Children of the Node if the Node gets Removed.
 
@@ -132 +132 @@
   void removeNode();
 
-  void setParent (PNode* parent);
+  /** @param the new parent of this node */
+  inline void setParent (PNode* parent) { parent->addChild(this); };
   void setParent (const char* parentName);
   /** @returns the parent of this PNode */
@@ -169 +170 @@
   inline Vector getLastAbsCoor() { return this->lastAbsCoordinate; }
 
+  void reparent();
 
  private: