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

diff --git a/source/renderer.h b/source/renderer.h
index 79557eab..dbb2d490 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;
 
 /**
@@ -77,6 +78,7 @@ private:
 		const Program *shprog;
 		unsigned shdata_count;
 		const Mesh *mesh;
+		const VertexSetup *vertex_setup;
 		const WindingTest *winding_test;
 		bool reverse_winding;
 
@@ -96,9 +98,9 @@ private:
 		LEGACY_PROJECTION = 128
 	};
 
+	const Camera *default_camera;
 	unsigned char changed;
 	bool matrices_loaded;
-	unsigned shdata_applied;
 	std::vector<State> state_stack;
 	State *state;
 	ProgramData standard_shdata;
@@ -149,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);
 
@@ -169,6 +172,7 @@ public:
 
 	void render(const Renderable &, const Tag & = Tag());
 	void draw(const Batch &);
+	void draw_instanced(const Batch &, unsigned);
 
 private:
 	void apply_state();