Changeset 3028 in orxonox.OLD for orxonox/branches/bezierTrack/src/camera.cc

Timestamp:

Nov 30, 2004, 2:50:59 PM (21 years ago)

Author:

bensch

Message:

orxonox/branches/bezierTrack: now Camera follows Path. heavy cleanUp of not used stuff like elyptical Camera and so on…

File:

• orxonox/branches/bezierTrack/src/camera.cc (modified) (4 diffs)

orxonox/branches/bezierTrack/src/camera.cc

@@ -44 +44 @@
   actual_place.pos.y = 10.0;
   actual_place.pos.z = -5.0;
+  
+  // Initializing Target
+  target = new CameraTarget (Vector (0,0,0));
+  
 }
 
@@ -79 +83 @@
   switch(cameraMode)
     {
-      
-    case ELLIPTICAL:
-      {
-        //r = actual_place.r 
-        Orxonox *orx = Orxonox::getInstance();
-        Location lookat;  
-        Placement plFocus;
-        if( bound != NULL)
-          {
-            bound->get_lookat (&lookat);
-            orx->get_world()->calc_camera_pos (&lookat, &plFocus);
-            Quaternion *fr;
-            if(t < 20.0)
-              {
-                Vector *start = new Vector(0.0, 1.0, 0.0);
-                //r = /*actual_place.r*/ *start - plFocus.r;
-                r = *(new Vector(0.0, 5.0, 0.0));
-
-                Vector up(0.0, 0.0, 1.0);
-                
-                Vector op(1.0, 0.0, 0.0);
-                float angle = angle_deg(op, *start);
-                printf("angle is: %f\n", angle);
-
-                //if in one plane
-                from = new Quaternion(angle, up);
-
-                //from = new Quaternion(*start, *up);
-                //&from = &plFocus.w;
-                //fr = &plFocus.w; real quaternion use
-                
-
-
-                Vector vDirection(1.0, 0.0, 0.0);
-                //vDirection = plFocus.w.apply(vDirection);
-                to = new Quaternion(vDirection, *start);
-                res = new Quaternion();
-              }
-            //printf("vector r = %f, %f, %f\n",r.x, r.y, r.z );
-            rAbs = r.len();
-            if(t < 30.0) /* FIXME!!*/
-              {
-                ka = rAbs / deltaTime*deltaTime;
-              }
-            /* this is the new length of the vector */
-            //float len = ka * powf((deltaTime - t), 2);
-            
-            /* calc the rotation */
-            /*
-            Vector axis(0.0, 0.0, 1.0);
-            if(t < 30.0)
-              a0 = PI/4 - atanf(fabs(r.x) / fabs(r.y));
-            printf("a0 = %f\n", a0);
-            float angle = a0/deltaTime * (deltaTime - t);
-            printf("angle is: %f\n", angle);
-            Quaternion q(angle, axis);
-            */
-            //r = q.apply(r);
-            //r = r * (len/r.len());
-            
-            //res->quatSlerp(from, to, t/deltaTime, res);
-            res->quatSlerp(to, from, t/deltaTime, res);
-
-            Vector ursp(0.0, 0.0, 0.0);
-            desired_place.pos = /*plFocus.r -*/ ursp - res->apply(r); 
-
-            printf("desired place is: %f, %f, %f\n", desired_place.pos.x, desired_place.pos.y, desired_place.pos.z);
-            //plLastBPlace = *bound->get_placement();
-          } 
-      }
-      break;
-    case SMOTH_FOLLOW:
-      {
-        Placement *plBound = bound->get_placement();
-        Location lcBound;
-        if(bound != null)
-          {
-            bound->get_lookat(&lcBound);
-            Vector vDirection(0.0, 0.0, 1.0);
-            vDirection = plBound->rot.apply(vDirection);
-            desired_place.pos = (vDirection * ((lcBound.dist-10.0)/* / l*/)) + Vector(0,0,5.0);
-          }
-        break;
-      }
-      /* this is a camera mode that tries just to follow the entity. */
-    case STICKY:
-      {
-        if(bound != null)
-          {
-            Placement *plBound = bound->get_placement();
-            Vector vDirection(0.0, 0.0, 1.0);
-            Vector eclipticOffset(0.0, 0.0, 5.0);
-            vDirection = plBound->rot.apply(vDirection);
-            desired_place.pos = plBound->pos - vDirection*10 + eclipticOffset;
-          }
-        break;
-      }
-      /* the camera is handled like an entity and rolls on the track */
+
     case NORMAL:
-      Location lookat;  
+      this->setPosition(world->track->getPos() - world->track->getDir() *10 +Vector (0,0,5), WORLD);
+      target->setPosition(world->track->getPos(), WORLD);
+
+      Location lookat;
       if( bound != NULL && world != NULL )
         {
@@ -206 +116 @@
   // TO DO: implement options for frustum generation
   glFrustum(-1.0, 1.0, -1.0, 1.0, 1.5, 250.0);
-  //Vector up(0,0,1);
-  //Vector dir(1,0,0);
-  //Quaternion q(dir,up);
-  //float matrix[4][4];
-  //q.conjugate().matrix (matrix);
-  //glMultMatrixf ((float*)matrix);
-  //glTranslatef (10,0,-5);
-  //
-  //dir = Vector(-1,-1,0);
-  //q = Quaternion( dir, up);
-  //glMatrixMode (GL_MODELVIEW);
-  //glLoadIdentity ();
-  //q.matrix (matrix);
-  //glMultMatrixf ((float*)matrix);
-  //glTranslatef (2,2,0);
-  //
-  //glBegin(GL_TRIANGLES);
-  //glColor3f(1,0,0);
-  //glVertex3f(0,0,0.5);
-  //glColor3f(0,1,0);
-  //glVertex3f(-0.5,0,-1);
-  //glColor3f(0,0,1);
-  //glVertex3f(0.5,0,-1);
-  //glEnd();    
 
   // ===== first camera control calculation option
   // rotation
+  Vector eye = this->getPosition(WORLD);
+  Vector targetV = target->getPosition(WORLD);
+
+  gluLookAt (eye.x, eye.y, eye.z, 
+             targetV.x, targetV.y, targetV.z, 
+             0,0,1);
+
   float matrix[4][4];
   actual_place.rot.conjugate().matrix (matrix);
   /* orientation and */
-  glMultMatrixf ((float*)matrix);
+  //  glMultMatrixf ((float*)matrix);
   /*  translation */
-  glTranslatef (-actual_place.pos.x, -actual_place.pos.y,- actual_place.pos.z);
+  //  glTranslatef (-actual_place.pos.x, -actual_place.pos.y,- actual_place.pos.z);
   //Placement *plBound = bound->get_placement();
 
@@ -297 +190 @@
   this->world = world;
 }
+
+
+
+CameraTarget::CameraTarget ()
+{
+  
+
+}
+
+CameraTarget::CameraTarget (Vector pos)
+{
+  this->setPosition (pos, WORLD);
+}