Changeset 8176 in orxonox.OLD

Timestamp:

Jun 6, 2006, 6:34:22 PM (18 years ago)

Author:

amaechler

Message:

 

Location:

branches/atmospheric_engine/src

Files:

• lib/graphics/shader.cc (modified) (1 diff)
• lib/graphics/shader.h (modified) (1 diff)
• world_entities/effects/billboard.cc (modified) (1 diff)

branches/atmospheric_engine/src/lib/graphics/shader.cc

@@ -220 +220 @@
 }
 
+void Shader::bindShader(const char* name, const float* value, size_t size)
+{
+        if (likely (this->shaderProgram != 0)) {
+                glUseProgramObjectARB(this->shaderProgram);
+
+                unsigned int location = glGetUniformLocationARB(this->shaderProgram, name);
+                /* This is EXPENSIVE and should be avoided. */
+
+                if      (size == 1)  glUniform1fvARB(location, 1, value);
+                else if (size == 2)  glUniform2fvARB(location, 1, value);
+                else if (size == 3)  glUniform3fvARB(location, 1, value);
+                else if (size == 4)  glUniform4fvARB(location, 1, value);
+                else if (size == 9)  glUniformMatrix3fvARB(location, 1, false, value);
+                else if (size == 16) glUniformMatrix4fvARB(location, 1, false, value);
+
+        }
+}
+
 void Shader::deactivateShader()
 {

branches/atmospheric_engine/src/lib/graphics/shader.h

@@ -34 +34 @@
   bool loadShaderProgramm(SHADER_TYPE type, const std::string& fileName);
   void activateShader();
+  void bindShader(const char* name, const float* value, size_t size);
   static void deactivateShader();
   void deleteProgram(SHADER_TYPE type);

branches/atmospheric_engine/src/world_entities/effects/billboard.cc

@@ -92 +92 @@
   this->sizeY = sizeY;
 
-  PRINTF(0)("sizeX: %f sizeY: %f", sizeX, sizeY);
+  PRINTF(0)("sizeX: %f sizeY: %f\n", sizeX, sizeY);
 }