Changeset 10065 in orxonox.OLD for branches/camera/src/world_entities/camera.cc

Timestamp:

Dec 13, 2006, 3:23:05 PM (17 years ago)

Author:

gfilip

Message:

little update

File:

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

branches/camera/src/world_entities/camera.cc

@@ -18 +18 @@
 #include "key_mapper.h"
 #include "glincl.h"
+#include "vector.h"
+#include <iostream.h>
+
 
 ObjectListDefinition(Camera);
@@ -138 +141 @@
   this->viewVector = (this->target->getAbsCoor() - this->getAbsCoor()).getNormalized();
   this->frustumPlane = Plane(this->viewVector, this->getAbsCoor() + this->viewVector * 0.1);
-
   this->upVector =  this->getAbsDirV();
+
+
+
 
 
@@ -179 +184 @@
   Vector targetPosition = this->target->getAbsCoor();
 
-       // Setting the Camera Eye, lookAt and up Vectors
-  gluLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
+        //Setting the Camera Eye, lookAt and up Vectors
+  glLookAt(cameraPosition.x, cameraPosition.y, cameraPosition.z,
             targetPosition.x, targetPosition.y, targetPosition.z,
             this->upVector.x, this->upVector.y, this->upVector.z);
@@ -217 +222 @@
   }
 }
+
+/*
+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;
+}
+
+
+void Camera::glLookAt(float eyex, float eyey, float eyez, float centerx, float centery, float centerz, float upx, float upy, float upz)
+{
+  //Vector* eye=new Vector(eyex, eyey, eyez);
+  Vector* center=new Vector (centerx, centery, centerz);
+  Vector* up=new Vector(upx, upy, upz);
+
+  center->x-=eyex;
+  center->y-=eyey;
+  center->z-=eyez;
+
+  center->normalize();
+  up->normalize();
+  Vector* s = VectorProd(center, up);
+  Vector* u = VectorProd(s, center);
+  GLfloat Matrix[]={s->x, s->y, s->z, 0, u->x, u->y, u->z, 0, -center->x, -center->y, -center->z, 0, 0, 0, 0, 1};
+
+  glMultMatrixf(Matrix);
+  glTranslated(-eyex, -eyey, -eyez);
+  delete center;
+  delete up;
+  delete s;
+  delete u;
+
+}
+
+
+
+
+Vector* Camera::VectorProd(Vector* v1, Vector* v2)
+{
+Vector* temp= new Vector();
+temp->x=v1->y * v2->z - v1->z * v2->y;
+temp->y=v1->z * v2->x - v1->x * v2->z;
+temp->z=v1->x * v2->y - v1->y * v2->x;
+return temp;
+}
+
+
+
+
+
+
+
+
+
+
+
+
 
 
@@ -228 +305 @@
   this->registerObject(this, CameraTarget::_objectList);
   //  this->setParentMode(PNODE_MOVEMENT);
-}
-
+
+
+}
+
+
+CameraTarget::detach()
+{
+  State::getCameraTargetNode()->setParentSoft(NULL);
+}
+
+
+
+
+