summaryrefslogtreecommitdiff
path: root/src/resources/map
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-06-14 02:17:38 +0300
committerAndrei Karas <akaras@inbox.ru>2014-06-14 11:41:50 +0300
commiteecd33fff488d54d038d84d8676000fad826e940 (patch)
tree9eb6c12810579d52c8df16e43d294852ba5613bb /src/resources/map
parent4b8a6d93c5a785c673ec6c9f8a09880c48dee065 (diff)
downloadplus-eecd33fff488d54d038d84d8676000fad826e940.tar.gz
plus-eecd33fff488d54d038d84d8676000fad826e940.tar.bz2
plus-eecd33fff488d54d038d84d8676000fad826e940.tar.xz
plus-eecd33fff488d54d038d84d8676000fad826e940.zip
fix modernoepngl drawing.
Add simple draw test in most renders.
Diffstat (limited to 'src/resources/map')
-rw-r--r--src/resources/map/maplayer.cpp15
1 files changed, 13 insertions, 2 deletions
diff --git a/src/resources/map/maplayer.cpp b/src/resources/map/maplayer.cpp
index c1f1f2d7a..746d547fd 100644
--- a/src/resources/map/maplayer.cpp
+++ b/src/resources/map/maplayer.cpp
@@ -276,10 +276,12 @@ void MapLayer::updateOGL(Graphics *const graphics,
&& debugFlags != MapType::SPECIAL2);
MapRowVertexes *const row = new MapRowVertexes();
+ logger->log("mTempRows size: %u", (int)mTempRows.size());
mTempRows.push_back(row);
Image *lastImage = nullptr;
ImageVertexes *imgVert = nullptr;
- std::map<int, ImageVertexes*> imgSet;
+ typedef std::map<int, ImageVertexes*> ImageVertexesMap;
+ ImageVertexesMap imgSet;
for (int y = startY; y < endY; y++)
{
@@ -323,7 +325,16 @@ void MapLayer::updateOGL(Graphics *const graphics,
}
}
}
- graphics->finalize(imgVert);
+ FOR_EACH (MapRowImages::iterator, it, row->images)
+ {
+ graphics->finalize(*it);
+ }
+/*
+ FOR_EACH (ImageVertexesMap::iterator, it, imgSet)
+ {
+ graphics->finalize((*it).second);
+ }
+*/
BLOCK_END("MapLayer::updateOGL")
}