X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Frenderer.h;h=af4bd65b594beb85c53bf76905e47698fb577f07;hp=1f4624ce889476370c25fef2e0077db723c8ded1;hb=e598e9d8dacad73b7ee1688e2be738e94b07b9fa;hpb=bfc7f104c642590fd85577a6545c6bc6259ccaa4

diff --git a/source/renderer.h b/source/renderer.h
index 1f4624ce..af4bd65b 100644
--- a/source/renderer.h
+++ b/source/renderer.h
@@ -98,7 +98,6 @@ private:
 
 	unsigned char changed;
 	bool matrices_loaded;
-	unsigned shdata_applied;
 	std::vector<State> state_stack;
 	State *state;
 	ProgramData standard_shdata;
@@ -111,7 +110,9 @@ 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
@@ -157,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 &);
@@ -175,7 +171,6 @@ public:
 
 private:
 	void apply_state();
-	void reset_state();
 };
 
 } // namespace GL