Changeset 10110 in orxonox.OLD for branches/camera/src/world_entities

Timestamp:

Dec 19, 2006, 11:24:58 PM (18 years ago)

Author:

gfilip

Message:

update

Location:

branches/camera/src/world_entities

Files:

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

branches/camera/src/world_entities/camera.cc

@@ -153 +153 @@
 
   //iterate(float dt, translate, target)
-
+  target->translate( 1,dt);
 }
 
@@ -289 +289 @@
 
 SHELL_COMMAND(det, CameraTarget, detach);
+SHELL_COMMAND(tes, CameraTarget, test);
+
 
 
@@ -326 +328 @@
 {
 
-  //this condititon if needed in tick:    if (tmpVec.x >= 0.01)
+
   Vector tmpVec;
   tmpVec= (*target - *cam);
@@ -335 +337 @@
 
 
-void CameraTarget::translate(Vector* newPos, float speed, float dt)
-{
-  if (translateTo.x >= 0.01+this->getAbsCoorX())
-  {
-    Vector tmpVec= iterate(dt,  newPos,  &(State::getCameraNode()->getAbsCoor()));
-  glTranslatef(tmpVec.x, tmpVec.y, tmpVec.z);
+void CameraTarget::translate(float speed, float dt)
+{
+  if (translateTo.x >= 0.01+State::getCameraNode()->getAbsCoorX() || translateTo.y
+      >= 0.01+State::getCameraNode()->getAbsCoorX() || translateTo.z
+      >= 0.01+State::getCameraNode()->getAbsCoorX())
+  {
+    Vector tmpVec= iterate(dt,  &translateTo,  &(State::getCameraNode()->getAbsCoor()));
+    glLoadIdentity();
+    glTranslatef(tmpVec.x, tmpVec.y, tmpVec.z);
   }
 }
@@ -352 +357 @@
 {
 
+}
+
+void CameraTarget::translateNow(Vector* vec)
+{
+translateTo=*vec;
 }
 
@@ -360 +370 @@
   return;
 }
+
+
+void CameraTarget::test()
+{
+//Vector* vec=new Vector(100,100,100);
+  //translateNow(vec);
+  glMatrixMode (GL_PROJECTION);
+  glLoadIdentity();
+  glTranslatef(100, 100, 100);
+}

branches/camera/src/world_entities/camera.h

@@ -101 +101 @@
   void atach(PNode* object);
   Vector iterate(float dt, const Vector* target, const Vector* cam);
-  void translate(Vector* newPos, float speed, float dt);
+  void translate(float speed, float dt);
   void changeSpeed(float speed);
   Vector* rotate(Vector* newPos, float speed);
   void jump(Vector* newPos);
+  void test();
+  void translateNow(Vector* vec);
 };