Changeset 5318 in orxonox.OLD for trunk/src

Timestamp:

Oct 8, 2005, 1:08:09 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: new ReadFileArray function for shader

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (2 diffs)
• lib/graphics/render2D/render_2d.cc (modified) (3 diffs)
• lib/graphics/shader.cc (modified) (6 diffs)
• lib/graphics/shader.h (modified) (2 diffs)
• story_entities/world.cc (modified) (2 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -24 +24 @@
 #include "debug.h"
 #include "text_engine.h"
-
+#include "shader.h"
 #include "ini_parser.h"
 #include "substring.h"
+
 
 using namespace std;
@@ -544 +545 @@
 {
   GraphicsEngine::storeMatrices();
+  Shader::suspendShader();
   Render2D::getInstance()->draw(E2D_ALL_LAYERS);
+  Shader::restoreShader();
   LightManager::getInstance()->draw();
 }

trunk/src/lib/graphics/render2D/render_2d.cc

@@ -23 +23 @@
 #include "element_2d.h"
 
-#include "shader.h"
-
 #include <math.h>
 
 using namespace std;
-
-
 
 /**
@@ -126 +122 @@
 void Render2D::draw(unsigned int layer) const
 {
-  Shader::suspendShader();
-
   GraphicsEngine::enter2DMode();
 
@@ -149 +143 @@
   }
   GraphicsEngine::leave2DMode();
-
-  Shader::restoreShader();
 }

trunk/src/lib/graphics/shader.cc

@@ -22 +22 @@
 #include <stdio.h>
 #include "debug.h"
+#include "array.h"
 
 
@@ -66 +67 @@
 /**
  * standard deconstructor
-*/
+ */
 Shader::~Shader ()
 {
+  if (storedShader == this)
+    Shader::deactivateShader();
+
   // delete what has to be deleted here
   this->deleteProgram(SHADER_VERTEX);
@@ -79 +83 @@
   if (this->shaderProgram != 0)
     glDeleteObjectARB(this->shaderProgram);
+
 }
 
@@ -93 +98 @@
 
 
-  const char* program = fileRead(fileName);
+  Array<char*>* program = fileReadArray(fileName);
   if (program == NULL)
     return false;
+
   if (type == SHADER_VERTEX && GLEW_ARB_vertex_shader)
   {
@@ -114 +120 @@
   if (shader != 0)
     {
-      glShaderSourceARB(shader, 1, (const GLcharARB**)&program, NULL);
-      try {
+      glShaderSourceARB(shader, program->getCount(), (const GLcharARB**)program->getArray(), NULL);
         glCompileShaderARB(shader);
-      }
-      catch (...)
-        {
           this->printError(shader);
-        }
       glAttachObjectARB(this->shaderProgram, shader);
-      delete[] program;
     }
+    delete program;
 }
 
@@ -153 +154 @@
 }
 
+
+Array<char*>* Shader::fileReadArray(const char* fileName)
+{
+  FILE*    stream;           //< The stream we use to read the file.
+
+  if( (stream = fopen (fileName, "rt")) == NULL)
+  {
+    PRINTF(1)("Shader could not open %s\n", fileName);
+    return NULL;
+  }
+  Array<char*>* file = new Array<char*>;
+
+  char lineBuffer[PARSELINELENGHT];
+  char* addString;
+  while(fgets (lineBuffer, PARSELINELENGHT, stream) != NULL)
+  {
+    addString = new char[strlen(lineBuffer)+1];
+    strcpy(addString, lineBuffer);
+    file->addEntry(addString);
+  }
+  fclose(stream);
+  file->finalizeArray();
+  return file;
+}
+
+
+
 void Shader::activateShader()
 {

trunk/src/lib/graphics/shader.h

@@ -10 +10 @@
 #include "glincl.h"
 
+template<class T> class Array;
 
 typedef enum
@@ -35 +36 @@
 
   char* fileRead(const char* fileName);
+  Array<char*>* fileReadArray(const char* fileName);
 
   static bool checkShaderAbility();
 
   inline static bool shaderActive() { return (Shader::storedShader != NULL)?true:false; };
-  inline static void suspendShader() { Shader* currShader=storedShader; if (currShader!= NULL) { Shader::deactivateShader(); Shader::storedShader = currShader;} };
+  inline static void suspendShader() { Shader* currShader = storedShader; if (storedShader!= NULL) { Shader::deactivateShader(); Shader::storedShader = currShader;} };
   inline static void restoreShader() { if (storedShader != NULL) storedShader->activateShader(); storedShader = NULL; };
 

trunk/src/story_entities/world.cc

@@ -74 +74 @@
 #include "npc.h"
 #include "npc2.h"
+#include "shader.h"
 
 SHELL_COMMAND(speed, World, setSpeed);
@@ -143 +144 @@
   // erease everything that is left.
   delete NullParent::getInstance();
+  Shader::suspendShader();
 
   // unload the resources !!