Changeset 10131 in orxonox.OLD

Timestamp:

Dec 20, 2006, 5:02:04 PM (17 years ago)

Author:

gfilip

Message:

wackel wackel

File:

• branches/camera/src/world_entities/camera.cc (modified) (2 diffs)

branches/camera/src/world_entities/camera.cc

@@ -23 +23 @@
 #include "targets.h"
 #include <iostream.h>
+
 
 
@@ -354 +355 @@
 void CameraTarget::translate(float speed, float dt)
 {
-  if (translateTo.x >= 0.01+target->getAbsCoorX() || translateTo.y >= 0.01+target->getAbsCoorY() || translateTo.z
-      >= 0.01+target->getAbsCoorZ() || translateTo.x <= target->getAbsCoorX()-0.01 || translateTo.y <= target->getAbsCoorY()-0.01 || translateTo.z
-      <= target->getAbsCoorZ()-0.01)
+  if (fabs(translateTo.x -target->getAbsCoorX()) >= 0.01 || fabs(translateTo.y -target->getAbsCoorY()) >= 0.01 || fabs(translateTo.z -target->getAbsCoorZ()) >= 0.01 )
   {
     Vector tmpVec= iterate(dt,  &translateTo,  &(State::getCameraNode()->getAbsCoor()));
     glLoadIdentity();
-    //glTranslatef(
-    cout << tmpVec.x;
     target->setAbsCoor(target->getAbsCoorX()+tmpVec.x, target->getAbsCoorY()+tmpVec.y, target->getAbsCoorZ()+tmpVec.z);
   }