Changeset 3804 in orxonox.OLD for orxonox/trunk/src/lib

Timestamp:

Apr 13, 2005, 7:51:49 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: performance tweaking on PNode continiued: inlined all interface functions that are processed often (>100'000 times per game of 7sec.)

Location:

orxonox/trunk/src/lib/coord

Files:

• p_node.cc (modified) (5 diffs)
• p_node.h (modified) (3 diffs)

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

@@ -72 +72 @@
 /**
    \brief standard deconstructor
-
-   \todo this deconstructor is not jet implemented - do it
 */
 PNode::~PNode () 
 {
-  /*
-  delete &this->children;
-  delete &this->relCoordinate;
-  delete &this->absCoordinate;
-  delete &this->relDirection;
-  delete &this->absDirection;
-  */
-  //this->parent = NULL;
-  /* there is currently a problem with cleaning up - fix*/
-
-  PNode* pn = this->children->enumerate();
+  tIterator<PNode>* iterator = this->children->getIterator();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL) 
     { 
       delete pn;
-      pn = this->children->nextElement();
-
-    }
-   
+      pn = iterator->nextElement();
+    }
+  delete iterator;
   /* this deletes all children in the list */
   delete this->children;
-
+  this->parent = NULL;
   delete []this->objectName;
+
+  delete this->relCoordinate;
+  delete this->absCoordinate;
+  delete this->relDirection;
+  delete this->absDirection;
+  delete this->lastAbsCoordinate;
+  delete this->diffCoordinate;
 }
 
@@ -148 +143 @@
    change it unless you realy know what you are doing.
 */
-Vector* PNode::getRelCoor () const
-{
-  //Vector r = *this->relCoordinate; /* return a copy, so it can't be modified */
-  return this->relCoordinate;
-}
+//Vector* PNode::getRelCoor () const
+
 
 
@@ -189 +181 @@
    \returns absolute coordinates from (0,0,0)
 */
-Vector PNode::getAbsCoor () const
-{
-  return *this->absCoordinate;
-}
+//Vector PNode::getAbsCoor () const
 
 
@@ -300 +289 @@
    \returns relative direction to its parent
 */
-Quaternion PNode::getRelDir () const
-{
-  return *this->relDirection;
-}
+//Quaternion* PNode::getRelDir () const
+
 
 
@@ -332 +319 @@
    \returns absolute coordinates
 */
-Quaternion PNode::getAbsDir () const
-{
-  return *this->absDirection;
-}
+//Quaternion PNode::getAbsDir () const
+
 
 

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

@@ -23 +23 @@
 
 #include "base_object.h"
-//#include "vector.h"
+#include "vector.h"
 
 // FORWARD DEFINITION \\
 class PNode; /* forward decleration, so that parentEntry has access to PNode */
-class Quaternion;
-class Vector;
+//class Quaternion;
+//class Vector;
 template<class T> class tList;
 
@@ -57 +57 @@
 
 
-  Vector* getRelCoor () const;
+  inline Vector* getRelCoor () const { return this->relCoordinate; }
   void setRelCoor (Vector* relCoord);
   void setRelCoor (Vector relCoord);
-  Vector getAbsCoor () const;
+  inline Vector getAbsCoor () const { return *this->absCoordinate; }
   void setAbsCoor (Vector* absCoord);
   void setAbsCoor (Vector absCoord);
@@ -67 +67 @@
   //void shiftCoor (Vector shift);
 
-  Quaternion getRelDir () const;
+  inline Quaternion getRelDir () const { return *this->relDirection; }
   void setRelDir (Quaternion* relDir);
   void setRelDir (Quaternion relDir);
-  Quaternion getAbsDir () const;
+  inline Quaternion getAbsDir () const { return *this->absDirection; }
   void setAbsDir (Quaternion* absDir);
   void setAbsDir (Quaternion absDir);