diff engine/core/view/renderers/gridrenderer.cpp @ 482:16c2b3ee59ce

* 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 90005975cdbb
children b2feacaed53c
line wrap: on
line diff
--- a/engine/core/view/renderers/gridrenderer.cpp	Wed Apr 28 21:33:11 2010 +0000
+++ b/engine/core/view/renderers/gridrenderer.cpp	Thu Apr 29 13:51:45 2010 +0000
@@ -59,7 +59,7 @@
 	GridRenderer::~GridRenderer() {
 	}
 
-	void GridRenderer::render(Camera* cam, Layer* layer, std::vector<Instance*>& instances) {
+	void GridRenderer::render(Camera* cam, Layer* layer, RenderList& instances) {
 		CellGrid* cg = layer->getCellGrid();
 		if (!cg) {
 			FL_WARN(_log, "No cellgrid assigned to layer, cannot draw grid");
@@ -134,9 +134,9 @@
 
 
 		Rect cv = cam->getViewPort();
-		std::vector<Instance*>::const_iterator instance_it = instances.begin();
+		RenderList::const_iterator instance_it = instances.begin();
 		for (;instance_it != instances.end(); ++instance_it) {
-			Instance* instance = *instance_it;
+			Instance* instance = (*instance_it)->instance;
 			std::vector<ExactModelCoordinate> vertices;
 			cg->getVertices(vertices, instance->getLocationRef().getLayerCoordinates());
 			std::vector<ExactModelCoordinate>::const_iterator it = vertices.begin();