Changeset 10103 in orxonox.OLD for branches

Timestamp:

Dec 19, 2006, 7:40:14 PM (18 years ago)

Author:

gfilip

Message:

just to be save

Location:

branches/camera/src/world_entities

Files:

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

branches/camera/src/world_entities/camera.cc

@@ -309 +309 @@
 
 
-Vector itarateTo(0,0,0);
-
+Vector translateTo(0,0,0);
+Vector rotateBy(0,0,0);
+float speed=1;
 
 CameraTarget::CameraTarget()
@@ -334 +335 @@
 
 
-float CameraTarget::iterate(float dt, Vector target, Vector cam)
-{
+Vector CameraTarget::iterate(float dt, Vector* target, Vector* cam)
+{
+
+  //this condititon if needed in tick:    if (tmpVec.x >= 0.01)
   Vector tmpVec;
-
-      tmpVec= (target - cam);
-
-  if (tmpVec.x >= 0.01)
-
-  return  0;//tmpVec * fabsf(dt);
+  tmpVec= (*target - *cam);
+  tmpVec.normalize();
+  return  tmpVec;
 
 }
@@ -354 +354 @@
 
 
-
+void CameraTarget::changeSpeed(float speed)
+{
+  if (speed!=0)
+this->speed=speed;
+  return;
+}

branches/camera/src/world_entities/camera.h

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