libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-14 16:07:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

HYPNO: Replace use of Graphics::ManagedSurface with Graphics::Surface

Browse Source
This commit is contained in:
Cameron Cawley 2022-06-03 17:26:44 +01:00 committed by neuromancer
parent df5e4c5c0a
commit ecc726ff8a
2 changed files with 28 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
engines/hypno/hypno.cpp
View File

@ -136,7 +136,7 @@ Common::Error HypnoEngine::run() {
_pixelFormat = Graphics::PixelFormat::createFormatCLUT8();
initGraphics(_screenW, _screenH, &_pixelFormat);
_compositeSurface = new Graphics::ManagedSurface();
_compositeSurface = new Graphics::Surface();
_compositeSurface->create(_screenW, _screenH, _pixelFormat);
// Main event loop
@ -318,10 +318,16 @@ void HypnoEngine::loadImage(const Common::String &name, int x, int y, bool trans
}
void HypnoEngine::drawImage(Graphics::Surface &surf, int x, int y, bool transparent) {
Common::Rect srcRect(surf.w, surf.h);
Common::Rect dstRect = srcRect;
dstRect.moveTo(x, y);
_compositeSurface->clip(srcRect, dstRect);
if (transparent) {
_compositeSurface->transBlitFrom(surf, Common::Point(x, y), _transparentColor);
_compositeSurface->copyRectToSurfaceWithKey(surf, dstRect.left, dstRect.top, srcRect, _transparentColor);
} else
_compositeSurface->blitFrom(surf, Common::Point(x, y));
_compositeSurface->copyRectToSurface(surf, dstRect.left, dstRect.top, srcRect);
}
Graphics::Surface *HypnoEngine::decodeFrame(const Common::String &name, int n, byte **palette) {
@ -390,11 +396,8 @@ void HypnoEngine::changeScreenMode(const Common::String &mode) {
_compositeSurface->free();
delete _compositeSurface;
_compositeSurface = new Graphics::ManagedSurface();
_compositeSurface = new Graphics::Surface();
_compositeSurface->create(_screenW, _screenH, _pixelFormat);
_compositeSurface->setTransparentColor(_transparentColor);
} else if (mode == "320x200") {
if (_screenW == 320 && _screenH == 200)
return;
@ -407,10 +410,8 @@ void HypnoEngine::changeScreenMode(const Common::String &mode) {
_compositeSurface->free();
delete _compositeSurface;
_compositeSurface = new Graphics::ManagedSurface();
_compositeSurface = new Graphics::Surface();
_compositeSurface->create(_screenW, _screenH, _pixelFormat);
_compositeSurface->setTransparentColor(_transparentColor);
} else
error("Unknown screen mode %s", mode.c_str());
}
@ -462,20 +463,31 @@ void HypnoEngine::updateScreen(MVideo &video) {
if (video.scaled) {
Graphics::Surface *sframe = frame->scale(_screenW, _screenH);
Common::Rect srcRect(sframe->w, sframe->h);
Common::Rect dstRect = srcRect;
dstRect.moveTo(video.position);
_compositeSurface->clip(srcRect, dstRect);
if (video.transparent) {
_compositeSurface->transBlitFrom(*sframe, video.position, _transparentColor);
_compositeSurface->copyRectToSurfaceWithKey(*sframe, dstRect.left, dstRect.top, srcRect, _transparentColor);
} else {
_compositeSurface->blitFrom(*sframe, video.position);
_compositeSurface->copyRectToSurface(*sframe, dstRect.left, dstRect.top, srcRect);
}
sframe->free();
delete sframe;
} else {
Common::Rect srcRect(frame->w, frame->h);
Common::Rect dstRect = srcRect;
dstRect.moveTo(video.position);
_compositeSurface->clip(srcRect, dstRect);
if (video.transparent) {
_compositeSurface->transBlitFrom(*frame, video.position, _transparentColor);
_compositeSurface->copyRectToSurfaceWithKey(*frame, dstRect.left, dstRect.top, srcRect, _transparentColor);
} else {
_compositeSurface->blitFrom(*frame, video.position);
_compositeSurface->copyRectToSurface(*frame, dstRect.left, dstRect.top, srcRect);
}
}
}

8
engines/hypno/hypno.h
View File

@ -31,7 +31,7 @@
#include "engines/engine.h"
#include "graphics/font.h"
#include "graphics/fontman.h"
#include "graphics/managed_surface.h"
#include "graphics/surface.h"
#include "graphics/palette.h"
#include "hypno/grammar.h"
@ -41,10 +41,6 @@ namespace Image {
class ImageDecoder;
}
namespace Graphics {
class ManagedSurface;
}
struct ADGameDescription;
namespace Hypno {
@ -202,7 +198,7 @@ public:
int _screenW, _screenH;
Graphics::PixelFormat _pixelFormat;
void changeScreenMode(const Common::String &mode);
Graphics::ManagedSurface *_compositeSurface;
Graphics::Surface *_compositeSurface;
uint32 _transparentColor;
Common::Rect screenRect;
void updateScreen(MVideo &video);