Changeset 3746 in orxonox.OLD for orxonox/branches/levelloader/src/lib/coord

Timestamp:

Apr 7, 2005, 3:54:49 PM (20 years ago)

Author:

chris

Message:

orxonox/branches/levelloader: Merged trunk into branch… still not working though…

Location:

orxonox/branches/levelloader/src/lib/coord

Files:

• helper_parent.h (modified) (1 diff)
• null_parent.cc (modified) (4 diffs)
• null_parent.h (modified) (2 diffs)
• p_node.cc (modified) (24 diffs)
• p_node.h (modified) (6 diffs)

orxonox/branches/levelloader/src/lib/coord/helper_parent.h

@@ -8 +8 @@
 #define _HELPER_PARENT_H
 
-#include "stdincl.h"
+
 #include "p_node.h"
 

orxonox/branches/levelloader/src/lib/coord/null_parent.cc

@@ -19 +19 @@
 
 #include "null_parent.h"
+#include "stdincl.h"
+#include "vector.h"
+#include "list.h"
 
 
@@ -51 +54 @@
   this->parent = this;
   this->mode = PNODE_ALL;
-  this->absCoordinate = *absCoordinate;
+  *this->absCoordinate = *absCoordinate;
   this->setName("NullParent");
 }
@@ -74 +77 @@
    worry, normaly...
 */
-void NullParent::update ()
+void NullParent::update (float dt)
 {
 
-  PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
-  this->absCoordinate = this->relCoordinate;
-  this->absDirection = parent->getAbsDir () * this->relDirection;
-  
-  PNode* pn = this->children->enumerate ();
+  PRINTF(4)("NullParent::update - (%f, %f, %f)\n", this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
+  *this->absCoordinate = *this->relCoordinate;
+  *this->absDirection = parent->getAbsDir () * *this->relDirection;
+
+  tIterator<PNode>* iterator = this->children->getIterator();
+  //PNode* pn = this->children->enumerate ();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL) 
     { 
@@ -89 +94 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
-      pn->update ();
-      pn = this->children->nextElement ();
+      pn->update (dt);
+      //pn = this->children->nextElement ();
+      pn = iterator->nextElement();
     }
 

orxonox/branches/levelloader/src/lib/coord/null_parent.h

@@ -8 +8 @@
 #define _NULL_PARENT_H
 
-#include "stdincl.h"
+
 #include "p_node.h"
 
@@ -19 +19 @@
 
 
-  virtual void update ();
-
+  virtual void update (float dt);
+  
  private:
   NullParent ();

orxonox/branches/levelloader/src/lib/coord/p_node.cc

@@ -21 +21 @@
 
 #include "p_node.h"
-
+#include "stdincl.h"
+
+#include "error.h"
+#include "debug.h"
+#include "list.h"
+#include "vector.h"
 #include "null_parent.h"
-#include "vector.h"
+
+
+//#include "vector.h"
+//#include "quaternion.h"
 
 using namespace std;
@@ -52 +60 @@
   this->init(parent);
 
-  this->absCoordinate = *absCoordinate;
+  *this->absCoordinate = *absCoordinate;
   if (parent != NULL)
     {
-      this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+      *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
       parent->addChild (this);
     }
   else 
-    this->relCoordinate = Vector(0,0,0);
+    this->relCoordinate = new Vector(0,0,0);
 }
 
@@ -94 +102 @@
 }
 
+
 void PNode::init(PNode* parent)
 {
@@ -103 +112 @@
   this->parent = parent; 
   this->objectName = NULL;
+
+  this->absCoordinate = new Vector();
+  this->relCoordinate = new Vector();
+  this->absDirection = new Quaternion();
+  this->relDirection = new Quaternion();
+  this->lastAbsCoordinate = new Vector();
 }
 
@@ -129 +144 @@
    \brief get relative coordinates
    \returns relative coordinates to its parent
