X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Frenderer.h;h=a1217c77833216266e51a014c4984e0f4a056a59;hb=56133280d92c08c1c649a725260a6c4d5afb5e75;hp=79557eab20b5e368c65be3b50d021cbb124d32a6;hpb=d4c9b1ef7ba7a60874ffa7ab2ac4b427a83910e5;p=libs%2Fgl.git

diff --git a/source/renderer.h b/source/renderer.h
index 79557eab..a1217c77 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;
 
 /**
@@ -76,29 +77,24 @@ private:
 		Matrix clipping_matrix;
 		const Program *shprog;
 		unsigned shdata_count;
-		const Mesh *mesh;
+		const VertexSetup *vertex_setup;
 		const WindingTest *winding_test;
 		bool reverse_winding;
+		unsigned object_lod_bias;
 
 		State();
 	};
 
 	enum ChangeMask
 	{
-		LEGACY_MATRIX = 1,
-		MODERN_MATRIX = 2,
-		MATRIX = LEGACY_MATRIX|MODERN_MATRIX,
-		LEGACY_LIGHTING = 4,
-		LEGACY_CLIPPING = 8,
+		MATRIX = 2,
 		SHADER_DATA = 16,
 		MATERIAL_SHDATA = 32,
-		STANDARD_SHDATA = 64,
-		LEGACY_PROJECTION = 128
+		STANDARD_SHDATA = 64
 	};
 
+	const Camera *default_camera;
 	unsigned char changed;
-	bool matrices_loaded;
-	unsigned shdata_applied;
 	std::vector<State> state_stack;
 	State *state;
 	ProgramData standard_shdata;
@@ -106,16 +102,13 @@ private:
 	std::set<const Renderable *> excluded;
 
 public:
-	Renderer(const Camera *);
+	Renderer();
+	DEPRECATED Renderer(const Camera *);
+private:
+	void init();
+public:
 	~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().
-
-	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 &);
@@ -148,10 +141,15 @@ public:
 	Renderer state is popped. */
 	void add_shader_data(const ProgramData &data);
 
-	void set_mesh(const Mesh *);
+	void flush_shader_data();
+
+	void set_vertex_setup(const VertexSetup *);
 	void set_winding_test(const WindingTest *);
 	void set_reverse_winding(bool);
 
+	void set_object_lod_bias(unsigned);
+	unsigned get_object_lod_bias() const { return state->object_lod_bias; }
+
 	/** Saves the current state so it can be restored later. */
 	void push_state();
 
@@ -169,6 +167,7 @@ public:
 
 	void render(const Renderable &, const Tag & = Tag());
 	void draw(const Batch &);
+	void draw_instanced(const Batch &, unsigned);
 
 private:
 	void apply_state();