Changeset 5323 in orxonox.OLD for trunk/src/lib

Timestamp:

Oct 8, 2005, 5:27:22 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: Shaders can now be loaded via the ResourceManager

Location:

trunk/src/lib/graphics

Files:

• shader.cc (modified) (2 diffs)
• shader.h (modified) (2 diffs)

trunk/src/lib/graphics/shader.cc

@@ -23 +23 @@
 #include "debug.h"
 #include "array.h"
+
+#include "resource_manager.h"
 
 
@@ -102 +104 @@
 }
 
+Shader* Shader::getShader(const char* vertexShaderFile, const char* fragmentShaderFile)
+{
+  return (Shader*)ResourceManager::getInstance()->load(vertexShaderFile, SHADER,  RP_LEVEL, (void*)fragmentShaderFile);
+}
+
+bool Shader::unload(Shader* shader)
+{
+  return ResourceManager::getInstance()->unload(shader);
+}
+
 Shader* Shader::storedShader = NULL;
 

trunk/src/lib/graphics/shader.h

@@ -26 +26 @@
 class Shader : public BaseObject {
 
- public:
+  public:
   Shader(const char* vertexShaderFile = NULL, const char* fragmentShaderFile = NULL);
   virtual ~Shader();
+  static Shader* getShader(const char* vertexShaderFile, const char* fragmentShaderFile);
+  static bool unload(Shader* shader);
 
   bool loadShaderProgramm(SHADER_TYPE type, const char* fileName);
@@ -41 +43 @@
 
   inline static bool shaderActive() { return (Shader::storedShader != NULL)?true:false; };
+  inline static Shader* getActiveShader() { return Shader::storedShader; };
   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; };