include/rays/shader.h in rays-0.1.12 vs include/rays/shader.h in rays-0.1.13

@@ -3,42 +3,70 @@
 #ifndef __RAYS_SHADER_H__
 #define __RAYS_SHADER_H__
 
 
 #include <xot/pimpl.h>
-#include "rays/opengl.h"
+#include <rays/defs.h>
+#include <rays/coord.h>
 
 
 namespace Rays
 {
 
 
+	class Image;
+
+
 	class Shader
 	{
 
 		typedef Shader This;
 
 		public:
 
-			Shader ();
+			Shader (const char* source = NULL);
 
-			Shader (const char* source);
-
 			~Shader ();
 
-			GLuint id () const;
+			void set_uniform (const char* name, int arg1);
 
-			bool operator == (const Shader& rhs) const;
+			void set_uniform (const char* name, int arg1, int arg2);
 
-			bool operator != (const Shader& rhs) const;
+			void set_uniform (const char* name, int arg1, int arg2, int arg3);
 
+			void set_uniform (const char* name, int arg1, int arg2, int arg3, int arg4);
+
+			void set_uniform (const char* name, const int* args, size_t size);
+
+			void set_uniform (const char* name, float arg1);
+
+			void set_uniform (const char* name, float arg1, float arg2);
+
+			void set_uniform (const char* name, float arg1, float arg2, float arg3);
+
+			void set_uniform (const char* name, float arg1, float arg2, float arg3, float arg4);
+
+			void set_uniform (const char* name, const float* args, size_t size);
+
+			void set_uniform (const char* name, const Coord2& vec2);
+
+			void set_uniform (const char* name, const Coord3& vec3);
+
+			void set_uniform (const char* name, const Coord4& vec4);
+
+			void set_uniform (const char* name, const Image& texture);
+
 			operator bool () const;
 
 			bool operator ! () const;
 
+			friend bool operator == (const This& lhs, const This& rhs);
+
+			friend bool operator != (const This& lhs, const This& rhs);
+
 			struct Data;
 
-			Xot::PImpl<Data, true> self;
+			Xot::PSharedImpl<Data> self;
 
 	};// Shader
 
 
 }// Rays