-*/
-Vector PNode::getRelCoor ()
-{
-  Vector r = this->relCoordinate; /* return a copy, so it can't be modified */
-  return r;
+   
+   the reference that is returned is a pointer to the real relCoor, so don't 
+   change it unless you realy know what you are doing.
+*/
+Vector* PNode::getRelCoor ()
+{
+  //Vector r = *this->relCoordinate; /* return a copy, so it can't be modified */
+  return this->relCoordinate;
 }
 
@@ -148 +166 @@
 {
   this->bRelCoorChanged = true;
-  this->relCoordinate = *relCoord;
+  *this->relCoordinate = *relCoord;
+}
+
+
+/**
+   \brief set relative coordinates
+   \param relCoord relative coordinates to its parent
+
+   it is very importand, that you use this function, if you want to update the
+   relCoordinates. If you don't use this, the PNode won't recognize, that something
+   has changed and won't update the children Nodes.
+*/
+void PNode::setRelCoor (Vector relCoord)
+{
+  this->bRelCoorChanged = true;
+  *this->relCoordinate = relCoord;
 }
 
@@ -158 +191 @@
 Vector PNode::getAbsCoor ()
 {
-  return this->absCoordinate;
+  return *this->absCoordinate;
 }
 
@@ -172 +205 @@
 {
   this->bAbsCoorChanged = true;
-  this->absCoordinate = *absCoord;
+  *this->absCoordinate = *absCoord;
+}
+
+
+
+/**
+   \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;
 }
 
@@ -200 +248 @@
   if( this->bAbsCoorChanged)
     {
-      this->absCoordinate = this->absCoordinate + *shift;
+      *this->absCoordinate = *this->absCoordinate + *shift;
     }
   else 
     {
-      this->relCoordinate = this->relCoordinate + *shift;
+      *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 (Vector shift)
+{
+  if( this->bAbsCoorChanged)
+    {
+      *this->absCoordinate = *this->absCoordinate + shift;
+    }
+  else 
+    {
+      *this->relCoordinate = *this->relCoordinate + shift;
       this->bRelCoorChanged = true;
     }
@@ -217 +300 @@
 Quaternion PNode::getRelDir ()
 {
-  return this->relDirection;
+  return *this->relDirection;
 }
 
@@ -232 +315 @@
 {
   this->bRelCoorChanged = true;
-  this->relDirection = *relDir;
+  *this->relDirection = *relDir;
+}
+
+
+void PNode::setRelDir (Quaternion relDir)
+{
+  this->bRelCoorChanged = true;
+  *this->relDirection = relDir;
 }
 
@@ -242 +332 @@
 Quaternion PNode::getAbsDir ()
 {
-  return this->absDirection;
+  return *this->absDirection;
 }
 
@@ -257 +347 @@
 {
   this->bAbsDirChanged = true;
-  this->absDirection = *absDir;
-}
+  *this->absDirection = *absDir;
+}
+
+
+
+/**
+   \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;
+}
+
 
 
@@ -285 +392 @@
 {}
 
+
+/**
+   \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)
+{}
+
+
+/**
+   \brief this calculates the current movement speed of the node
+*/
+float PNode::getSpeed()
+{
+  if(this->time == 0)
+    return 1000;
+  Vector diff;
+  diff = *this->absCoordinate - *this->lastAbsCoordinate;
+  float x = diff.len();
+  return x / this->time;
+}
+
+
 /**
    \brief adds a child and makes this node to a parent
@@ -308 +455 @@
   if( pNode->parent != NULL )
     {
-      PRINTF(2)("PNode::addChild() - reparenting node: removing it and adding it again\n");
+      PRINTF(3)("PNode::addChild() - reparenting node: removing it and adding it again\n");
       pNode->parent->children->remove(pNode);
     }
@@ -338 +485 @@
 void PNode::remove()
 {
-  NullParent* np = NullParent::getInstance();
-  PNode* pn = this->children->enumerate();
+  NullParent* nullParent = NullParent::getInstance();
+
+  tIterator<PNode>* iterator = this->children->getIterator();
+  PNode* pn = iterator->nextElement();
+ 
   while( pn != NULL) 
     { 
-      this->children->remove(pn);
-      np->addChild(pn, pn->getMode());
-      pn = this->children->nextElement();
-    }
+      //this->children->remove(pn);
+      nullParent->addChild(pn, pn->getMode());
+      pn = iterator->nextElement();
+    }
+  delete iterator;
+  this->parent->children->remove(this);
 }
 
@@ -410 +562 @@
    worry, normaly...
 */
-void PNode::update ()
-{
-  PRINTF(2)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
-  // printf("%s", this->objectName);
+void PNode::update (float dt)
+{
+  *this->lastAbsCoordinate = *this->absCoordinate;
+  this->time = dt;
+  PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
   if(this->mode & PNODE_MOVEMENT )
     {
@@ -419 +572 @@
         {
           /* if you have set the absolute coordinates this overrides all other changes */
-          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+          *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
       else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -426 +579 @@
           if( this->parent == NULL)
             {
-              this->absCoordinate = this->relCoordinate;
+              *this->absCoordinate = *this->relCoordinate;
             }
           else
-            this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;         /* update the current absCoordinate */
+            *this->absCoordinate = parent->getAbsCoor() + *this->relCoordinate;       /* update the current absCoordinate */
         }
     }
@@ -438 +591 @@
         {
           /* if you have set the absolute coordinates this overrides all other changes */
-          this->relDirection = this->absDirection - parent->getAbsDir();
+          *this->relDirection = *this->absDirection - parent->getAbsDir();
         }
       else if( this->bRelDirChanged /*&& this->timeStamp != DataTank::timeStamp*/)
         {
           /* update the current absDirection - remember * means rotation around sth.*/
-          this->absDirection = parent->getAbsDir() * this->relDirection;
+          *this->absDirection = parent->getAbsDir() * *this->relDirection;
         }
     }
@@ -452 +605 @@
         {
           /* if you have set the absolute coordinates this overrides all other changes */
-          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
+          *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
         }
       else if( this->bRelCoorChanged /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -458 +611 @@
           /*this is bad style... must be deleted later - just for testing*/
           if( this->parent == NULL)
-            this->absCoordinate = this->relCoordinate;
+            *this->absCoordinate = *this->relCoordinate;
           else
-            this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(this->relCoordinate);              /* update the current absCoordinate */
+            *this->absCoordinate = parent->getAbsCoor() + parent->getAbsDir().apply(*this->relCoordinate);            /* update the current absCoordinate */
         }
     }
   
   
-  PNode* pn = this->children->enumerate();
+  tIterator<PNode>* iterator = this->children->getIterator();
+  //PNode* pn = this->children->enumerate();
+  PNode* pn = iterator->nextElement();
   while( pn != NULL) 
     { 
@@ -473 +628 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
-      pn->update();
-      pn = this->children->nextElement();
-    }
+
+      pn->update(dt);
+      //pn = this->children->nextElement();
+      pn = iterator->nextElement();
+    }
+  delete iterator;
 
   this->timeStamp = timeStamp;
