libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TITANIC: Simplify cursors to build up as RGBA during loading

Browse Source
This commit is contained in:
Paul Gilbert 2017-08-10 19:23:42 -04:00 committed by Colin Snover
parent ef44cc55ee
commit db5676fec2
2 changed files with 38 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
engines/titanic/support/mouse_cursor.cpp
View File

@ -54,8 +54,7 @@ static const int CURSOR_DATA[NUM_CURSORS][4] = {
}; };
CMouseCursor::CursorEntry::~CursorEntry() { CMouseCursor::CursorEntry::~CursorEntry() {
delete _videoSurface; delete _surface;
delete _transSurface;
} }
CMouseCursor::CMouseCursor(CScreenManager *screenManager) : CMouseCursor::CMouseCursor(CScreenManager *screenManager) :
@ -80,15 +79,32 @@ void CMouseCursor::loadCursorImages() {
// Create the surface // Create the surface
CVideoSurface *surface = _screenManager->createSurface(CURSOR_SIZE, CURSOR_SIZE); CVideoSurface *surface = _screenManager->createSurface(CURSOR_SIZE, CURSOR_SIZE);
_cursors[idx]._videoSurface = surface;
// Open the cursors video and move to the given frame // Open the cursors video and move to the given frame
OSMovie movie(key, surface); OSMovie movie(key, surface);
movie.setFrame(idx); movie.setFrame(idx);
Graphics::ManagedSurface *transSurface = movie.duplicateTransparency(); Graphics::ManagedSurface *transSurface = movie.duplicateTransparency();
_cursors[idx]._transSurface = transSurface;
surface->setTransparencySurface(transSurface); // Create a managed surface to hold the RGBA version of the cursor
Graphics::PixelFormat rgbaFormat(4, 8, 8, 8, 8, 24, 16, 8, 0);
_cursors[idx]._surface = new Graphics::ManagedSurface(CURSOR_SIZE, CURSOR_SIZE, rgbaFormat);
// Copy the cursor from the movie's video surface
surface->lock();
_cursors[idx]._surface->blitFrom(*surface->getRawSurface());
surface->unlock();
// We need to separately merge in the transparency surface
for (int y = 0; y < CURSOR_SIZE; ++y) {
const byte *srcP = (const byte *)transSurface->getBasePtr(0, y);
uint32 *destP = (uint32 *)_cursors[idx]._surface->getBasePtr(0, y);
for (int x = 0; x < CURSOR_SIZE; ++x, ++srcP, ++destP)
*destP = (*destP & ~0xff) | *srcP;
}
delete transSurface;
delete surface;
} }
} }
@ -131,35 +147,22 @@ void CMouseCursor::setCursor(CursorId cursorId) {
++_setCursorCount; ++_setCursorCount;
if (cursorId != _cursorId && _busyCount == 0) { if (cursorId != _cursorId && _busyCount == 0) {
// The original cursors supported partial alpha when rendering the cursor. const CursorEntry &ce = _cursors[cursorId - 1];
// Since we're using the ScummVM CursorMan, we can't do that, so we need _cursorId = cursorId;
// to build up a surface of the cursor with even partially transparent
// pixels as wholy transparent
CursorEntry &ce = _cursors[cursorId - 1];
CVideoSurface &srcSurface = *ce._videoSurface;
srcSurface.lock();
Graphics::ManagedSurface surface(CURSOR_SIZE, CURSOR_SIZE, g_system->getScreenFormat());
const uint16 *srcP = srcSurface.getPixels();
CTransparencySurface transSurface(&ce._transSurface->rawSurface(), TRANS_ALPHA0);
uint16 *destP = (uint16 *)surface.getPixels();
for (int y = 0; y < CURSOR_SIZE; ++y) {
transSurface.setRow(y);
transSurface.setCol(0);
for (int x = 0; x < CURSOR_SIZE; ++x, ++srcP, ++destP) {
*destP = transSurface.isPixelTransparent() ? srcSurface.getTransparencyColor() : *srcP;
transSurface.moveX();
}
}
srcSurface.unlock();
// Set the cursor // Set the cursor
_cursorId = cursorId; #ifdef RGBA_CURSORS
CursorMan.replaceCursor(surface.getPixels(), CURSOR_SIZE, CURSOR_SIZE, CursorMan.replaceCursor(ce._surface->getPixels(), CURSOR_SIZE, CURSOR_SIZE,
ce._centroid.x, ce._centroid.y, srcSurface.getTransparencyColor(), false, &g_vm->_screen->format); ce._centroid.x, ce._centroid.y, 0, false, &ce._surface->format);
#else
const Graphics::Surface &surf = *ce._surface;
Graphics::Surface *s = surf.convertTo(g_system->getScreenFormat());
CursorMan.replaceCursor(s->getPixels(), CURSOR_SIZE, CURSOR_SIZE,
ce._centroid.x, ce._centroid.y, 0, false, &s->format);
delete s;
#endif
} }
} }

5
engines/titanic/support/mouse_cursor.h
View File

@ -54,11 +54,10 @@ class CVideoSurface;
class CMouseCursor { class CMouseCursor {
struct CursorEntry { struct CursorEntry {
CVideoSurface *_videoSurface; Graphics::ManagedSurface *_surface;
Graphics::ManagedSurface *_transSurface;
Common::Point _centroid; Common::Point _centroid;
CursorEntry() : _videoSurface(nullptr), _transSurface(nullptr) {} CursorEntry() : _surface(nullptr) {}
~CursorEntry(); ~CursorEntry();
}; };
private: private: