Changeset 8793 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 26, 2006, 3:36:16 PM (19 years ago)

Author:

patrick

Message:

trunk: merged the weather engine branche to the trunk

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• effects/lightning_bolt.cc (modified) (1 diff)
• npcs/generic_npc.h (modified) (4 diffs)
• skydome.cc (copied) (copied from branches/atmospheric_engine/src/world_entities/skydome.cc)
• skydome.h (copied) (copied from branches/atmospheric_engine/src/world_entities/skydome.h)

trunk/src/world_entities/WorldEntities.am

@@ -9 +9 @@
                 world_entities/skysphere.cc \
                 world_entities/skybox.cc \
+                world_entities/skydome.cc \
                 world_entities/terrain.cc \
                 world_entities/satellite.cc \
@@ -66 +67 @@
                 skysphere.h \
                 skybox.h \
+                skydome.h \
                 terrain.h \
                 satellite.h \

trunk/src/world_entities/effects/lightning_bolt.cc

@@ -64 +64 @@
   if (this->thunderBuffer != NULL)
     ResourceManager::getInstance()->unload(this->thunderBuffer);
-  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/thunder.wav", WAV);
+  this->thunderBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/atmosphere/thunder.wav", WAV);
 }
 

trunk/src/world_entities/npcs/generic_npc.h

@@ -11 +11 @@
 
 #include <string>
-//
+
 #include "sound_source.h"
+
+#include "vector.h"
+#include "qaternion.h"
+
 
 namespace OrxSound{ class SoundSource; }
@@ -38 +42 @@
   void playSound(int i);
 
+  float lookAt(WorldEntity* worldEntity);
+
   float walkTo(const Vector& coordinate, const Quaternion& dir);
   float walkTo(float x, float y, float z, float qu, float qx, float qy, float qz);
@@ -50 +56 @@
   float crouchTo(float x, float y, float qu, float qx, float qy, float qz);
 
+  float talkTo(WorldEnity* worldEntity, int dialogNr);
+
 
   void destroy();
@@ -60 +68 @@
    OrxSound::SoundBuffer*                  soundBuffer;
    float                                   soundVolume;
+
+   Vector                                  destCoor;
+   Quaternion                              destDir;
 };