X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=ccb23a22a709ff1f864e6179435c9ead36bb5db8;hb=f1034ec02beee2a497644fd91e680fd51ee1b5ac;hp=088b5710ad6a31b6b79b1e1941ff10ef88e810c9;hpb=d108cd5fc13aca16e38b54c1946c65797a869073;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index 088b5710..ccb23a22 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -4,6 +4,7 @@
 #include <set>
 #include <vector>
 #include "matrix.h"
+#include "programdata.h"
 #include "tag.h"
 
 namespace Msp {
@@ -13,12 +14,12 @@ class Batch;
 class Buffer;
 class Camera;
 class Material;
+class Mesh;
+class Lighting;
 class Program;
-class ProgramData;
 class Renderable;
 class Texture;
 class Texturing;
-class VertexArray;
 class WindingTest;
 
 /**
@@ -64,10 +65,15 @@ private:
 	{
 		const Texture *texture;
 		const Texturing *texturing;
+		unsigned lowest_effect_texunit;
 		const Material *material;
+		const Lighting *lighting;
+		Matrix lighting_matrix;
 		const Program *shprog;
 		unsigned shdata_count;
+		const Mesh *mesh;
 		const WindingTest *winding_test;
+		bool reverse_winding;
 
 		State();
 	};
@@ -79,18 +85,20 @@ private:
 
 	public:
 		MtxStack(Renderer &);
-	private:	
+	private:
 		virtual void update();
 	};
 
 	MtxStack mtx_stack;
 	bool mtx_changed;
+	bool matrices_loaded;
 	const Camera *camera;
 	std::vector<State> state_stack;
 	State *state;
+	bool lighting_changed;
+	ProgramData standard_shdata;
 	std::vector<const ProgramData *> shdata_stack;
 	bool shdata_changed;
-	const VertexArray *vertex_array;
 	const Buffer *element_buffer;
 	std::set<const Renderable *> excluded;
 
@@ -104,8 +112,11 @@ public:
 
 	void set_texture(const Texture *);
 	void set_texturing(const Texturing *);
+	unsigned allocate_effect_texunit();
 	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);
@@ -115,9 +126,10 @@ public:
 	Renderer state is popped. */
 	void add_shader_data(const ProgramData &data);
 
-	void set_vertex_array(const VertexArray *);
+	void set_mesh(const Mesh *);
 	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();