Changeset 10386 in orxonox.OLD for trunk/src

Timestamp:

Jan 26, 2007, 6:07:39 PM (18 years ago)

Author:

patrick

Message:

camera is a WE and some other stuff

Location:

trunk/src/world_entities

Files:

• camera.h (modified) (4 diffs)
• npcs/generic_npc.cc (modified) (1 diff)

trunk/src/world_entities/camera.h

@@ -7 +7 @@
 #define _CAMERA_H
 
-#include "p_node.h"
+#include "world_entity.h"
 #include "event_listener.h"
 #include "plane.h"
@@ -20 +20 @@
  * This class controls the viewpoint from which the World is rendered.
 */
-class Camera : public PNode, public EventListener
+class Camera : public WorldEntity, public EventListener
 {
   friend class CameraTarget;
@@ -51 +51 @@
 
   /** @param fovy new field of view factor (in degrees) */
-  inline void setFovy(float fovy) 
-  { 
-    this->fovy = fovy; 
+  inline void setFovy(float fovy)
+  {
+    this->fovy = fovy;
     this->toFovy = fovy;
   };
@@ -132 +132 @@
   float             viewFrontDistance;
   float             viewNormalDistance;
-  
+
 };
 

trunk/src/world_entities/npcs/generic_npc.cc

@@ -89 +89 @@
   this->toList(OM_GROUP_00);
 
-  this->soundBuffer = OrxSound::ResourceSoundBuffer("sound/rain.wav");
+//   this->soundBuffer = OrxSound::ResourceSoundBuffer("sound/rain.wav");
 
   time = 30.0f;