libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-30 07:23:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed clipping issues that were still occurring in some rooms

Browse Source 
svn-id: r29500
This commit is contained in:
Paul Gilbert 2007-11-14 11:46:55 +00:00
parent fdafe925e9
commit 2a24ecaf9b
2 changed files with 52 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
engines/lure/room.cpp
View File

@ -39,9 +39,10 @@ RoomLayer::RoomLayer(uint16 screenId, bool backgroundLayer):
loadScreen(screenId);
byte *screenData = data().data();
int cellY;
int cellIndex = 0;
// Reset all the cells to unused
Common::set_to((bool *) _cells, (bool *) _cells + GRID_SIZE, false);
Common::set_to((uint8 *) _cells, (uint8 *) _cells + GRID_SIZE, 0xff);
// Loop through each cell of the screen
for (cellY = 0; cellY < NUM_VERT_RECTS; ++cellY) {
@ -64,7 +65,8 @@ RoomLayer::RoomLayer(uint16 screenId, bool backgroundLayer):
}
}
_cells[cellY + NUM_EDGE_RECTS][cellX + NUM_EDGE_RECTS] = hasPixels;
_cells[cellY + NUM_EDGE_RECTS][cellX + NUM_EDGE_RECTS] =
hasPixels ? cellIndex++ : 0xff;
}
}
}
@ -302,7 +304,7 @@ void Room::addLayers(Hotspot &h) {
int layerNum = 1;
while ((layerNum < 4) && (_layers[layerNum] != NULL) &&
!_layers[layerNum]->isOccupied(xStart, yEnd))
(_layers[layerNum]->getCell(xStart, yEnd) == 0xff))
++layerNum;
if ((layerNum == 4) || (_layers[layerNum] == NULL)) continue;
@ -318,7 +320,7 @@ void Room::addCell(int16 xp, int16 yp, int layerNum) {
Surface &s = _screen.screen();
while ((layerNum < 4) && (_layers[layerNum] != NULL) &&
!_layers[layerNum]->isOccupied(xp + NUM_EDGE_RECTS, yp + NUM_EDGE_RECTS))
(_layers[layerNum]->getCell(xp + NUM_EDGE_RECTS, yp + NUM_EDGE_RECTS) >= 0xfe))
++layerNum;
if ((layerNum == 4) || (_layers[layerNum] == NULL)) return;
@ -370,6 +372,43 @@ void Room::blockMerge() {
}
}
void Room::layersPostProcess() {
for (int layerNum = 1; layerNum < 4; ++layerNum) {
if (_layers[layerNum] == NULL)
continue;
// Layer optimisation
for (int xp = NUM_EDGE_RECTS; xp < NUM_HORIZ_RECTS + NUM_EDGE_RECTS; ++xp) {
bool priorFlag = false, nextFlag = false;
for (int yp = NUM_EDGE_RECTS; yp < NUM_VERT_RECTS + NUM_EDGE_RECTS; ++yp) {
if (_layers[layerNum]->getCell(xp, yp) == 0xff) {
priorFlag = false;
nextFlag = false;
continue;
}
if (priorFlag && (_layers[layerNum]->getCell(xp - 1, yp) == 0xff))
_layers[layerNum]->setCell(xp - 1, yp, 0xfe);
if (nextFlag && (_layers[layerNum]->getCell(xp + 1, yp) == 0xff))
_layers[layerNum]->setCell(xp + 1, yp, 0xfe);
priorFlag = _layers[layerNum]->getCell(xp - 1, yp) != 0xff;
nextFlag = _layers[layerNum]->getCell(xp + 1, yp) != 0xff;
}
}
// Layer extension of final row to off-screen edge rows below
for (int xp = NUM_EDGE_RECTS + NUM_HORIZ_RECTS - 1; xp >= NUM_EDGE_RECTS; --xp) {
if (_layers[layerNum]->getCell(xp, NUM_EDGE_RECTS + NUM_VERT_RECTS - 1) != 0xff) {
for (int yp = NUM_VERT_RECTS + NUM_EDGE_RECTS; yp < FULL_VERT_RECTS; ++yp)
_layers[layerNum]->setCell(xp, yp, 0xfe);
}
}
}
}
void Room::update() {
Surface &s = _screen.screen();
Resources &res = Resources::getReference();
@ -519,6 +558,7 @@ void Room::setRoomNumber(uint16 newRoomNumber, bool showOverlay) {
layerNum == 0);
blockMerge();
layersPostProcess();
// Generate the palette for the room that will be faded in
//Palette p(MAIN_PALETTE_SIZE, NULL, RGB64);

9
engines/lure/room.h
View File

@ -47,12 +47,18 @@ namespace Lure {
class RoomLayer: public Surface {
private:
bool _cells[FULL_VERT_RECTS][FULL_HORIZ_RECTS];
byte _cells[FULL_VERT_RECTS][FULL_HORIZ_RECTS];
public:
RoomLayer(uint16 screenId, bool backgroundLayer);
bool isOccupied(byte cellX, byte cellY) {
return _cells[cellY][cellX] < 0xfe;
}
uint8 getCell(byte cellX, byte cellY) {
return _cells[cellY][cellX];
}
void setCell(byte cellX, byte cellY, byte value) {
_cells[cellY][cellX] = value;
}
};
enum CursorState {CS_NONE, CS_ACTION, CS_SEQUENCE, CS_TALKING, CS_BUMPED};
@ -84,6 +90,7 @@ private:
void addLayers(Hotspot &h);
void addCell(int16 xp, int16 yp, int layerNum);
void blockMerge();
void layersPostProcess();
public:
RoomPathsDecompressedData tempLayer;
Room();