Changeset 7003 in orxonox.OLD for trunk/src

Timestamp:

Feb 3, 2006, 2:55:14 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a nasty PNode bug …
@patrick: you were right about it being still debugged

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (8 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• lib/math/quaternion.cc (modified) (1 diff)
• lib/math/quaternion.h (modified) (1 diff)
• world_entities/space_ships/turbine_hover.cc (modified) (2 diffs)

trunk/src/lib/coord/p_node.cc

@@ -215 +215 @@
 
   *this->toCoordinate = relCoordSoft;
-  this->toStep = 0.0f;
   this->bias = bias;
 }
@@ -301 +300 @@
       *this->toCoordinate = absCoordSoft;
   }
-  this->toStep = 0.0f;
 }
 
@@ -373 +371 @@
   *this->toDirection = relDirSoft;
   this->bias = bias;
-  this->toStep = 0.0f;
   this->bRelDirChanged = true;
 }
@@ -443 +440 @@
 
   this->bias = bias;
-  this->toStep = 0.0f;
   this->bRelDirChanged = true;
 }
@@ -650 +646 @@
   }
   this->bias = bias;
-  this->toStep = 0.0f;
 
   Vector tmpV = this->getAbsCoor();
@@ -781 +776 @@
         if (unlikely(this->toDirection != NULL))
         {
-          this->toStep += fabs(dt) * bias;
           //printf("%s::%s %f\n", this->getClassName(), this->getName(), this->toStep );
-          Quaternion rotQuat = Quaternion::quatSlerp(this->relDirection,*this->toDirection, toStep);
-          if (this->relDirection.distance(rotQuat) >PNODE_ITERATION_DELTA)
+          Quaternion rotQuat = Quaternion::quatSlerp(this->relDirection,*this->toDirection, .1);
+          if (this->relDirection.distance(rotQuat) > PNODE_ITERATION_DELTA)
           {
             this->relDirection = rotQuat;
@@ -794 +788 @@
             this->toDirection = NULL;
             PRINTF(5)("SmoothRotate of %s finished\n", this->getName());
+            this->bRelDirChanged;
           }
         }
@@ -817 +812 @@
           this->absCoordinate = this->parent->getAbsCoor() + this->relCoordinate;
         }
-        else if( this->parentMode & PNODE_ROTATE_MOVEMENT && this->bRelCoorChanged)
+        else if( this->parentMode & PNODE_ROTATE_MOVEMENT && (this->bRelCoorChanged || this->bRelDirChanged))
         {
           /* update the current absCoordinate */

trunk/src/lib/coord/p_node.h

@@ -224 +224 @@
   Quaternion*        toDirection;        //!< a direction to which to iterate. (This is used in conjunction with setParentSoft and set*DirSoft)
   float              bias;               //!< how fast to iterate to the given position (default is 1)
-  float              toStep;
 
   PNode*             parent;             //!< a pointer to the parent node.

trunk/src/lib/math/quaternion.cc

@@ -227 +227 @@
  *  outputs some nice formated debug information about this quaternion
 */
-void Quaternion::debug()
+void Quaternion::debug() const
 {
   PRINT(0)("real a=%f; imag: x=%f y=%f z=%f\n", w, v.x, v.y, v.z);
 }
 
-void Quaternion::debug2()
+void Quaternion::debug2() const
 {
   Vector axis = this->getSpacialAxis();

trunk/src/lib/math/quaternion.h

@@ -103 +103 @@
   static Quaternion quatSlerp(const Quaternion& from, const Quaternion& to, float t);
 
-  void debug();
-  void debug2();
+  void debug() const;
+  void debug2() const;
 
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -121 +121 @@
   this->cameraNode.addNodeFlags(PNODE_PROHIBIT_CHILD_DELETE);
   //this->cameraNode.setParentMode(PNODE_ROTATE_MOVEMENT);
-  this->cameraNode.setParent(this);
+  //this->cameraNode.setParent(this);
 
   // rotors
@@ -273 +273 @@
 
   // TRYING TO FIX PNode.
-/*  this->cameraNode.setAbsCoorSoft(this->getAbsCoor() + Vector(0,5,0), 30);
-  this->cameraNode.setAbsDirSoft(this->getAbsDir(), 30);*/
+  this->cameraNode.setAbsCoorSoft(this->getAbsCoor() + Vector(0.0f, 5.0f, 0.0f), 30.0f);
+  this->cameraNode.setRelDirSoft(this->getAbsDir(), 30.0f);
+  this->cameraNode.getAbsDir().debug();
 }