Changeset 10105 in orxonox.OLD for branches

Timestamp:

Dec 19, 2006, 8:41:14 PM (18 years ago)

Author:

gfilip

Message:

just to be save part 2

Location:

branches/camera/src/world_entities

Files:

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

branches/camera/src/world_entities/camera.cc

@@ -19 +19 @@
 #include "glincl.h"
 #include "vector.h"
-#include <iostream.h>
 #include "state.h"
 #include "shell_command.h"
@@ -145 +144 @@
   this->upVector =  this->getAbsDirV();
 
-
-
-
-
+  // iteration for fovy
   float tmpFovy = (this->toFovy - this->fovy);
   if (tmpFovy > 0.01)
     this->fovy += tmpFovy * fabsf(dt);
+
+
+
+
+  //iterate(float dt, translate, target)
+
 }
 
@@ -225 +227 @@
 }
 
-/*
-Vector* Camera::translate(Vector* newPos, float speed)
-{
-glTranslatef(Vector);
-
-}
-
-
-float Camera::iterate(float dt, Vector target)
-{
-  Vector tmpVec = (this->getAbsCorr() - target);
-  if (tmpVec > 0.01)
-  Vector ret =  this->getAbsCorr;
- ret += tmpVec * fabsf(dt);
- return ret;
-}
-*/
-void Camera::Rotate()
-{
-this->fovy=this->fovy+1;
-}
+
 
 
@@ -309 +291 @@
 
 
-Vector translateTo(0,0,0);
-Vector rotateBy(0,0,0);
-float speed=1;
+
+
 
 CameraTarget::CameraTarget()
@@ -317 +298 @@
   this->registerObject(this, CameraTarget::_objectList);
   //  this->setParentMode(PNODE_MOVEMENT);
+  this->speed=1;
+  translateTo.x=0;
+  translateTo.y=0;
+  translateTo.z=0;
+  rotateBy.x=0;
+  rotateBy.y=0;
+  rotateBy.z=0;
 
 
@@ -347 +335 @@
 
 
-Vector* CameraTarget::translate(Vector* newPos, float speed)
-{
-//glTranslatef(Vector);
-
-}
-
+void CameraTarget::translate(Vector* newPos, float speed, float dt)
+{
+  if (translateTo.x >= this->getAbsCoorX())
+  {
+    iterate(dt, &(State::getCameraNode()->getAbsCoor()), newPos );
+  glTranslatef(translateTo.x, translateTo.y, translateTo.z);
+  }
+}
+
+Vector * CameraTarget::rotate(Vector* newPos, float speed)
+{
+
+}
+
+void CameraTarget::jump(Vector* newPos)
+{
+
+}
 
 void CameraTarget::changeSpeed(float speed)

branches/camera/src/world_entities/camera.h

@@ -93 +93 @@
   CameraTarget();
   virtual ~CameraTarget() {}
+  float speed;
 
 public:
+  Vector translateTo;
+  Vector rotateBy;
   void detach();
   void atach(PNode* object);
-  Vector iterate(float dt, Vector* target, Vector* cam);
-  Vector* translate(Vector* newPos, float speed);
+  Vector iterate(float dt, const Vector* target, const Vector* cam);
+  void translate(Vector* newPos, float speed, float dt);
   void changeSpeed(float speed);
+  Vector* rotate(Vector* newPos, float speed);
+  void jump(Vector* newPos);
 };