Changeset 3236 in orxonox.OLD for orxonox/trunk/src/camera.cc

Timestamp:

Dec 20, 2004, 1:39:51 AM (19 years ago)

Author:

patrick

Message:

/orxonox/trunk: unstable - problems getting collision to compile

File:

• orxonox/trunk/src/camera.cc (modified) (5 diffs)

orxonox/trunk/src/camera.cc

@@ -42 +42 @@
   this->t = 0.0;
 
-  this->actual_place.r.x = 0.0;
-  this->actual_place.r.y = 10.0;
-  this->actual_place.r.z = -5.0;
+  this->actualPlace.r.x = 0.0;
+  this->actualPlace.r.y = 10.0;
+  this->actualPlace.r.z = -5.0;
 }
 
@@ -66 +66 @@
     {this->t += deltaT;}
   //printf("time is: t=%f\n", t );
-  update_desired_place();
+  updateDesiredPlace();
   jump(NULL);
 }
@@ -89 +89 @@
         if( bound != NULL)
           {
-            bound->get_lookat (&lookat);
+            bound->getLookat (&lookat);
             orx->getWorld()->calcCameraPos (&lookat, &plFocus);
             Quaternion *fr;
@@ -169 +169 @@
         if(bound != null)
           {
-            Placement *plBound = bound->get_placement();
+            Placement *plBound = bound->getPlacement();
             Vector vDirection(0.0, 0.0, 1.0);
             Vector eclipticOffset(0.0, 0.0, 5.0);
@@ -237 +237 @@
   // rotation
   float matrix[4][4];
-  actual_place.w.conjugate().matrix (matrix);
+  actualPlace.w.conjugate().matrix (matrix);
   /* orientation and */
   glMultMatrixf ((float*)matrix);
   /*  translation */
-  glTranslatef (-actual_place.r.x, -actual_place.r.y,- actual_place.r.z);
+  glTranslatef (-actualPlace.r.x, -actualPlace.r.y,- actualPlace.r.z);
 //Placement *plBound = bound->get_placement();