Changeset 5354 in orxonox.OLD for trunk/src

Timestamp:

Oct 10, 2005, 1:13:56 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: animationing is reversible over time (try setting in the SHELL: World speed -1

Location:

trunk/src

Files:

• lib/coord/p_node.cc (modified) (2 diffs)
• lib/graphics/render2D/element_2d.cc (modified) (2 diffs)
• world_entities/camera.cc (modified) (1 diff)

trunk/src/lib/coord/p_node.cc

@@ -560 +560 @@
       if (unlikely(this->toCoordinate != NULL))
       {
-        Vector moveVect = (*this->toCoordinate - this->getRelCoor()) *dt*bias;
+        Vector moveVect = (*this->toCoordinate - this->getRelCoor()) *fabsf(dt)*bias;
 
         if (likely(moveVect.len() >= PNODE_ITERATION_DELTA))
@@ -575 +575 @@
       if (unlikely(this->toDirection != NULL))
       {
-        Quaternion rotQuat = Quaternion::quatSlerp(Quaternion(), (*this->toDirection / this->relDirection), dt*this->bias);
+        Quaternion rotQuat = Quaternion::quatSlerp(Quaternion(), (*this->toDirection / this->relDirection), fabsf(dt)*this->bias);
         if (likely(rotQuat.getSpacialAxisAngle() > PNODE_ITERATION_DELTA))
         {

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -622 +622 @@
     if (unlikely(this->toCoordinate != NULL))
     {
-      Vector moveVect = (*this->toCoordinate - this->getRelCoor2D()) *dt*bias;
+      Vector moveVect = (*this->toCoordinate - this->getRelCoor2D()) *fabsf(dt)*bias;
 
       if (likely(moveVect.len() >= .001))//PNODE_ITERATION_DELTA))
@@ -637 +637 @@
     if (unlikely(this->toDirection != NULL))
     {
-      float rotFlot = (*this->toDirection - this->getRelDir2D()) *dt*bias;
+      float rotFlot = (*this->toDirection - this->getRelDir2D()) *fabsf(dt)*bias;
       if (likely(rotFlot >= .001))//PNODE_ITERATION_DELTA))
       {

trunk/src/world_entities/camera.cc

@@ -178 +178 @@
 void Camera::tick(float dt)
 {
-  float tmpFovy = (this->toFovy - this->fovy) * dt;
-  if (tmpFovy > .001)
-    this->fovy += (this->toFovy - this->fovy) * dt;
+  float tmpFovy = (this->toFovy - this->fovy) ;
+  if (tmpFovy > .01)
+    this->fovy += tmpFovy * fabsf(dt);
 }