Changeset 7173 in orxonox.OLD for trunk/src

Timestamp:

Feb 21, 2006, 6:01:31 PM (19 years ago)

Author:

bensch

Message:

trunk: minor

Location:

trunk/src/world_entities

Files:

• camera.cc (modified) (2 diffs)
• camera.h (modified) (1 diff)
• playable.cc (modified) (1 diff)
• playable.h (modified) (1 diff)
• space_ships/space_ship.cc (modified) (1 diff)

trunk/src/world_entities/camera.cc

@@ -80 +80 @@
 
 /**
- *  sets the Field of View to fofy
- * @param fovy new field of view factor (in degrees)
-*/
-void Camera::setFovy(float fovy)
-{
-  this->fovy = fovy;
-}
-
-/**
  * Sets a new clipping region
  * @param nearClip The near clip plane
@@ -152 +143 @@
 
 
-  float tmpFovy = (this->toFovy - this->fovy) ;
+  float tmpFovy = (this->toFovy - this->fovy);
   if (tmpFovy > 0.01)
     this->fovy += tmpFovy * fabsf(dt);

trunk/src/world_entities/camera.h

@@ -41 +41 @@
 
   void setAspectRatio(float aspectRatio);
-  void setFovy(float fovy);
   void setClipRegion(float nearClip, float farClip);
+
+  /** @param fovy new field of view factor (in degrees) */
+  void setFovy(float fovy) { this->fovy = fovy; };
+  /** @param fovy new field of view factor (in degrees) to iterate to */
+  void setToFovy(float toFovy) { this->toFovy = toFovy; };
 
   void setViewMode(ViewMode mode);

trunk/src/world_entities/playable.cc

@@ -114 +114 @@
   if (this->currentPlayer != NULL)
     this->currentPlayer->weaponConfigChanged();
+}
+
+/**
+ * @brief sets the CameraMode.
+ * @param cameraMode: the Mode to switch to.
+ */
+void Playable::setCameraMode(unsigned int cameraMode)
+{
+
 }
 

trunk/src/world_entities/playable.h

@@ -50 +50 @@
     void attachCamera();
     void detachCamera();
+    virtual void setCameraMode(unsigned int cameraMode = 0);
 
     virtual void collidesWith(WorldEntity* entity, const Vector& location);

trunk/src/world_entities/space_ships/space_ship.cc

@@ -20 +20 @@
 #include "space_ship.h"
 
-#include "objModel.h"
 #include "resource_manager.h"
 
-#include "weapons/weapon_manager.h"
 #include "weapons/test_gun.h"
 #include "weapons/turret.h"