Changeset 3957 in orxonox.OLD

Timestamp:

Apr 25, 2005, 2:25:27 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/particleEngine: little patch for the pNode System. now all Vectors are passed as const Vector& … and are also handled as vectors and not pointers internally

Location:

orxonox/branches/particleEngine/src

Files:

• lib/coord/null_parent.cc (modified) (2 diffs)
• lib/coord/p_node.cc (modified) (20 diffs)
• lib/coord/p_node.h (modified) (4 diffs)
• track_manager.cc (modified) (2 diffs)
• track_node.cc (modified) (1 diff)
• track_node.h (modified) (1 diff)
• world_entities/camera.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)

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

@@ -54 +54 @@
   this->parent = this;
   this->mode = PNODE_ALL;
-  *this->absCoordinate = absCoordinate;
+  this->absCoordinate = absCoordinate;
   this->setName("NullParent");
 }
@@ -80 +80 @@
 {
 
-  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;
+  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();

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

@@ -60 +60 @@
   this->init(parent);
 
-  *this->absCoordinate = absCoordinate;
+  this->absCoordinate = absCoordinate;
 
   if (likely(parent != NULL))
   {
-    *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
+    this->relCoordinate = this->absCoordinate - parent->getAbsCoor();
     parent->addChild (this);
   }
-  else 
-    this->relCoordinate = new Vector();
 }
 
@@ -89 +87 @@
   delete []this->objectName;
 
-  delete this->relCoordinate;
-  delete this->absCoordinate;
-  delete this->relDirection;
-  delete this->absDirection;
-  delete this->lastAbsCoordinate;
-  delete this->diffCoordinate;
 }
 
@@ -108 +100 @@
   this->objectName = NULL;
   this->time = 1.0; /* set time to 1 to make divisions by zero impossible */
-
-  this->absCoordinate = new Vector();
-  this->relCoordinate = new Vector();
-  this->absDirection = new Quaternion();
-  this->relDirection = new Quaternion();
-  this->lastAbsCoordinate = new Vector();
-  this->diffCoordinate = new Vector();
 }
 
@@ -158 +143 @@
 {
   this->bRelCoorChanged = true;
-  *this->relCoordinate = relCoord;
+  this->relCoordinate = relCoord;
 }
 
@@ -182 +167 @@
 {
   this->bAbsCoorChanged = true;
-  *this->absCoordinate = absCoord;
+  this->absCoordinate = absCoord;
 }
 
@@ -211 +196 @@
   if( unlikely(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;
     }
@@ -241 +226 @@
 {
   this->bRelCoorChanged = true;
-  *this->relDirection = relDir;
+  this->relDirection = relDir;
 }
 
@@ -264 +249 @@
 {
   this->bAbsDirChanged = true;
-  *this->absDirection = absDir;
+  this->absDirection = absDir;
 }
 
@@ -293 +278 @@
 {
   this->bRelDirChanged = true;
-  *this->relDirection = *this->relDirection * shift;
+  this->relDirection = this->relDirection * shift;
 }
 
@@ -303 +288 @@
 float PNode::getSpeed() const
 {
-  *this->diffCoordinate = *this->absCoordinate - *this->lastAbsCoordinate;
-  return this->diffCoordinate->len() / this->time;
+  return (this->absCoordinate - this->lastAbsCoordinate).len() / this->time;
 }
 
@@ -312 +296 @@
 Vector PNode::getVelocity() const
 {
-  return (*this->absCoordinate - *this->lastAbsCoordinate) / this->time;
+  return (this->absCoordinate - this->lastAbsCoordinate) / this->time;
 }
 
@@ -439 +423 @@
 void PNode::update (float dt)
 {
-  *this->lastAbsCoordinate = *this->absCoordinate;
+  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);
+  PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate.x, this->absCoordinate.y, this->absCoordinate.z);
 
 
@@ -449 +433 @@
         {
           /* if you have set the absolute coordinates this overrides all other changes */
-          *this->relCoordinate = *this->absCoordinate - parent->getAbsCoor ();
+          this->relCoordinate = this->absCoordinate - parent->getAbsCoor ();
         }
       if( likely(this->bRelCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -462 +446 @@
             }
             else */
-          *this->absCoordinate = parent->getAbsCoor() + *this->relCoordinate;         /* update the current absCoordinate */
+          this->absCoordinate = parent->getAbsCoor() + this->relCoordinate;           /* update the current absCoordinate */
         }
     }
@@ -471 +455 @@
         {
           /* 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( likely(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;
         }
     }
@@ -485 +469 @@
         {
           /* 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( likely(this->bRelCoorChanged) /*&& this->timeStamp != DataTank::timeStamp*/)
@@ -493 +477 @@
             *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 */
         }
     }
@@ -547 +531 @@
 {
   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);
 }
 
