X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=10d1fb3f13c0f2c2f8d9b539a5b90d724d72b506;hb=c46c75f8e3863dc3c6f91a2d5dc7f58333ec9260;hp=a3ddaa3bd28f3832ce2a21884384727c897ede5f;hpb=6d2e5c8e7ef79706adfce1b69695e3c8071c6ddb;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index a3ddaa3b..10d1fb3f 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -91,7 +91,9 @@ private:
 
 	enum ChangeMask
 	{
-		MATRIX = 1,
+		LEGACY_MATRIX = 1,
+		MODERN_MATRIX = 2,
+		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
 		LIGHTING = 4,
 		SHADER_DATA = 8
 	};
@@ -99,18 +101,23 @@ private:
 	MtxStack mtx_stack;
 	unsigned char changed;
 	bool matrices_loaded;
+	unsigned shdata_applied;
 	const Camera *camera;
 	std::vector<State> state_stack;
 	State *state;
 	ProgramData standard_shdata;
 	std::vector<const ProgramData *> shdata_stack;
-	const Buffer *element_buffer;
 	std::set<const Renderable *> excluded;
 
 public:
 	Renderer(const Camera *);
 	~Renderer();
 
+	/** Resets all internal state and restarts rendering.  There must be no
+	unpopped state in the stack.  It is permissible to call begin() multiple
+	times without an intervening end(). */
+	void begin(const Camera *);
+
 	MatrixStack &matrix_stack() { return mtx_stack; }
 
 	const Camera *get_camera() const { return camera; }
@@ -132,7 +139,6 @@ public:
 	void add_shader_data(const ProgramData &data);
 
 	void set_mesh(const Mesh *);
-	void set_element_buffer(const Buffer *);
 	void set_winding_test(const WindingTest *);
 	void set_reverse_winding(bool);
 
@@ -148,8 +154,9 @@ public:
 	Renderer.  DEPRECATED. */
 	void escape();
 
-	/** Ends rendering, unbinding all objects and resetting state.  There must
-	be no unpopped state in the stack. */
+	/** Unbinds all objects and resets related state.  There must be no unpopped
+	state in the stack.  Rendering with the same camera can be restarted without
+	an explicit begin() call. */
 	void end();
 
 	void exclude(const Renderable &);
@@ -160,6 +167,7 @@ public:
 
 private:
 	void apply_state();
+	void reset_state();
 };
 
 } // namespace GL