Changeset 9818 in orxonox.OLD for branches/new_class_id/src/lib/graphics/shader_data.h

Timestamp:

Sep 25, 2006, 12:10:07 PM (18 years ago)

Author:

bensch

Message:

Switching to new Shader layout, with Shader and ShaderData. Shaders do not render for the time being

File:

• branches/new_class_id/src/lib/graphics/shader_data.h (modified) (3 diffs)

branches/new_class_id/src/lib/graphics/shader_data.h

@@ -9 +9 @@
 #include "base_object.h"
 
-#include "shader_types.h"
+#include "glincl.h"
 #include <vector>
-
+#include "count_pointer.h"
 
 // FORWARD DECLARATION
@@ -21 +21 @@
 {
   ObjectListDeclaration(ShaderData);
+  //! The Type of Shader.
+  typedef enum  {
+    None       = 0,     //!< No Type at all
+    Fragment   = 1,     //!< Fragment Shader.
+    Vertex     = 2,     //!< Vertex Shader.
+    Program    = 4,     //!< Compiled Shader Programm.
+  }  Type;
+
+ public:
+  typedef CountPointer<ShaderData> Pointer;
 public:
-  ShaderData(const std::string& vertexShaderFile = "", const std::string& fragmentShaderFile = "");
+  ShaderData();
   virtual ~ShaderData();
 
-  Shaders::Uniform getUniform(const std::string& location) { return Shader::Uniform(this, location); }
+  bool load(const std::string& vertexShaderFile = "", const std::string& fragmentShaderFile = "");
+
 
   GLhandleARB getProgram() const { return this->shaderProgram; }
@@ -38 +49 @@
   void linkShaderProgram();
   bool readShader(const std::string& fileName, std::string& output);
-  bool loadShaderProgramm(Shader::Type type, const std::string& fileName);
-  void deleteProgram(Shader::Type type);
+  bool loadShaderProgramm(ShaderData::Type type, const std::string& fileName);
+  void deleteProgram(ShaderData::Type type);
+
+  static void printError(GLhandleARB program);
 
 private:
+
   std::string            fragmentShaderFile;
   std::string            vertexShaderFile;