gesche
/
tibia-client
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

change comments

This commit is contained in:
Eduardo Bart 2011-09-01 21:00:29 -03:00
parent bc19e5e783
commit 9ca98dd00e
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/otclient/core/map.cpp
View File

@ -57,12 +57,16 @@ void Map::draw(const Rect& rect)
Position tilePos(m_centralPosition.x + (ix - PLAYER_OFFSET_X), m_centralPosition.y + (iy - PLAYER_OFFSET_Y), m_centralPosition.z); Position tilePos(m_centralPosition.x + (ix - PLAYER_OFFSET_X), m_centralPosition.y + (iy - PLAYER_OFFSET_Y), m_centralPosition.z);
// adjust tilePos to the wanted floor // adjust tilePos to the wanted floor
tilePos.perspectiveUp(m_centralPosition.z - iz); tilePos.perspectiveUp(m_centralPosition.z - iz);
// TODO: skip tiles that are behind another tile //TODO: cache visible tiles, m_tiles[] has a high cost (50% fps decrease)
if(const TilePtr& tile = m_tiles[tilePos]) if(const TilePtr& tile = m_tiles[tilePos]) {
// skip tiles that are behind another tile
//if(isCompletlyCovered(tilePos, firstFloor))
// continue;
tile->draw(tilePos.to2D(m_centralPosition) - Point(walkOffsetX, walkOffsetY)); tile->draw(tilePos.to2D(m_centralPosition) - Point(walkOffsetX, walkOffsetY));
} }
} }
} }
}
m_framebuffer->unbind(); m_framebuffer->unbind();
@ -74,7 +78,7 @@ void Map::draw(const Rect& rect)
float verticalStretchFactor = rect.height() / (float)(MAP_VISIBLE_HEIGHT * NUM_TILE_PIXELS); float verticalStretchFactor = rect.height() / (float)(MAP_VISIBLE_HEIGHT * NUM_TILE_PIXELS);
// draw player names and health bars // draw player names and health bars
//TODO: this could be cached to improve framerate //TODO: this must be cached with creature walks
for(int x = 0; x < MAP_VISIBLE_WIDTH; ++x) { for(int x = 0; x < MAP_VISIBLE_WIDTH; ++x) {
for(int y = 0; y < MAP_VISIBLE_HEIGHT; ++y) { for(int y = 0; y < MAP_VISIBLE_HEIGHT; ++y) {
Position tilePos = Position(m_centralPosition.x + (x - PLAYER_OFFSET_X + 1), m_centralPosition.y + (y - PLAYER_OFFSET_Y + 1), m_centralPosition.z); Position tilePos = Position(m_centralPosition.x + (x - PLAYER_OFFSET_X + 1), m_centralPosition.y + (y - PLAYER_OFFSET_Y + 1), m_centralPosition.z);
@ -152,11 +156,11 @@ bool Map::isLookPossible(const Position& pos)
return true; return true;
} }
bool Map::isCovered(const Position& pos, int maxFloor) bool Map::isCovered(const Position& pos, int firstFloor)
{ {
Position tilePos = pos; Position tilePos = pos;
tilePos.perspectiveUp(); tilePos.perspectiveUp();
while(tilePos.z >= maxFloor) { while(tilePos.z >= firstFloor) {
TilePtr tile = m_tiles[tilePos]; TilePtr tile = m_tiles[tilePos];
if(tile && tile->isFullGround()) if(tile && tile->isFullGround())
return true; return true;
@ -165,11 +169,11 @@ bool Map::isCovered(const Position& pos, int maxFloor)
return false; return false;
} }
bool Map::isCompletlyCovered(const Position& pos, int maxFloor) bool Map::isCompletlyCovered(const Position& pos, int firstFloor)
{ {
Position tilePos = pos; Position tilePos = pos;
tilePos.perspectiveUp(); tilePos.perspectiveUp();
while(tilePos.z >= maxFloor) { while(tilePos.z >= firstFloor) {
bool covered = true; bool covered = true;
for(int x=0;x<2;++x) { for(int x=0;x<2;++x) {
for(int y=0;y<2;++y) { for(int y=0;y<2;++y) {

4
src/otclient/core/map.h
View File

@ -46,8 +46,8 @@ public:
int getFirstVisibleFloor(); int getFirstVisibleFloor();
bool isLookPossible(const Position& pos); bool isLookPossible(const Position& pos);
bool isCovered(const Position& pos, int maxFloor); bool isCovered(const Position& pos, int firstFloor = 0);
bool isCompletlyCovered(const Position& pos, int maxFloor); bool isCompletlyCovered(const Position& pos, int firstFloor = 0);
void addThing(const ThingPtr& thing, const Position& pos, int stackPos = -1); void addThing(const ThingPtr& thing, const Position& pos, int stackPos = -1);
ThingPtr getThing(const Position& pos, int stackPos); ThingPtr getThing(const Position& pos, int stackPos);