Changeset 7822 in orxonox.OLD for branches/water/src

Timestamp:

May 24, 2006, 6:04:19 PM (18 years ago)

Author:

bensch

Message:

water: shader update

Location:

branches/water/src/lib/graphics

Files:

• shader.cc (modified) (6 diffs)
• shader.h (modified) (1 diff)

branches/water/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
 
@@ -119 +121 @@
 
 
-  std::vector<char*>* program = fileReadArray(fileName);
+  std::string program;
+  if (!readShader(fileName, program))
+    return false;
 
   if (type == Shader::Vertex && GLEW_ARB_vertex_shader)
@@ -139 +143 @@
     GLint status = 0;
     /// FIXME do it back
-    //    glShaderSourceARB(shader, program->size(), (const std::string&)&(*program)[0], NULL);
+    const char* prog = &program[0];
+    glShaderSourceARB(shader, 1, &prog, NULL);
     glCompileShaderARB(shader);
     // checking on error.
@@ -148 +153 @@
       glAttachObjectARB(this->shaderProgram, shader);
   }
-  for (unsigned int i=0; i< program->size(); i++)
-    delete[] (*program)[i];
-  delete program;
 }
 
@@ -166 +168 @@
 
 
-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;
+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;
+    printf("line:: %s\n");
+  }
+
+
+  shader.close();
 }
 

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

@@ -46 +46 @@
 
 
-  char* fileRead(const std::string& fileName);
-  std::vector<char*>* fileReadArray(const std::string& fileName);
+  bool readShader(const std::string& fileName, std::string& output);