Changeset 8037 in orxonox.OLD for trunk/src/lib/graphics/shader.cc

Timestamp:

May 31, 2006, 4:52:34 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the water back
merged with command
svn merge -r7798:HEAD ​https://svn.orxonox.net/orxonox/branches/water .

conflicts are all resolved

File:

• trunk/src/lib/graphics/shader.cc (modified) (11 diffs)

trunk/src/lib/graphics/shader.cc

@@ -20 +20 @@
 #include "stdlibincl.h"
 #include "compiler.h"
-#include <stdio.h>
+//#include <stdio.h>
+#include <fstream>
+
 #include "debug.h"
 
@@ -26 +28 @@
 
 
-#ifndef PARSELINELENGHT
-#define PARSELINELENGHT     512       //!< how many chars to read at once
+#ifndef PARSELINELENGTH
+#define PARSELINELENGTH     512       //!< how many chars to read at once
 #endif
 
@@ -40 +42 @@
    this->setClassID(CL_SHADER, "Shader");
 
-   this->fragmentShaderFile = "";
-   this->vertexShaderFile = "";
    this->shaderProgram = 0;
    this->vertexShader = 0;
@@ -48 +48 @@
    if (GLEW_ARB_shader_objects && GLEW_ARB_shading_language_100)
      {
-       GLint status = 0;
-
        this->shaderProgram = glCreateProgramObjectARB();
 
        if (!vertexShaderFile.empty())
-         this->loadShaderProgramm(SHADER_VERTEX, vertexShaderFile);
+         this->loadShaderProgramm(Shader::Vertex, vertexShaderFile);
        if (!fragmentShaderFile.empty())
-         this->loadShaderProgramm(SHADER_FRAGMENT, fragmentShaderFile);
-       glLinkProgramARB(this->shaderProgram);
-       // link error checking
-       glGetObjectParameterivARB(this->shaderProgram, GL_OBJECT_LINK_STATUS_ARB, &status);
-       if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
-         this->printError(this->shaderProgram);
+         this->loadShaderProgramm(Shader::Fragment, fragmentShaderFile);
+
+       this->linkShaderProgram();
+
     }
    else
@@ -78 +74 @@
 
   // delete what has to be deleted here
-  this->deleteProgram(SHADER_VERTEX);
-  this->deleteProgram(SHADER_FRAGMENT);
+  this->deleteProgram(Shader::Vertex);
+  this->deleteProgram(Shader::Fragment);
 
   if (this->fragmentShader != 0)
@@ -116 +112 @@
 
 
-bool Shader::loadShaderProgramm(SHADER_TYPE type, const std::string& fileName)
+bool Shader::loadShaderProgramm(Shader::Type type, const std::string& fileName)
 {
   GLhandleARB shader = 0;
 
-  if (type != SHADER_VERTEX && type != SHADER_FRAGMENT)
+  if (type != Shader::Vertex && type != Shader::Fragment)
     return false;
   this->deleteProgram(type);
 
 
-  std::vector<char*>* program = fileReadArray(fileName);
-
-  if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
+  std::string program;
+  if (!readShader(fileName, program))
+    return false;
+
+  if (type == Shader::Vertex && GLEW_ARB_vertex_shader)
   {
     this->vertexShaderFile = fileName;
@@ -134 +132 @@
   }
 
-  if (type == SHADER_FRAGMENT && GLEW_ARB_fragment_shader)
+  if (type == Shader::Fragment && GLEW_ARB_fragment_shader)
   {
     this->fragmentShaderFile = fileName;
@@ -144 +142 @@
   {
     GLint status = 0;
-    /// FIXME do it back
-    //    glShaderSourceARB(shader, program->size(), (const std::string&)&(*program)[0], NULL);
+    const char* prog = program.c_str();
+
+    glShaderSourceARB(shader, 1, &prog, NULL);
     glCompileShaderARB(shader);
     // checking on error.
@@ -154 +153 @@
       glAttachObjectARB(this->shaderProgram, shader);
   }
-  for (unsigned int i=0; i< program->size(); i++)
-    delete[] (*program)[i];
-  delete program;
-}
-
-char* Shader::fileRead(const std::string& fileName)
-{
-  FILE* fileHandle;
-  char* content = NULL;
-
-  int count = 0;
-
-  if (fileName.empty())
-    return NULL;
-
-  fileHandle = fopen(fileName.c_str(), "rt");
-
-  if (fileHandle == NULL)
-    return NULL;
-  fseek(fileHandle, 0, SEEK_END);
-  count = ftell(fileHandle);
-  rewind(fileHandle);
-  if (count > 0) {
-     content = new char[count+1];
-     count = fread(content, sizeof(char), count, fileHandle);
-     content[count] = '\0';
-   }
-   fclose(fileHandle);
- return content;
-}
-
-
-std::vector<char*>* Shader::fileReadArray(const std::string& fileName)
-{
-  FILE*    stream;           //< The stream we use to read the file.
-
-  if( (stream = fopen (fileName.c_str(), "rt")) == NULL)
-  {
-    PRINTF(1)("Shader could not open %s\n", fileName.c_str());
-    return NULL;
-  }
-  std::vector<char*>* file = new std::vector<char*>;
-
-  char lineBuffer[PARSELINELENGHT];
-  char* addString;
-  while(fgets (lineBuffer, PARSELINELENGHT, stream) != NULL)
-  {
-    addString = new char[strlen(lineBuffer)+1];
-    strcpy(addString, lineBuffer);
-    file->push_back(addString);
-  }
-  fclose(stream);
-  return file;
+}
+
+
+void Shader::linkShaderProgram()
+{
+  GLint status = 0;
+
+  glLinkProgramARB(this->shaderProgram);
+       // link error checking
+  glGetObjectParameterivARB(this->shaderProgram, GL_OBJECT_LINK_STATUS_ARB, &status);
+  if (status == GL_INVALID_VALUE || status == GL_INVALID_OPERATION)
+    this->printError(this->shaderProgram);
+}
+
+
+bool Shader::readShader(const std::string& fileName, std::string& output)
+{
+  char lineBuffer[PARSELINELENGTH];
+
+  std::ifstream shader;
+  shader.open(fileName.c_str());
+  if (!shader.is_open())
+    return false;
+
+
+  while (!shader.eof())
+  {
+    shader.getline(lineBuffer, PARSELINELENGTH);
+    output += lineBuffer;
+    output += "\n";
+  }
+
+
+  shader.close();
+  return true;
 }
 
@@ -228 +209 @@
 
 
-void Shader::deleteProgram(SHADER_TYPE type)
+void Shader::deleteProgram(Shader::Type type)
 {
   GLint status = 0;
-  if (type == SHADER_VERTEX && this->vertexShader != 0)
+  if (type == Shader::Vertex && this->vertexShader != 0)
   {
     this->vertexShaderFile = "";
@@ -241 +222 @@
     this->vertexShader = 0;
   }
-  else if (type == SHADER_FRAGMENT && this->fragmentShader != 0)
+  else if (type == Shader::Fragment && this->fragmentShader != 0)
   {
     this->fragmentShaderFile = "";