X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=1254b7adf3951ffc6b2dfd1d1890e9ceb8598290;hb=16ab664fe93bffba059ea53deccbfed0305f7440;hp=6115a7feeae33deadf6bb327f2d83703cd6f2d87;hpb=1b7b75e3aaec35433cce81fc58e58e50e5a3f36e;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index 6115a7fe..1254b7ad 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -1,8 +1,10 @@
 #ifndef MSP_GL_RENDERER_H_
 #define MSP_GL_RENDERER_H_
 
+#include <set>
 #include <vector>
 #include "matrix.h"
+#include "tag.h"
 
 namespace Msp {
 namespace GL {
@@ -11,8 +13,10 @@ class Batch;
 class Buffer;
 class Camera;
 class Material;
+class Lighting;
 class Program;
 class ProgramData;
+class Renderable;
 class Texture;
 class Texturing;
 class VertexArray;
@@ -45,15 +49,29 @@ public:
 		~Push() { renderer.pop_state(); }
 	};
 
+	class Exclude
+	{
+	private:
+		Renderer &renderer;
+		const Renderable &renderable;
+
+	public:
+		Exclude(Renderer &r, const Renderable &e): renderer(r), renderable(e) { renderer.exclude(renderable); }
+		~Exclude() { renderer.include(renderable); }
+	};
+
 private:
 	struct State
 	{
 		const Texture *texture;
 		const Texturing *texturing;
 		const Material *material;
+		const Lighting *lighting;
+		Matrix lighting_matrix;
 		const Program *shprog;
 		unsigned shdata_count;
 		const WindingTest *winding_test;
+		bool reverse_winding;
 
 		State();
 	};
@@ -74,11 +92,12 @@ private:
 	const Camera *camera;
 	std::vector<State> state_stack;
 	State *state;
+	bool lighting_changed;
 	std::vector<const ProgramData *> shdata_stack;
 	bool shdata_changed;
 	const VertexArray *vertex_array;
-	bool vertex_array_changed;
 	const Buffer *element_buffer;
+	std::set<const Renderable *> excluded;
 
 public:
 	Renderer(const Camera *);
@@ -92,6 +111,8 @@ public:
 	void set_texturing(const Texturing *);
 	void set_material(const Material *);
 
+	void set_lighting(const Lighting *);
+
 	/** Sets the shader program to use.  An initial set of data can be set as
 	well, with the same semantics as add_shader_data. */
 	void set_shader_program(const Program *prog, const ProgramData *data = 0);
@@ -104,6 +125,7 @@ public:
 	void set_vertex_array(const VertexArray *);
 	void set_element_buffer(const Buffer *);
 	void set_winding_test(const WindingTest *);
+	void set_reverse_winding(bool);
 
 	/** Saves the current state so it can be restored later. */
 	void push_state();
@@ -117,6 +139,10 @@ public:
 	Renderer. */
 	void escape();
 
+	void exclude(const Renderable &);
+	void include(const Renderable &);
+
+	void render(const Renderable &, const Tag & = Tag());
 	void draw(const Batch &);
 
 private: