Changeset 4987 in orxonox.OLD for orxonox/trunk/src/world_entities

Timestamp:

Aug 12, 2005, 4:12:15 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: introducing smooth-PNode

Location:

orxonox/trunk/src/world_entities

Files:

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

orxonox/trunk/src/world_entities/camera.cc

@@ -36 +36 @@
 {
   this->setClassID(CL_CAMERA, "Camera");
+  this->setName("camera");
   this->target = new CameraTarget();
 
@@ -50 +51 @@
 
   this->setViewMode(VIEW_NORMAL);
+
+  this->setParentMode(PNODE_MOVEMENT);
 }
 
@@ -116 +119 @@
     case VIEW_NORMAL:
       this->toFovy = 60.0;
-      this->toRelCoor = Vector(-10, 5, 0);
+      this->setRelCoorSoft(Vector(-10, 5, 0));
+      this->target->setRelCoorSoft(Vector(0,0,0));
       break;
     case VIEW_BEHIND:
-      this->toFovy = 120.0;
-      this->toRelCoor = Vector(3.5, 0, 0);
-      this->target->setRelCoor(4,0,0);
-/*      this->setParent("main-Turret");
+//      this->toFovy = 120.0;
+      this->setRelCoorSoft(Vector(3.5, 0, 0));
+      this->target->setRelCoorSoft(Vector(10,0,0));
+
+      /*this->target->softReparent("main-Turret");
+      this->setParent("main-Turret");
       this->setParentMode(PNODE_ALL);
       this->target->setParent("Crosshair");*/
@@ -128 +134 @@
     case VIEW_FRONT:
       this->toFovy = 95.0;
-      this->toRelCoor = Vector(12, 5, 0);
+      this->setRelCoorSoft(Vector(10, 2, 0));
+      this->target->setRelCoorSoft(Vector(0,0,0));
       break;
     case VIEW_LEFT:
       this->toFovy = 90;
-      this->toRelCoor = Vector(0, 2, -10);
+      this->setRelCoorSoft(Vector(0, 1, -10));
+      this->target->setRelCoorSoft(Vector(0,0,0));
       break;
     case VIEW_RIGHT:
       this->toFovy = 90;
-      this->toRelCoor = Vector(0, 2, 10);
+      this->setRelCoorSoft(Vector(0, 1, 10));
+      this->target->setRelCoorSoft(Vector(0,0,0));
       break;
     case VIEW_TOP:
       this->toFovy= 120;
-      this->toRelCoor = Vector(0, 4, 0);
+      this->setRelCoorSoft(Vector(0, 10, 0));
+      this->target->setRelCoorSoft(Vector(0,0,0));
     }
 }
@@ -154 +164 @@
   if (tmpFovy > .001)
     this->fovy += (this->toFovy - this->fovy) * dt;
-  Vector tmpPos = (this->toRelCoor - this->getRelCoor()) * dt;
-  if (tmpPos.len() >= .001)
-    {
-      tmpPos = tmpPos + this->getRelCoor();
-      this->setRelCoor(tmpPos);
-    }
 }
 

orxonox/trunk/src/world_entities/camera.h

@@ -57 +57 @@
   float             farClip;         //!< The far clipping plane.
 
-  Vector            toRelCoor;       //!< The relativeCoordinate to move the camera to.
   float             toFovy;          //!< The fovy-mode to iterate to.
 };