Mercurial > fife-parpg
diff engine/core/view/renderers/blockinginforenderer.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 | 9d94f4676d17 |
children | b2feacaed53c |
line wrap: on
line diff
--- a/engine/core/view/renderers/blockinginforenderer.cpp Wed Apr 28 21:33:11 2010 +0000 +++ b/engine/core/view/renderers/blockinginforenderer.cpp Thu Apr 29 13:51:45 2010 +0000 @@ -58,7 +58,7 @@ BlockingInfoRenderer::~BlockingInfoRenderer() { } - void BlockingInfoRenderer::render(Camera* cam, Layer* layer, std::vector<Instance*>& instances) { + void BlockingInfoRenderer::render(Camera* cam, Layer* layer, RenderList& instances) { CellGrid* cg = layer->getCellGrid(); if (!cg) { FL_WARN(_log, "No cellgrid assigned to layer, cannot draw grid"); @@ -66,9 +66,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; if (!instance->getObject()->isBlocking()) { continue; }