Mercurial > fife-parpg

diff engine/core/view/renderers/genericrenderer.h @ 482:16c2b3ee59ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Merged the view performance branch back into trunk. fixes[ticket:419]
author helios2000@33b003aa-7bff-0310-803a-e67f0ece8222
date Thu, 29 Apr 2010 13:51:45 +0000
parents f855809822cf
children 47b49b9b0c0a
line wrap: on
line diff
--- a/engine/core/view/renderers/genericrenderer.h	Wed Apr 28 21:33:11 2010 +0000
+++ b/engine/core/view/renderers/genericrenderer.h	Thu Apr 29 13:51:45 2010 +0000
@@ -76,7 +76,7 @@
 		Layer* getLayer();
 		Point getPoint();
 
-		Point getCalculatedPoint(Camera* cam, Layer* layer, std::vector<Instance*>& instances);
+		Point getCalculatedPoint(Camera* cam, Layer* layer);
 	private:
 		Instance* m_instance;
 		Location* m_location;
@@ -85,13 +85,13 @@
 	};
 	class GenericRendererElementInfo {
 	public:
-		virtual void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool) {};
+		virtual void render(Camera* cam, Layer* layer, RenderList& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool) {};
 		virtual ~GenericRendererElementInfo() {};
 	};
 
 	class GenericRendererLineInfo : public GenericRendererElementInfo {
 	public:
-		void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
+		void render(Camera* cam, Layer* layer, RenderList& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
 		GenericRendererLineInfo(GenericRendererNode n1, GenericRendererNode n2, uint8_t r, uint8_t g, uint8_t b);
 		virtual ~GenericRendererLineInfo() {};
 	private:
@@ -103,7 +103,7 @@
 	};
 	class GenericRendererPointInfo : public GenericRendererElementInfo {
 	public:
-		void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
+		void render(Camera* cam, Layer* layer, RenderList& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
 		GenericRendererPointInfo(GenericRendererNode n, uint8_t r, uint8_t g, uint8_t b);
 		virtual ~GenericRendererPointInfo() {};
 	private:
@@ -114,7 +114,7 @@
 	};
 	class GenericRendererQuadInfo : public GenericRendererElementInfo {
 	public:
-		void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
+		void render(Camera* cam, Layer* layer, RenderList& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
 		GenericRendererQuadInfo(GenericRendererNode n1, GenericRendererNode n2, GenericRendererNode n3, GenericRendererNode n4, uint8_t r, uint8_t g, uint8_t b);
 		virtual ~GenericRendererQuadInfo() {};
 	private:
@@ -129,7 +129,7 @@
 
 	class GenericRendererVertexInfo : public GenericRendererElementInfo {
 	public:
-		void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
+		void render(Camera* cam, Layer* layer, RenderList& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
 		GenericRendererVertexInfo(GenericRendererNode center, int size, uint8_t r, uint8_t g, uint8_t b);
 		virtual ~GenericRendererVertexInfo() {};
 	private:
@@ -142,7 +142,7 @@
 
 	class GenericRendererImageInfo : public GenericRendererElementInfo {
 	public:
-		void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
+		void render(Camera* cam, Layer* layer, RenderList& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
 		GenericRendererImageInfo(GenericRendererNode n, int image);
 		virtual ~GenericRendererImageInfo() {};
 	private:
@@ -151,7 +151,7 @@
 	};
 	class GenericRendererAnimationInfo : public GenericRendererElementInfo {
 	public:
-		void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
+		void render(Camera* cam, Layer* layer, RenderList& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
 		GenericRendererAnimationInfo(GenericRendererNode n, int animation);
 		virtual ~GenericRendererAnimationInfo() {};
 	private:
@@ -162,7 +162,7 @@
 	};
 	class GenericRendererTextInfo : public GenericRendererElementInfo {
 	public:
-		void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
+		void render(Camera* cam, Layer* layer, RenderList& instances, RenderBackend* renderbackend, ImagePool* imagepool, AnimationPool* animpool);
 		GenericRendererTextInfo(GenericRendererNode n, AbstractFont* font, std::string text);
 		virtual ~GenericRendererTextInfo() {};
 	private:
@@ -185,7 +185,7 @@
 		/** Destructor.
 		 */
 		virtual ~GenericRenderer();
-		void render(Camera* cam, Layer* layer, std::vector<Instance*>& instances);
+		void render(Camera* cam, Layer* layer, RenderList& instances);
 		std::string getName() { return "GenericRenderer"; }
 
 		/** Gets instance for interface access