Changeset 10143 in orxonox.OLD

Timestamp:

Dec 23, 2006, 2:04:28 PM (17 years ago)

Author:

bensch

Message:

Shader fixing

Location:

trunk/src/lib/graphics

Files:

• shader.cc (modified) (2 diffs)
• shader.h (modified) (4 diffs)
• shader_data.cc (modified) (2 diffs)

trunk/src/lib/graphics/shader.cc

@@ -52 +52 @@
   }
 }
+
 void Shader::Uniform::setV(unsigned int count, int* vv) const
 {
@@ -96 +97 @@
     PRINTF(2)("Your system does not support shaders\n");
   this->load(vertexShaderFile, fragmentShaderFile);
-
 }
 

trunk/src/lib/graphics/shader.h

@@ -22 +22 @@
   {
   public:
-          Uniform(const Shader& shader, const std::string& location) { if (Shader::isSupported()) this->uniform = glGetUniformLocation(shader.getProgram(), location.c_str()) ; };
-          Uniform(GLhandleARB shaderProgram, const std::string& location) { if (Shader::isSupported()) this->uniform = glGetUniformLocation(shaderProgram, location.c_str()) ; };
+    Uniform(const Shader& shader, const std::string& location) { if (Shader::isSupported()) this->uniform = glGetUniformLocation(shader.getProgram(), location.c_str()) ; };
+  Uniform(GLhandleARB shaderProgram, const std::string& location) { if (Shader::isSupported()) this->uniform = glGetUniformLocation(shaderProgram, location.c_str()) ; };
 
-    void set(float v0) const { if (Shader::isSupported()) glUniform1f(this->uniform, v0); }
-    void set(float v0, float v1) const { if (Shader::isSupported()) glUniform2f(this->uniform, v0, v1); }
-    void set(float v0, float v1, float v2) const { if (Shader::isSupported()) glUniform3f(this->uniform, v0, v1, v2); }
-    void set(float v0, float v1, float v2, float v3) const { if (Shader::isSupported()) glUniform4f(this->uniform, v0, v1, v2, v3); }
+  void set(float v0) const { if (Shader::isSupported()) glUniform1f(this->uniform, v0); }
+  void set(float v0, float v1) const { if (Shader::isSupported()) glUniform2f(this->uniform, v0, v1); }
+  void set(float v0, float v1, float v2) const { if (Shader::isSupported()) glUniform3f(this->uniform, v0, v1, v2); }
+  void set(float v0, float v1, float v2, float v3) const { if (Shader::isSupported()) glUniform4f(this->uniform, v0, v1, v2, v3); }
 
-    void set(int v0) const { if (Shader::isSupported()) glUniform1i(this->uniform, v0); }
-    void set(int v0, int v1) const { if (Shader::isSupported()) glUniform2i(this->uniform, v0, v1); }
-    void set(int v0, int v1, int v2) const { if (Shader::isSupported()) glUniform3i(this->uniform, v0, v1, v2); }
-    void set(int v0, int v1, int v2, int v3) const {if (Shader::isSupported())  glUniform4i(this->uniform, v0, v1, v2, v3); }
+  void set(int v0) const { if (Shader::isSupported()) glUniform1i(this->uniform, v0); }
+  void set(int v0, int v1) const { if (Shader::isSupported()) glUniform2i(this->uniform, v0, v1); }
+  void set(int v0, int v1, int v2) const { if (Shader::isSupported()) glUniform3i(this->uniform, v0, v1, v2); }
+  void set(int v0, int v1, int v2, int v3) const {if (Shader::isSupported())  glUniform4i(this->uniform, v0, v1, v2, v3); }
 
     void setV(unsigned int count, float* vv) const;
@@ -53 +53 @@
 
   bool load(const std::string& vertexShaderFile, const std::string& fragmentShaderFile = "")
-    { return this->data->load(vertexShaderFile, fragmentShaderFile); }
+  { return this->data->load(vertexShaderFile, fragmentShaderFile); }
 
 
@@ -71 +71 @@
   static bool isSupported() { return checkShaderAbility(); };
 
-  inline static bool isShaderActive() { return (Shader::storedShader != NULL) ? true : false; };
+inline static bool isShaderActive() { return (Shader::storedShader != NULL) ? true : false; };
   inline static const Shader* getActiveShader() { return Shader::storedShader; };
 
@@ -78 +78 @@
 
 private:
-  ShaderData::Pointer    data;
+  ShaderData::Pointer          data;
 
   static const Shader*         storedShader;

trunk/src/lib/graphics/shader_data.cc

@@ -65 +65 @@
     return true;
   }
-  
+
   return true;
 }
@@ -74 +74 @@
 ShaderData::~ShaderData ()
 {
+  if (shaderProgram == 0)
+    return;
+
+
   if (this->shaderProgram == glGetHandleARB(GL_PROGRAM_OBJECT_ARB))
     glUseProgramObjectARB(0);