Changeset 3643 in orxonox.OLD

Timestamp:

Mar 23, 2005, 11:20:29 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better views with Camera

Location:

orxonox/trunk/src

Files:

• camera.cc (modified) (2 diffs)
• camera.h (modified) (1 diff)
• orxonox.conf (modified) (1 diff)
• story_entities/world.cc (modified) (3 diffs)

orxonox/trunk/src/camera.cc

@@ -104 +104 @@
     case VIEW_NORMAL:
       this->toFovy = 60.0;
-      this->toRelCoor = Vector (-10, 5, 0);
+      this->toRelCoor = Vector(-10, 5, 0);
       break;
     case VIEW_BEHIND:
-      this->toFovy = 90.0;
-      this->toRelCoor = Vector (-6, 2, 0);
+      this->toFovy = 120.0;
+      this->toRelCoor = Vector(-7, 0, 0);
       break;
     case VIEW_FRONT:
       this->toFovy = 95.0;
-      this->toRelCoor = Vector (10, 5, 0);
+      this->toRelCoor = Vector(12, 5, 0);
       break;
     case VIEW_LEFT: 
       this->toFovy = 90;
-      this->toRelCoor = Vector (0, 2, -10);
+      this->toRelCoor = Vector(0, 2, -10);
       break;
     case VIEW_RIGHT:
       this->toFovy = 90;
-      this->toRelCoor = Vector (0, 2, 10);
+      this->toRelCoor = Vector(0, 2, 10);
       break;
+    case VIEW_TOP:
+      this->toFovy= 120;
+      this->toRelCoor = Vector(0, 4, 0);
     }
 }
@@ -132 +135 @@
 void Camera::tick(float dt)
 {
-  dt /= 1000;
+  dt /= 500;
   this->fovy += (this->toFovy - this->fovy) * dt;
   Vector tmp = this->getRelCoor() + (this->toRelCoor - this->getRelCoor()) * dt;

orxonox/trunk/src/camera.h

@@ -13 +13 @@
 class CameraTarget;
 
-enum ViewMode{VIEW_NORMAL, VIEW_BEHIND, VIEW_FRONT, VIEW_LEFT, VIEW_RIGHT};
+enum ViewMode{VIEW_NORMAL, VIEW_BEHIND, VIEW_FRONT, VIEW_LEFT, VIEW_RIGHT, VIEW_TOP};
 
 //! Camera

orxonox/trunk/src/orxonox.conf

@@ -18 +18 @@
 4=view3
 5=view4
+5=view5

orxonox/trunk/src/story_entities/world.cc

@@ -305 +305 @@
             this->localCamera->setName ("camera");
             this->localCamera->lookAt(this->localPlayer);
-            Vector* cameraOffset = new Vector (-2, 2, 0);
-            this->localCamera->setRelCoor (cameraOffset);
+            this->localCamera->setParent(this->localPlayer);
             
             /*monitor progress*/
@@ -341 +340 @@
 
             //localCamera->setParent(TrackNode::getInstance());
-            tn->addChild (this->localCamera);
+            tn->addChild(this->localCamera);
+            //      localCamera->lookAt(tn);
             this->localPlayer->setMode(PNODE_ALL);
             //Vector* cameraOffset = new Vector (0, 5, -10);
@@ -858 +858 @@
   else if( !strcmp( cmd->cmd, "view3")) this->localCamera->setViewMode(VIEW_LEFT);
   else if( !strcmp( cmd->cmd, "view4")) this->localCamera->setViewMode(VIEW_RIGHT);
+  else if( !strcmp( cmd->cmd, "view5")) this->localCamera->setViewMode(VIEW_TOP);
   
   return false;