X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=3d561b4fd8f0daea3cc69afa0fc0d1c7b8be86f1;hb=cdfdcecd046c494470bfb4cc1de66f6cfca5efec;hp=1be1a4549211828d8b3dedfeea7898a4c0a526b3;hpb=db2fd517dcd215e9d16345287d413f2a64f5ba03;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index 1be1a454..3d561b4f 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -13,6 +13,7 @@ namespace GL {
 class Batch;
 class Buffer;
 class Camera;
+class Clipping;
 class Material;
 class Mesh;
 class Lighting;
@@ -69,6 +70,8 @@ private:
 		const Material *material;
 		const Lighting *lighting;
 		Matrix lighting_matrix;
+		const Clipping *clipping;
+		Matrix clipping_matrix;
 		const Program *shprog;
 		unsigned shdata_count;
 		const Mesh *mesh;
@@ -89,24 +92,48 @@ private:
 		virtual void update();
 	};
 
+	enum ChangeMask
+	{
+		LEGACY_MATRIX = 1,
+		MODERN_MATRIX = 2,
+		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
+		LIGHTING = 4,
+		CLIPPING = 8,
+		SHADER_DATA = 16
+	};
+
 	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 *);
@@ -115,6 +142,7 @@ public:
 	void set_material(const Material *);
 
 	void set_lighting(const Lighting *);
+	void set_clipping(const Clipping *);
 
 	/** Sets the shader program to use.  An initial set of data can be set as
 	well, with the same semantics as add_shader_data. */
@@ -126,7 +154,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);
 
@@ -139,9 +166,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 &);
 
@@ -150,6 +182,7 @@ public:
 
 private:
 	void apply_state();
+	void reset_state();
 };
 
 } // namespace GL