Changeset 5333 in orxonox.OLD for trunk/src

Timestamp:

Oct 9, 2005, 12:11:23 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: we do not have to shade the whole world

Location:

trunk/src

Files:

• lib/graphics/shader.cc (modified) (1 diff)
• world_entities/npc2.cc (modified) (2 diffs)

trunk/src/lib/graphics/shader.cc

@@ -283 +283 @@
 }
 
-
+bool Shader::checkShaderAbility()
+{
+  if (GLEW_ARB_shader_objects &&
+      GLEW_ARB_shading_language_100 &&
+      GLEW_ARB_vertex_shader &&
+      GLEW_ARB_fragment_shader)
+    return true;
+  else
+    return false;
+}
 
 void Shader::debug() const

trunk/src/world_entities/npc2.cc

@@ -32 +32 @@
 
   this->loadModelWithScale("models/ships/bolido.obj", 3);
-  this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
+  this->shader = NULL;
+  if (likely(Shader::checkShaderAbility()))
+    this->shader = Shader::getShader("shaders/toon.vert", "shaders/toon.frag");
 
   this->obj = gluNewQuadric();
@@ -85 +87 @@
 
   if (this->shader != NULL && this->shader != Shader::getActiveShader())
-  {
     shader->activateShader();
-  }
   gluSphere(this->obj, 3, 10, 10);
-  //shader->deactivateShader();
+  shader->deactivateShader();