Changeset 3813 in orxonox.OLD

Timestamp:

Apr 13, 2005, 11:12:34 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: finished work on tweaking pnode. pnode is now as fast as it can get:)

Location:

orxonox/trunk/src

Files:

• defs/debug.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (12 diffs)
• lib/coord/p_node.h (modified) (1 diff)

orxonox/trunk/src/defs/debug.h

@@ -58 +58 @@
 // DEFINE MODULES \\
 #define DEBUG_MODULE_ORXONOX            0
-#define DEBUG_MODULE_WORLD              0
+#define DEBUG_MODULE_WORLD              1
 #define DEBUG_MODULE_PNODE              1
 #define DEBUG_MODULE_WORLD_ENTITY       0

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

@@ -67 +67 @@
   }
   else 
-    this->relCoordinate = new Vector(0,0,0);
+    this->relCoordinate = new Vector();
 }
 
@@ -106 +106 @@
   this->parent = parent; 
   this->objectName = NULL;
+  this->time = 1.0; /* set time to 1 to make divisions by zero impossible */
 
   this->absCoordinate = new Vector();
@@ -167 +168 @@
 
 
-/**
-   \param absCoord set absolute coordinate
-
-   it is very importand, that you use this function, if you want to update the
-   absCoordinates. If you don't use this, the PNode won't recognize, that something
-   has changed and won't update the children Nodes.
-*/
-/*
-void PNode::setAbsCoor (Vector* absCoord)
-{
-  this->bAbsCoorChanged = true;
-  *this->absCoordinate = *absCoord;
-}
-*/
+
 
 
@@ -217 +205 @@
 
 */
-/*
-void PNode::shiftCoor (Vector* shift)
-{
-  __UNLIKELY_IF( this->bAbsCoorChanged)
-    {
-      *this->absCoordinate = *this->absCoordinate + *shift;
-    }
-  else 
-    {
-      *this->relCoordinate = *this->relCoordinate + *shift;
-      this->bRelCoorChanged = true;
-    }
-}
-*/
-
-
-/**
-   \brief shift coordinate (abs and rel)
-   \param shift vector
-
-   this function shifts the current coordinates about the vector shift. this is
-   usefull because from some place else you can:
-   PNode* someNode = ...;
-   Vector objectMovement = calculateShift();
-   someNode->shiftCoor(objectMovement);
-
-   elsewhere you would have to:
-   PNode* someNode = ...;
-   Vector objectMovement = calculateShift();
-   Vector currentCoor = someNode->getRelCoor();
-   Vector newCoor = currentCoor + objectMovement;
-   someNode->setRelCoor(newCoor);
-   
-   yea right... shorter...
-
-*/
 void PNode::shiftCoor (const Vector& shift)
 {
@@ -285 +237 @@
    has changed and won't update the children Nodes.
 */
-/*
-void PNode::setRelDir (Quaternion* relDir)
-{
-  this->bRelCoorChanged = true;
-  *this->relDirection = *relDir;
-}
-*/
-
-
 void PNode::setRelDir (const Quaternion& relDir)
 {
@@ -306 +249 @@
 */
 //Quaternion PNode::getAbsDir () const
-
-
-
-/**
-   \brief sets the absolute direction (0,0,1)
-   \param absDir absolute coordinates
-
-   it is very importand, that you use this function, if you want to update the
-   absDirection. If you don't use this, the PNode won't recognize, that something
-   has changed and won't update the children Nodes.
-*/
-/*
-void PNode::setAbsDir (Quaternion* absDir)
-{
-  this->bAbsDirChanged = true;
-  *this->absDirection = *absDir;
-}
-*/
 
 
@@ -371 +296 @@
 
 
-/**
-   \brief shift coordinate (abs and rel)
-   \param shift vector
-
-   this function shifts the current coordinates about the vector shift. this is
-   usefull because from some place else you can:
-   PNode* someNode = ...;
-   Quaternion objectMovement = calculateShift();
-   someNode->shiftCoor(objectMovement);
-
-   elsewhere you would have to:
-   PNode* someNode = ...;
-   Quaternion objectMovement = calculateShift();
-   Quaternion currentCoor = someNode->getRelCoor();
-   Quaternion newCoor = currentCoor + objectMovement;
-   someNode->setRelCoor(newCoor);
-   
-   yea right... shorter...
-
-   \todo implement this
-*/
-/*
-void PNode::shiftDir (Quaternion* shift)
-{}
-*/
-
 
 /**
@@ -403 +302 @@
 float PNode::getSpeed() const
 {
-  __UNLIKELY_IF( this->time == 0)
-    return 1000;
   *this->diffCoordinate = *this->absCoordinate - *this->lastAbsCoordinate;
   return this->diffCoordinate->len() / this->time;
@@ -419 +316 @@
 void PNode::addChild (PNode* pNode, int parentingMode)
 {
-
-  __UNLIKELY_IF( pNode->parent != NULL)
+  __LIKELY_IF( pNode->parent != NULL)
     {
       PRINTF(3)("PNode::addChild() - reparenting node: removing it and adding it again\n");
@@ -459 +355 @@
   while( pn != NULL) 
     { 
-      //this->children->remove(pn);
       nullParent->addChild(pn, pn->getMode());
       pn = iterator->nextElement();
@@ -504 +399 @@
    will force an update of the coordinated of the node.
 */
+/*
 void PNode::parentCoorChanged ()
 {
   this->bRelCoorChanged = true;
 }
+*/
 
 
@@ -516 +413 @@
    will force an update of the direction of the node.
 */
+/*
 void PNode::parentDirChanged ()
 {
   this->bRelDirChanged = true;
 }
+*/
 
 

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

@@ -77 +77 @@
 
   void setParent (PNode* parent);
-  void parentCoorChanged ();
-  void parentDirChanged ();
+  inline void parentCoorChanged () { this->bRelCoorChanged = true; }
+  inline void parentDirChanged () { this->bRelDirChanged = true; }
   void setMode (int parentingMode);
   int getMode() const;