Changeset 9818 in orxonox.OLD for branches/new_class_id/src/lib/graphics/shader_data.cc

Timestamp:

Sep 25, 2006, 12:10:07 PM (18 years ago)

Author:

bensch

Message:

Switching to new Shader layout, with Shader and ShaderData. Shaders do not render for the time being

File:

• branches/new_class_id/src/lib/graphics/shader_data.cc (modified) (14 diffs)

branches/new_class_id/src/lib/graphics/shader_data.cc

@@ -38 +38 @@
  * standard constructor
 */
-Shader::Shader (const std::string& vertexShaderFile, const std::string& fragmentShaderFile)
-{
-  this->registerObject(this, Shader::_objectList);
+ShaderData::ShaderData ()
+{
+  this->registerObject(this, ShaderData::_objectList);
   this->shaderProgram = 0;
   this->vertexShader = 0;
   this->fragmentShader = 0;
-
+}
+
+
+/// TODO fix that shaders are unloaded first. then loaded
+bool ShaderData::load(const std::string& vertexShaderFile, const std::string& fragmentShaderFile)
+{
   if (GLEW_ARB_shader_objects && GLEW_ARB_shading_language_100)
   {
@@ -50 +55 @@
 
     if (!vertexShaderFile.empty())
-      this->loadShaderProgramm(Shader::Vertex, vertexShaderFile);
+      this->loadShaderProgramm(ShaderData::Vertex, vertexShaderFile);
     if (!fragmentShaderFile.empty())
-      this->loadShaderProgramm(Shader::Fragment, fragmentShaderFile);
+      this->loadShaderProgramm(ShaderData::Fragment, fragmentShaderFile);
 
     this->linkShaderProgram();
@@ -62 +67 @@
   }
 }
-
 
 /**
  * standard deconstructor
  */
-Shader::~Shader ()
+ShaderData::~ShaderData ()
 {
   if (this->shaderProgram == glGetHandleARB(GL_PROGRAM_OBJECT_ARB))
-    Shader::deactivateShader();
+    glUseProgramObjectARB(0);
 
   // delete what has to be deleted here
-  this->deleteProgram(Shader::Vertex);
-  this->deleteProgram(Shader::Fragment);
+  this->deleteProgram(ShaderData::Vertex);
+  this->deleteProgram(ShaderData::Fragment);
 
   if (this->fragmentShader != 0)
@@ -98 +102 @@
 }
 
-Shader* Shader::storedShader = NULL;
-
-
-bool Shader::loadShaderProgramm(Shader::Type type, const std::string& fileName)
+bool ShaderData::loadShaderProgramm(ShaderData::Type type, const std::string& fileName)
 {
   GLhandleARB shader = 0;
 
-  if (type != Shader::Vertex && type != Shader::Fragment)
+  if (type != ShaderData::Vertex && type != ShaderData::Fragment)
     return false;
   this->deleteProgram(type);
@@ -114 +115 @@
     return false;
 
-  if (type == Shader::Vertex && GLEW_ARB_vertex_shader)
+  if (type == ShaderData::Vertex && GLEW_ARB_vertex_shader)
   {
     this->vertexShaderFile = fileName;
@@ -121 +122 @@
   }
 
-  if (type == Shader::Fragment && GLEW_ARB_fragment_shader)
+  if (type == ShaderData::Fragment && GLEW_ARB_fragment_shader)
   {
     this->fragmentShaderFile = fileName;
@@ -146 +147 @@
 
 
-void Shader::linkShaderProgram()
+void ShaderData::linkShaderProgram()
 {
   GLint status = 0;
@@ -158 +159 @@
 
 
-bool Shader::readShader(const std::string& fileName, std::string& output)
+bool ShaderData::readShader(const std::string& fileName, std::string& output)
 {
   char lineBuffer[PARSELINELENGTH];
@@ -180 +181 @@
 }
 
-
-
-void Shader::activateShader()
-{
-  if (likely (this->shaderProgram != 0))
-  {
-    glUseProgramObjectARB(this->shaderProgram);
-    Shader::storedShader = this;
-  }
-}
-
-void Shader::bindShader(const char* name, const float* value, size_t size)
+void ShaderData::bindShader(const char* name, const float* value, size_t size)
 {
   if (likely (this->shaderProgram != 0))
@@ -210 +200 @@
 }
 
-void Shader::deactivateShader()
-{
-  if (storedShader != NULL)
-    glUseProgramObjectARB(0);
-  Shader::storedShader = NULL;
-}
-
-
-void Shader::deleteProgram(Shader::Type type)
+void ShaderData::deleteProgram(ShaderData::Type type)
 {
   GLint status = 0;
-  if (type == Shader::Vertex && this->vertexShader != 0)
+  if (type == ShaderData::Vertex && this->vertexShader != 0)
   {
     this->vertexShaderFile = "";
@@ -228 +210 @@
     glGetObjectParameterivARB(this->vertexShader, GL_OBJECT_DELETE_STATUS_ARB, &status);
     if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
-      Shader::printError(this->vertexShader);
+      ShaderData::printError(this->vertexShader);
     this->vertexShader = 0;
   }
-  else if (type == Shader::Fragment && this->fragmentShader != 0)
+  else if (type == ShaderData::Fragment && this->fragmentShader != 0)
   {
     this->fragmentShaderFile = "";
@@ -238 +220 @@
     glGetObjectParameterivARB(this->fragmentShader, GL_OBJECT_DELETE_STATUS_ARB, &status);
     if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
-      Shader::printError(this->fragmentShader);
+      ShaderData::printError(this->fragmentShader);
     this->fragmentShader = 0;
   }
@@ -246 +228 @@
 
 
-void Shader::printError(GLhandleARB program)
+void ShaderData::printError(GLhandleARB program)
 {
   if (program == 0)
@@ -267 +249 @@
 }
 
-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
-{
-  PRINT(3)("Shader info: (SHADER: %d)\n", this->shaderProgram);
+void ShaderData::debug() const
+{
+  PRINT(3)("ShaderData info: (SHADER: %d)\n", this->shaderProgram);
   if (this->vertexShader != 0)
   {