Changeset 10698 in orxonox.OLD for trunk/src/world_entities/tools

Timestamp:

Jun 14, 2007, 5:33:43 PM (18 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

Location:

trunk/src/world_entities/tools

Files:

• camera.cc (modified) (1 diff)
• camera.h (modified) (1 diff)
• mount_point.cc (modified) (3 diffs)

trunk/src/world_entities/tools/camera.cc

@@ -203 +203 @@
       this->setRelCoor(Vector(-0.05, this->viewTopDistance , 0));
       this->target->setRelCoor(0,0,0);
+      break;
+    }
+    case Camera::ViewFPS:
+    {
+      this->fovy = viewNormalFovy;
+      this->toFovy = viewNormalFovy;
+      this->setRelCoorSoft(this->viewFrontDistance, 0, 0, 5);
+      this->target->setRelCoorSoft(Vector(10,0,0), 5);
+      break;
+    }
+    case Camera::ViewFPSZoom:
+    {
+      this->fovy = viewNormalFovy;
+      this->toFovy = 30;
+      this->setRelCoorSoft(2, 0, 0, 5);
+      this->target->setRelCoorSoft(Vector(10,0,0), 5);
     }
   }

trunk/src/world_entities/tools/camera.h

@@ -34 +34 @@
     ViewLeft,
     ViewRight,
-    ViewTop
+    ViewTop,
+    ViewFPS,
+    ViewFPSZoom
   };
   public:

trunk/src/world_entities/tools/mount_point.cc

@@ -22 +22 @@
 
 #include "weapons/weapon_slot.h"
+#include "weapons/weapon.h"
 
 #include "particles/particle_system.h"
@@ -36 +37 @@
  * construct
  */
-MountPoint::MountPoint (const Vector& up, const Vector& forward, const Vector& center, const std::string& name)
+MountPoint::MountPoint (const Vector& up, const Vector& forward, const Vector& center,  const std::string& name)
 {
 //   PRINTF(0)("Created mount point %s\n", name.c_str());
@@ -153 +154 @@
                                     this->getRelDir()*Quaternion(M_PI, Vector(0,1,0)));
     }
+
   }
 }