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

diff --git a/source/renderer.h b/source/renderer.h
index 3d561b4f..b2fcf4c4 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -21,6 +21,7 @@ class Program;
 class Renderable;
 class Texture;
 class Texturing;
+class VertexSetup;
 class WindingTest;
 
 /**
@@ -64,6 +65,8 @@ public:
 private:
 	struct State
 	{
+		const Camera *camera;
+		Matrix modelview_matrix;
 		const Texture *texture;
 		const Texturing *texturing;
 		unsigned lowest_effect_texunit;
@@ -75,38 +78,29 @@ private:
 		const Program *shprog;
 		unsigned shdata_count;
 		const Mesh *mesh;
+		const VertexSetup *vertex_setup;
 		const WindingTest *winding_test;
 		bool reverse_winding;
 
 		State();
 	};
 
-	class MtxStack: public MatrixStack
-	{
-	private:
-		Renderer &renderer;
-
-	public:
-		MtxStack(Renderer &);
-	private:
-		virtual void update();
-	};
-
 	enum ChangeMask
 	{
 		LEGACY_MATRIX = 1,
 		MODERN_MATRIX = 2,
 		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
-		LIGHTING = 4,
-		CLIPPING = 8,
-		SHADER_DATA = 16
+		LEGACY_LIGHTING = 4,
+		LEGACY_CLIPPING = 8,
+		SHADER_DATA = 16,
+		MATERIAL_SHDATA = 32,
+		STANDARD_SHDATA = 64,
+		LEGACY_PROJECTION = 128
 	};
 
-	MtxStack mtx_stack;
+	const Camera *default_camera;
 	unsigned char changed;
 	bool matrices_loaded;
-	unsigned shdata_applied;
-	const Camera *camera;
 	std::vector<State> state_stack;
 	State *state;
 	ProgramData standard_shdata;
@@ -119,11 +113,16 @@ public:
 
 	/** 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(). */
+	times without an intervening end().
+
+	Deprecated; use end() and set_camera() instead.*/
 	void begin(const Camera *);
 
-	/** Deprecated as unsafe.  Use set_matrix() or transform() instead. */
-	MatrixStack &matrix_stack() { return mtx_stack; }
+	/** Sets the camera to render from.  The modelview matrix is reset to the
+	camera's view matrix. */
+	void set_camera(const Camera &);
+
+	const Camera *get_camera() const { return state->camera; }
 
 	/** Replaces the Renderer's modelview matrix. */
 	void set_matrix(const Matrix &);
@@ -132,9 +131,7 @@ public:
 	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; }
+	const Matrix &get_matrix() const { return state->modelview_matrix; }
 
 	void set_texture(const Texture *);
 	void set_texturing(const Texturing *);
@@ -154,6 +151,7 @@ public:
 	void add_shader_data(const ProgramData &data);
 
 	void set_mesh(const Mesh *);
+	void set_vertex_setup(const VertexSetup *);
 	void set_winding_test(const WindingTest *);
 	void set_reverse_winding(bool);
 
@@ -164,14 +162,9 @@ public:
 	push_state call. */
 	void pop_state();
 
-	/** Prepares for temporarily bypassing the Renderer by synchronizing the
-	current state with GL.  No additional call is necessary to resume using the
-	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. */
+	state in the stack.  The Renderer remains valid and may be reused for
+	further rendering. */
 	void end();
 
 	void exclude(const Renderable &);
@@ -182,7 +175,6 @@ public:
 
 private:
 	void apply_state();
-	void reset_state();
 };
 
 } // namespace GL