X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frender%2Frenderer.h;h=99c8c5002b242da1d18c694d77996ff8ded0607c;hb=e1be82a4dfce8d90358c506f65be09da4dc9d5ec;hp=79bd5cd913931a7eeca01f0e79e358b6965fd329;hpb=ab9b22356f16aea822527c06186641d3121e1355;p=libs%2Fgl.git

diff --git a/source/render/renderer.h b/source/render/renderer.h
index 79bd5cd9..99c8c500 100644
--- a/source/render/renderer.h
+++ b/source/render/renderer.h
@@ -105,6 +105,7 @@ private:
 	{
 		PIPELINE_KEY = 1,
 		MATRIX = 2,
+		CAMERA = 4,
 		SHADER_DATA = 16
 	};
 
@@ -119,6 +120,9 @@ private:
 	PipelineState *last_pipeline = 0;
 	Commands commands;
 
+	static const Tag world_obj_matrix_tag;
+	static const Tag world_obj_normal_matrix_tag;
+
 public:
 	Renderer();
 
@@ -144,6 +148,14 @@ private:
 
 public:
 	void set_pipeline_key(std::uintptr_t);
+	void set_pipeline_key(const void *p) { set_pipeline_key(reinterpret_cast<uintptr_t>(p)); }
+
+	template<typename T>
+	void set_pipeline_key(std::uintptr_t k, T d)
+	{ set_pipeline_key(k^(static_cast<uintptr_t>(d)<<((sizeof(std::uintptr_t)-sizeof(T))*std::numeric_limits<char>::digits))); }
+
+	template<typename T>
+	void set_pipeline_key(const void *p, T d) { set_pipeline_key(reinterpret_cast<uintptr_t>(p), d); }
 
 	/** Sets the camera to render from.  The model matrix is reset to identity. */
 	void set_camera(const Camera &);