Changeset 3639 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Mar 23, 2005, 1:37:54 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: now dynamic FOV. still working

Location:

orxonox/trunk/src

Files:

• camera.cc (modified) (4 diffs)
• camera.h (modified) (3 diffs)
• story_entities/world.cc (modified) (2 diffs)

orxonox/trunk/src/camera.cc

@@ -33 +33 @@
 Camera::Camera(void)
 {
+  this->setClassName("Camera");
   this->target = new CameraTarget();
+
+  this->toRelCoor = new Vector;
 
   this->setFovy(60);
   this->setAspectRatio(1.2f);
   this->setClipRegion(.1, 2000);
+  this->setViewMode(VIEW_NORMAL);
+
 }
 
@@ -45 +50 @@
 Camera::~Camera(void)
 {
-
 }
 
@@ -95 +99 @@
 }
 
+void Camera::setViewMode(ViewMode mode)
+{
+  switch (mode)
+    {
+    default:
+    case VIEW_NORMAL:
+      this->toFovy = 60.0;
+      *this->toRelCoor = Vector (-10, 5, 0);
+      break;
+    case VIEW_BEHIND:
+      this->toFovy = 90.0;
+      *this->toRelCoor = Vector (-6, 2, 0);
+      break;
+    case VIEW_FRONT:
+      this->toFovy = 95.0;
+      *this->toRelCoor = Vector (10, 5, 0);
+      break;
+    case VIEW_LEFT: 
+      this->toFovy = 90;
+      *this->toRelCoor = Vector (0, 5, -10);
+      break;
+    case VIEW_RIGHT:
+      this->toFovy = 90;
+      *this->toRelCoor = Vector (0, 5, 10);
+      break;
+    }
+}
+
+
+/**
+   \brief Updates the position of the camera.
+   \param dt The time that elapsed.
+*/
+void Camera::tick(float dt)
+{
+  dt /= 1000;
+  this->fovy += (this->toFovy - this->fovy) * dt;
+}
+
+
 /**
    \brief initialize rendering perspective according to this camera
@@ -137 +181 @@
 CameraTarget::CameraTarget()
 {
+  this->setClassName("CameraTarget");
   this->setMode(PNODE_MOVEMENT);
 }

orxonox/trunk/src/camera.h

@@ -12 +12 @@
 class CameraTarget;
 
+enum ViewMode{VIEW_NORMAL, VIEW_BEHIND, VIEW_FRONT, VIEW_LEFT, VIEW_RIGHT};
 
 //! Camera
@@ -26 +27 @@
   float nearClip;                  //!< The near clipping plane.
   float farClip;                   //!< The far clipping plane.
+
+  Vector* toRelCoor;
+  float toFovy;
   
  public:
@@ -38 +42 @@
   void setClipRegion(float nearClip, float farClip);
 
+  void setViewMode(ViewMode mode);
+  void tick(float dt);
   void apply (void);
 };

orxonox/trunk/src/story_entities/world.cc

@@ -372 +372 @@
             this->localCamera->lookAt(LightManager::getInstance()->getLight(0));
             this->localCamera->setParent(this->localPlayer);
-            Vector* cameraOffset = new Vector (-10, 5, 0);
-            this->localCamera->setRelCoor (cameraOffset);
 
             // Create SkySphere
@@ -754 +752 @@
       /* update tick the rest */
       this->trackManager->tick(dt);
+      this->localCamera->tick(dt);
     }
   this->lastFrame = currentFrame;