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

diff --git a/source/renderer.h b/source/renderer.h
index ccb23a22..18d3a41a 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -89,25 +89,47 @@ private:
 		virtual void update();
 	};
 
+	enum ChangeMask
+	{
+		LEGACY_MATRIX = 1,
+		MODERN_MATRIX = 2,
+		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
+		LIGHTING = 4,
+		SHADER_DATA = 8
+	};
+
 	MtxStack mtx_stack;
-	bool mtx_changed;
+	unsigned char changed;
 	bool matrices_loaded;
+	unsigned shdata_applied;
 	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 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 *);
+
+	/** Deprecated as unsafe.  Use set_matrix() or transform() instead. */
 	MatrixStack &matrix_stack() { return mtx_stack; }
 
+	/** Replaces the Renderer's modelview matrix. */
+	void set_matrix(const Matrix &);
+
+	/** Applies a transform to the Renderer's modelview matrix. */
+	void transform(const Matrix &);
+
+	/** Returns the current modelview matrix. */
+	const Matrix &get_matrix() const { return mtx_stack.top(); }
+
 	const Camera *get_camera() const { return camera; }
 
 	void set_texture(const Texture *);
@@ -127,7 +149,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);
 
@@ -140,9 +161,14 @@ 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();
 
+	/** 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 &);
 	void include(const Renderable &);
 
@@ -151,6 +177,7 @@ public:
 
 private:
 	void apply_state();
+	void reset_state();
 };
 
 } // namespace GL