X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.h;h=af4bd65b594beb85c53bf76905e47698fb577f07;hp=157282a5398f6a18a23f0f80684a9765a16e7a3e;hb=42c1534d95e1551c37e64a1dae288e8b75e8d8ba;hpb=f632bf388a58b036e265f3789c797beff5ab063a

diff --git a/source/renderer.h b/source/renderer.h
index 157282a5..af4bd65b 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -64,6 +64,7 @@ public:
 private:
 	struct State
 	{
+		const Camera *camera;
 		Matrix modelview_matrix;
 		const Texture *texture;
 		const Texturing *texturing;
@@ -91,13 +92,12 @@ private:
 		LEGACY_CLIPPING = 8,
 		SHADER_DATA = 16,
 		MATERIAL_SHDATA = 32,
-		STANDARD_SHDATA = 64
+		STANDARD_SHDATA = 64,
+		LEGACY_PROJECTION = 128
 	};
 
 	unsigned char changed;
 	bool matrices_loaded;
-	unsigned shdata_applied;
-	const Camera *camera;
 	std::vector<State> state_stack;
 	State *state;
 	ProgramData standard_shdata;
@@ -110,9 +110,17 @@ 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 *);
 
+	/** 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 &);
 
@@ -122,8 +130,6 @@ public:
 	/** Returns the current modelview matrix. */
 	const Matrix &get_matrix() const { return state->modelview_matrix; }
 
-	const Camera *get_camera() const { return camera; }
-
 	void set_texture(const Texture *);
 	void set_texturing(const Texturing *);
 	unsigned allocate_effect_texunit();
@@ -152,14 +158,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 &);
@@ -170,7 +171,6 @@ public:
 
 private:
 	void apply_state();
-	void reset_state();
 };
 
 } // namespace GL