X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=5d8f686e35806a419e4a46167fd75161666ed725;hb=b152e4f63170e8ccd6c9fb9397964c628fb6efeb;hp=a4663df87a152d3a0444e48b42e97558e49f2bab;hpb=a86623004ba91baef76dac9275e9b79366acce16;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index a4663df8..5d8f686e 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,13 +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;
 
 /**
@@ -65,11 +65,13 @@ 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;
 
@@ -89,13 +91,14 @@ private:
 
 	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;
 
@@ -109,6 +112,7 @@ 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 *);
@@ -122,7 +126,7 @@ 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);
@@ -136,9 +140,13 @@ public:
 
 	/** Prepares for temporarily bypassing the Renderer by synchronizing the
 	current state with GL.  No additional call is necessary to resume using the
-	Renderer. */
+	Renderer.  DEPRECATED. */
 	void escape();
 
+	/** Ends rendering, unbinding all objects and resetting state.  There must
+	be no unpopped state in the stack. */
+	void end();
+
 	void exclude(const Renderable &);
 	void include(const Renderable &);