Changeset 3039 in orxonox.OLD for orxonox

Timestamp:

Dec 1, 2004, 12:55:12 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/bezierTrack: camera Has A and not Is A Coordinate: Patrick, I finally got what you ment.

Location:

orxonox/branches/bezierTrack/src

Files:

• camera.cc (modified) (5 diffs)
• camera.h (modified) (5 diffs)

orxonox/branches/bezierTrack/src/camera.cc

@@ -30 +30 @@
 {
   this->world = world;
+  coord = new Coordinate();
+
   bound = NULL;
   /* give it some physical live */
@@ -85 +87 @@
 
     case NORMAL:
-      this->setPosition(world->track->getPos() - world->track->getDir() *10 +Vector (0,0,5), WORLD);
-      target->setPosition(world->track->getPos(), WORLD);
+      coord->setPosition(world->track->getPos() - world->track->getDir() *10 +Vector (0,0,5), WORLD);
+      target->coord->setPosition(world->track->getPos(), WORLD);
 
       Location lookat;
@@ -119 +121 @@
   // ===== first camera control calculation option
   // rotation
-  Vector eye = this->getPosition(WORLD);
-  Vector targetV = target->getPosition(WORLD);
+  Vector eye = coord->getPosition(WORLD);
+  Vector targetV = target->coord->getPosition(WORLD);
 
   gluLookAt (eye.x, eye.y, eye.z, 
@@ -195 +197 @@
 CameraTarget::CameraTarget ()
 {
-  
+  coord = new Coordinate();
 
 }
@@ -201 +203 @@
 CameraTarget::CameraTarget (Vector pos)
 {
-  this->setPosition (pos, WORLD);
-}
+  coord->setPosition (pos, WORLD);
+}

orxonox/branches/bezierTrack/src/camera.h

@@ -24 +24 @@
 enum CAMERA_MODE {NORMAL, SMOTH_FOLLOW, STICKY, ELLIPTICAL};
 
-class Camera : public Coordinate
+class Camera
 {
  private:
@@ -31 +31 @@
   Placement desired_place;        //!< where the Camera should be according to calculations
   World* world;
+
   CameraTarget* target;
   
@@ -59 +60 @@
   
  public:
+  Coordinate* coord;
+
   Camera (World* world);
   ~Camera ();
@@ -72 +75 @@
 
 //! A Class to handle the Target of a Camera.
-class CameraTarget : public Coordinate
+class CameraTarget
 {
  private:
@@ -79 +82 @@
   
  public:
+  Coordinate* coord;
   CameraTarget ();
   CameraTarget (Vector pos); //!< a target only needs a Position and no Rotation