Changeset 3644 in orxonox.OLD

Timestamp:

Mar 23, 2005, 2:32:06 PM (19 years ago)

Author:

patrick

Message:

orxonox/trunk: pnode speed function implemented

Location:

orxonox/trunk/src

Files:

• lib/coord/null_parent.cc (modified) (2 diffs)
• lib/coord/null_parent.h (modified) (1 diff)
• lib/coord/p_node.cc (modified) (4 diffs)
• lib/coord/p_node.h (modified) (4 diffs)
• story_entities/world.cc (modified) (6 diffs)
• story_entities/world.h (modified) (1 diff)

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

@@ -77 +77 @@
    worry, normaly...
 */
-void NullParent::update ()
+void NullParent::update (float dt)
 {
 
@@ -92 +92 @@
       if( this->bRelDirChanged || this->bAbsDirChanged)
         pn->parentDirChanged ();
-      pn->update ();
+      pn->update (dt);
       pn = this->children->nextElement ();
     }

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

@@ -19 +19 @@
 
 
-  virtual void update ();
-
+  virtual void update (float dt);
+  
  private:
   NullParent ();

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

@@ -115 +115 @@
   this->absDirection = new Quaternion();
   this->relDirection = new Quaternion();
+  this->lastAbsCoordinate = new Vector();
 }
 
@@ -297 +298 @@
 {}
 
+
+/**
+   \brief this calculates the current movement speed of the node
+*/
+float PNode::getSpeed()
+{
+  if(this->time == 0)
+    return 0;
+  Vector* diff = new Vector();
+  *diff = *this->absCoordinate - *this->lastAbsCoordinate;
+  float x = diff->len();
+  return x / this->time;
+}
+
+
 /**
    \brief adds a child and makes this node to a parent
@@ -422 +438 @@
    worry, normaly...
 */
-void PNode::update ()
-{
+void PNode::update (float dt)
+{
+  this->time = dt;
   PRINTF(4)("PNode::update - %s - (%f, %f, %f)\n", this->objectName, this->absCoordinate->x, this->absCoordinate->y, this->absCoordinate->z);
   // printf("%s", this->objectName);
@@ -486 +503 @@
         pn->parentDirChanged ();
 
-      pn->update();
+      pn->update(dt);
       pn = this->children->nextElement();
     }

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

@@ -72 +72 @@
   void shiftDir (Quaternion* shift);
 
+  float getSpeed();
+
   void addChild (PNode* pNode);
   void addChild (PNode* pNode, int parentingMode);
@@ -84 +86 @@
   int getMode();
 
-  virtual void update ();
+  virtual void update (float dt);
   void processTick (float dt);
 
@@ -92 +94 @@
 
   void debug ();
-
- private:
-  void init(PNode* parent);
 
  protected:
@@ -111 +110 @@
   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
 };
 

orxonox/trunk/src/story_entities/world.cc

@@ -128 +128 @@
 World::World (int worldID)
 {
-  printf(">>>>>>>>>>>>>>>>>WORLD::WORLD called NEW WORLD created\n");
   this->init(NULL, worldID);
 }
@@ -604 +603 @@
   p4->debug ();
   
-  p1->update ();
+  p1->update (0);
 
   printf ("World::debug() - update\n");
@@ -613 +612 @@
 
   p2->shiftCoor (new Vector(-1, -1, -1));
-  p1->update ();
+  p1->update (0);
 
   p1->debug ();
@@ -623 +622 @@
 
 
- p1->update ();
+ p1->update (0);
 
   p1->debug ();
@@ -720 +719 @@
   if(!this->bPause)
     {
-      Uint32 dt = currentFrame - this->lastFrame;
+      this->dt = currentFrame - this->lastFrame;
       
       if(dt > 0)
@@ -765 +764 @@
 void World::update()
 {
-  this->nullParent->update ();
+  this->nullParent->update (dt);
 }
 

orxonox/trunk/src/story_entities/world.h

@@ -87 +87 @@
 
   Uint32 lastFrame;             //!< last time of frame
+  Uint32 dt;                    //!< time needed to calculate this frame
   bool bQuitOrxonox;            //!< quit this application
   bool bQuitCurrentGame;        //!< quit only the current game and return to menu