Changeset 10094 in orxonox.OLD

Timestamp:

Dec 18, 2006, 10:42:56 PM (17 years ago)

Author:

gfilip

Message:

no errors

Location:

branches/camera/src/world_entities

Files:

• camera.cc (modified) (2 diffs)
• camera.h (modified) (1 diff)

branches/camera/src/world_entities/camera.cc

@@ -309 +309 @@
 
 
+Vector itarateTo(0,0,0);
+
+
 CameraTarget::CameraTarget()
 {
@@ -331 +334 @@
 
 
-float CameraTarget::iterate(float dt, Vector target, PNode* cam)
+float CameraTarget::iterate(float dt, Vector target, Vector cam)
 {
   Vector tmpVec;
 
-      tmpVec= (cam->getAbsCorr() - target);
+      tmpVec= (target - cam);
 
   if (tmpVec.x >= 0.01)
-    float ret =  cam->getAbsCorr();
-  ret += tmpVec * fabsf(dt);
-  return ret;
-}
-
-
-Vector* Camera::translate(Vector* newPos, float speed)
-{
-glTranslatef(Vector);
-
-}
-
-
-
+
+  return  0;//tmpVec * fabsf(dt);
+
+}
+
+
+Vector* CameraTarget::translate(Vector* newPos, float speed)
+{
+//glTranslatef(Vector);
+
+}
+
+
+

branches/camera/src/world_entities/camera.h

@@ -97 +97 @@
   void detach();
   void atach(PNode* object);
-  float iterate(float dt, Vector target, PNode* cam);
+  float iterate(float dt, Vector target, Vector cam);
   Vector* translate(Vector* newPos, float speed);
 };