Fixed inverted camera, and added RegionPager::Prune()

This commit is contained in:
Kayne Ruse
2013-10-17 22:18:42 +11:00
parent 88aee0f4f5
commit 0bfd916df4
3 changed files with 30 additions and 18 deletions
+21 -5
View File
@@ -90,8 +90,8 @@ void RegionPager::DrawTo(SDL_Surface* const dest, std::list<TileSheet>* const sh
for (auto& regionIter : regionList) {
//draw the region's location
SDL_Rect box = {
Sint16(regionIter.GetX() + camX),
Sint16(regionIter.GetY() + camY),
Sint16(regionIter.GetX() - camX),
Sint16(regionIter.GetY() - camY),
Uint16(regionIter.GetWidth()),
Uint16(regionIter.GetHeight())
};
@@ -103,8 +103,8 @@ void RegionPager::DrawTo(SDL_Surface* const dest, std::list<TileSheet>* const sh
if (sheetIter.InRange(tileIter.tileIndex)) {
sheetIter.DrawTo(
dest,
tileIter.x + regionIter.GetX() + camX,
tileIter.y + regionIter.GetY() + camY,
tileIter.x + regionIter.GetX() - camX,
tileIter.y + regionIter.GetY() - camY,
tileIter.tileIndex
);
//skip to the next tile
@@ -119,4 +119,20 @@ void RegionPager::DrawTo(SDL_Surface* const dest, std::list<TileSheet>* const sh
//continue with the next tile
}
}
}
}
void RegionPager::Prune(int left, int top, int right, int bottom) {
std::list<Region>::iterator it = regionList.begin();
while(it != regionList.end()) {
if (it->GetX() >= right || it->GetY() >= bottom || it->GetX() + it->GetWidth() < left || it->GetY() + it->GetHeight() < top) {
if (onDelete) {
onDelete(&(*it));
}
regionList.erase(it);
it = regionList.begin();
continue;
}
it++;
}
}
+2 -2
View File
@@ -47,8 +47,8 @@ public:
void SetOnNew(regionCallback_t f) { onNew = f; }
void SetOnDelete(regionCallback_t f) { onDelete = f; }
//TODO
//void Prune(int camX, int camY, int screenW, int screenH);
//params: Absolute values
void Prune(int left, int top, int right, int bottom);
//accessors and mutators
int SetWidth(int i) { return regionWidth = i; }