X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Funiformblock.h;h=3a1cdb959d06e77106024aa1f264f648836664bb;hp=815f49b1db20cc045bcd7adba81388c621e73c73;hb=8c24084524198e23d65058454001ffb0bf20e94f;hpb=5f8bc38419379b7d47aa69cb68d380728f5ee26f

diff --git a/source/uniformblock.h b/source/uniformblock.h
index 815f49b1..3a1cdb95 100644
--- a/source/uniformblock.h
+++ b/source/uniformblock.h
@@ -15,31 +15,14 @@ class Vector4;
 class UniformBlock
 {
 private:
-	std::map<int, Uniform *> uniforms;
+	std::map<int, const Uniform *> uniforms;
 
 	UniformBlock(const UniformBlock &);
 	UniformBlock &operator=(const UniformBlock &);
 public:
 	UniformBlock() { }
-	~UniformBlock();
 
-private:
-	void uniform(int, Uniform *);
-public:
-	void uniform(int, const Uniform &);
-	void uniform(int, int);
-	void uniform(int, float);
-	void uniform(int, float, float);
-	void uniform2(int, const float *);
-	void uniform(int, float, float, float);
-	void uniform(int, const Vector3 &);
-	void uniform3(int, const float *);
-	void uniform(int, float, float, float, float);
-	void uniform(int, const Vector4 &);
-	void uniform(int, const Color &);
-	void uniform4(int, const float *);
-	void uniform_matrix4(int, const float *);
-	void uniform_matrix4(int, const Matrix &);
+	void attach(int, const Uniform &);
 
 	void apply(int) const;
 };