Changeset 9806 in orxonox.OLD for branches/new_class_id/src/world_entities

Timestamp:

Sep 24, 2006, 10:30:13 PM (18 years ago)

Author:

bensch

Message:

try with the shader

Location:

branches/new_class_id/src/world_entities/npcs

Files:

• attractor_mine.cc (modified) (2 diffs)
• generic_npc.cc (modified) (2 diffs)
• generic_npc.h (modified) (1 diff)
• npc_test.cc (modified) (2 diffs)

branches/new_class_id/src/world_entities/npcs/attractor_mine.cc

@@ -66 +66 @@
 
   this->shader = NULL;
-  if (likely(Shader::checkShaderAbility()))
-    this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
+  //if (likely(Shader::checkShaderAbility()))
+//    this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
 
   this->randomRotAxis = VECTOR_RAND(1);
@@ -78 +78 @@
 AttractorMine::~AttractorMine ()
 {
-  if (this->shader)
-    Shader::unload(this->shader);
 }
-
 
 void AttractorMine::loadParams(const TiXmlElement* root)

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

@@ -29 +29 @@
 
 #include "loading/resource_manager.h"
+#include "sound/resource_sound_buffer.h"
 
 #include "bsp_entity.h"
@@ -88 +89 @@
   this->toList(OM_GROUP_00);
 
-  this->soundBuffer = (OrxSound::SoundBuffer*)ResourceManager::getInstance()->load("sound/rain.wav", WAV);
+  this->soundBuffer = OrxSound::ResourceSoundBuffer("sound/rain.wav");
 
   time = 30.0f;

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

@@ -124 +124 @@
 
    OrxSound::SoundSource                   soundSource;
-   OrxSound::SoundBuffer*                  soundBuffer;
+   OrxSound::SoundBuffer                   soundBuffer;
    float                                   soundVolume;
 

branches/new_class_id/src/world_entities/npcs/npc_test.cc

@@ -48 +48 @@
 
   this->shader = NULL;
-  if (likely(Shader::checkShaderAbility()))
-    this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
+//  if (likely(Shader::checkShaderAbility()))
+    //this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
 
   this->randomRotAxis = VECTOR_RAND(1);
@@ -59 +59 @@
 
 NPC2::~NPC2 ()
-{
-  if (this->shader)
-    Shader::unload(this->shader);
-}
+{}