Changeset 5317 in orxonox.OLD for trunk/src

Timestamp:

Oct 8, 2005, 11:43:09 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shaders are now NOT renderen in 2D-mode.
After 2D-mode is left, the Shader will be reactivated

Location:

trunk/src/lib/graphics

Files:

• render2D/render_2d.cc (modified) (3 diffs)
• shader.cc (modified) (3 diffs)
• shader.h (modified) (2 diffs)

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

@@ -22 +22 @@
 #include "list.h"
 #include "element_2d.h"
+
+#include "shader.h"
 
 #include <math.h>
@@ -124 +126 @@
 void Render2D::draw(unsigned int layer) const
 {
+  Shader::suspendShader();
+
   GraphicsEngine::enter2DMode();
 
@@ -146 +150 @@
   GraphicsEngine::leave2DMode();
 
+  Shader::restoreShader();
 }

trunk/src/lib/graphics/shader.cc

@@ -81 +81 @@
 }
 
+Shader* Shader::storedShader = NULL;
+
 
 bool Shader::loadShaderProgramm(SHADER_TYPE type, const char* fileName)
@@ -154 +156 @@
 {
   if (likely (this->shaderProgram != 0))
+  {
     glUseProgramObjectARB(this->shaderProgram);
+    Shader::storedShader = this;
+  }
 }
 
@@ -160 +165 @@
 {
   glUseProgramObjectARB(0);
+  Shader::storedShader = NULL;
 }
 

trunk/src/lib/graphics/shader.h

@@ -36 +36 @@
   char* fileRead(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 restoreShader() { if (storedShader != NULL) storedShader->activateShader(); storedShader = NULL; };
+
+
   void printError(GLenum program);
   void debug() const;
@@ -47 +54 @@
    GLenum                 vertexShader;
    GLenum                 fragmentShader;
+
+   static Shader*         storedShader;
 };