Changeset 8705 in orxonox.OLD

Timestamp:

Jun 22, 2006, 12:17:28 PM (18 years ago)

Author:

patrick

Message:

bsp: work flush, some more npc functions, and a positioning aid

Location:

branches/bsp_model/src/world_entities

Files:

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

branches/bsp_model/src/world_entities/creatures/fps_player.cc

@@ -272 +272 @@
     this->yMouse += event.yRel;
   }
-}
-
-
-
-
+  else if( event.type == KeyMapper::PEV_JUMP)
+    this->getAbsCoor().debug();
+}
+
+
+
+

branches/bsp_model/src/world_entities/npcs/generic_npc.cc

@@ -69 +69 @@
     ResourceManager::getInstance()->unload(this->soundBuffer);
   this->soundBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV);
+
+  // collision reaction registration
+  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 }
 
@@ -78 +81 @@
 void GenericNPC::loadParams(const TiXmlElement* root)
 {
-  WorldEntity::loadParams(root);
-
-  LoadParam(root, "md2animation", this, GenericNPC, setAnimation)
-      .describe("sets the animation of the md2 model")
-      .defaultValues(1);
+  NPC::loadParams(root);
 
 }
@@ -104 +103 @@
  * @param anumPlaybackMode: the playback mode
  */
-bool GenericNPC::playAnimation(int animationIndex, int animPlaybackMode)
+void GenericNPC::playAnimation(int animationIndex, int animPlaybackMode)
 {
   if( likely(this->getModel(0) != NULL))
     ((InteractiveModel*)this->getModel(0))->setAnimation(animationIndex, animPlaybackMode);
 
-  return true;
 }
 
@@ -117 +115 @@
  * @param filename: name of the file
  */
-bool GenericNPC::playSound(std::string filename)
+void GenericNPC::playSound(std::string filename)
 {
-  return true;
+
 }
 

branches/bsp_model/src/world_entities/npcs/generic_npc.h

@@ -33 +33 @@
   inline void setVolume(float vol) { this->soundVolume = vol; }
 
-  bool playAnimation(int animationIndex, int animPlaybackMode);
-  bool playSound(std::string filename);
+  void playAnimation(int animationIndex, int animPlaybackMode);
+
+  void playSound(std::string filename);
+  void playSound(int i);
+
   bool walkTo(const Vector& coordinate, float time);
   bool walkTo(float x, float y, float z, float time);