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

Timestamp:

Oct 8, 2005, 5:27:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shaders can now be loaded via the ResourceManager

File:

• trunk/src/world_entities/npc2.cc (modified) (3 diffs)

trunk/src/world_entities/npc2.cc

@@ -32 +32 @@
 
   this->loadModelWithScale("models/ships/bolido.obj", 3);
-  this->shader = new Shader("toon.vert", "toon.frag");
-  this->shader->activateShader();
-  //exit(-1);
+  this->shader = Shader::getShader("toon.vert", "toon.frag");
 
   this->obj = gluNewQuadric();
@@ -44 +42 @@
 NPC2::~NPC2 ()
 {
-  delete this->shader;
+  Shader::unload(this->shader);
   gluDeleteQuadric(this->obj);
-
 }
 
@@ -87 +84 @@
   glMultMatrixf((float*)matrix);
 
-  shader->activateShader();
+  if (this->shader != NULL && this->shader != Shader::getActiveShader())
+  {
+    shader->activateShader();
+  }
   gluSphere(this->obj, 3, 10, 10);
   //shader->deactivateShader();