@@ -558 +542 @@
   for debug purposes realy usefull, not used to work properly
 */
-void PNode::setName (char* newName)
+void PNode::setName (const char* newName)
 {
   this->objectName = new char[strlen(newName)+1];
@@ -568 +552 @@
   \brief gets the name of the node
 */
-char* PNode::getName ()
+const char* PNode::getName ()
 {
   return this->objectName;

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

@@ -57 +57 @@
 
 
-  inline Vector* getRelCoor () const { return this->relCoordinate; }
+  inline Vector getRelCoor () const { return this->relCoordinate; }
   void setRelCoor (const Vector& relCoord);
-  inline Vector getAbsCoor () const { return *this->absCoordinate; }
+  inline Vector getAbsCoor () const { return this->absCoordinate; }
   void setAbsCoor (const Vector& absCoord);
   void shiftCoor (const Vector& shift);
 
-  inline Quaternion getRelDir () const { return *this->relDirection; }
+  inline Quaternion getRelDir () const { return this->relDirection; }
   void setRelDir (const Quaternion& relDir);
-  inline Quaternion getAbsDir () const { return *this->absDirection; }
+  inline Quaternion getAbsDir () const { return this->absDirection; }
   void setAbsDir (const Quaternion& absDir);
   void shiftDir (const Quaternion& shift);
@@ -86 +86 @@
   void processTick (float dt);
 
-  void setName (char* newName);
-  char* getName ();
+  void setName (const char* newName);
+  const char* getName ();
 
 
@@ -100 +100 @@
   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
@@ -110 +110 @@
   void init(PNode* parent);
 
-  Vector* lastAbsCoordinate; //!< this is used for speedcalculation, it stores the last coordinate
-  Vector* diffCoordinate;    //!< this is stored here for performance reasons, difference to the last vector
+  Vector lastAbsCoordinate; //!< this is used for speedcalculation, it stores the last coordinate
+  Vector diffCoordinate;    //!< this is stored here for performance reasons, difference to the last vector
   float time;                //!< time since last update
 };

orxonox/branches/particleEngine/src/track_manager.cc

@@ -312 +312 @@
   PNode* tmpNode = (PNode*)node;
 
-  if (tmpNode->getRelCoor()->z < 0)
+  if (tmpNode->getRelCoor().z < 0)
     return 0;
   else 
@@ -333 +333 @@
   PNode* tmpNode = (PNode*)node;
 
-  Vector nodeRelCoord = *tmpNode->getRelCoor();
+  Vector nodeRelCoord = tmpNode->getRelCoor();
   float minDist = 100000000;
   int childNumber = 0;

orxonox/branches/particleEngine/src/track_node.cc

@@ -41 +41 @@
 
 
-TrackNode::TrackNode (Vector* absCoordinate)
+TrackNode::TrackNode (const Vector& absCoordinate)
 {
   this->parent = NullParent::getInstance();
   this->trackManager = TrackManager::getInstance();
   this->setMode(PNODE_ALL);
-  this->absCoordinate = absCoordinate;
+  this->setAbsCoor(absCoordinate);
 }
 

orxonox/branches/particleEngine/src/track_node.h

@@ -22 +22 @@
  public:
   TrackNode ();
-  TrackNode (Vector* absCoordinate);
+  TrackNode (const Vector& absCoordinate);
 
   virtual ~TrackNode ();

orxonox/branches/particleEngine/src/world_entities/camera.cc

@@ -139 +139 @@
   if (tmpFovy > .001)
     this->fovy += (this->toFovy - this->fovy) * dt;
-  Vector tmpPos = (this->toRelCoor - *this->getRelCoor()) * dt;
+  Vector tmpPos = (this->toRelCoor - this->getRelCoor()) * dt;
   if (tmpPos.len() >= .001)
     {
-      tmpPos = tmpPos + *this->getRelCoor();
+      tmpPos = tmpPos + this->getRelCoor();
       this->setRelCoor(tmpPos);
     }

orxonox/branches/particleEngine/src/world_entities/player.cc

@@ -188 +188 @@
   //orthDirection = orthDirection.cross (direction);
 
-  if( this->bUp && this->getRelCoor()->x < 20)
+  if( this->bUp && this->getRelCoor().x < 20)
     accel = accel+(direction*acceleration);
-  if( this->bDown && this->getRelCoor()->x > -5)
+  if( this->bDown && this->getRelCoor().x > -5)
     accel = accel-(direction*acceleration);
-  if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor()->z*2)
+  if( this->bLeft &&  TrackManager::getInstance()->getWidth() > -this->getRelCoor().z*2)
     accel = accel - (orthDirection*acceleration); 
-  if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor()->z*2)
+  if( this->bRight &&  TrackManager::getInstance()->getWidth() > this->getRelCoor().z*2)
     accel = accel + (orthDirection*acceleration);
   if( this->bAscend )