@@ -507 +665 @@
 {
   PRINTF(2)("PNode::debug() - absCoord: (%f, %f, %f)\n", 
-         this->absCoordinate.x, 
-         this->absCoordinate.y,
-         this->absCoordinate.z);
+         this->absCoordinate->x, 
+         this->absCoordinate->y,
+         this->absCoordinate->z);
 }
 

orxonox/branches/levelloader/src/lib/coord/p_node.h

@@ -23 +23 @@
 
 #include "base_object.h"
+//#include "vector.h"
 
 // FORWARD DEFINITION \\
@@ -28 +29 @@
 class Quaternion;
 class Vector;
+template<class T> class tList;
 
 //! enumeration for the different translation-binding-types
@@ -55 +57 @@
 
 
-  Vector getRelCoor ();
+  Vector* getRelCoor ();
   void setRelCoor (Vector* relCoord);
-  //void setRelCoor (Vector relCoord);
+  void setRelCoor (Vector relCoord);
   Vector getAbsCoor ();
   void setAbsCoor (Vector* absCoord);
-  //void setAbsCoor (Vector absCoord);
+  void setAbsCoor (Vector absCoord);
   void shiftCoor (Vector* shift);
+  void shiftCoor (Vector shift);
   //void shiftCoor (Vector shift);
 
   Quaternion getRelDir ();
   void setRelDir (Quaternion* relDir);
+  void setRelDir (Quaternion relDir);
   Quaternion getAbsDir ();
   void setAbsDir (Quaternion* absDir);
+  void setAbsDir (Quaternion absDir);
   void shiftDir (Quaternion* shift);
+  void shiftDir (Quaternion shift);
+
+  float getSpeed();
 
   void addChild (PNode* pNode);
@@ -82 +90 @@
   int getMode();
 
-  virtual void update ();
+  virtual void update (float dt);
   void processTick (float dt);
 
@@ -90 +98 @@
 
   void debug ();
-
- private:
-  void init(PNode* parent);
 
  protected:
@@ -102 +107 @@
   bool bRelDirChanged;     //!< If Relative Direction has changed since last time we checked
 
-  Vector relCoordinate;    //!< coordinates relative to the parent
-  Vector absCoordinate;    //!< absolute coordinates in the world ( from (0,0,0) )
-  Quaternion relDirection; //!< direction relative to the parent
-  Quaternion absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
+  Vector* relCoordinate;    //!< coordinates relative to the parent
+  Vector* absCoordinate;    //!< absolute coordinates in the world ( from (0,0,0) )
+  Quaternion* relDirection; //!< direction relative to the parent
+  Quaternion* absDirection; //!< absolute direvtion in the world ( from (0,0,1) )
 
   int mode;                //!< the mode of the binding
 
+ private:
+  void init(PNode* parent);
+
+  Vector* lastAbsCoordinate; //!< this is used for speedcalculation, it stores the last coordinate
+  float time;                //!< time since last update
 };