libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-10 11:51:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

PRIVATE: optimize screen drawing

Browse Source
This commit is contained in:
neuromancer 2021-02-15 13:49:55 -03:00 committed by Eugene Sandulenko
parent 96a1f8efe5
commit b7e55e5c6f
2 changed files with 16 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
engines/private/private.cpp
View File

@ -83,7 +83,7 @@ PrivateEngine::PrivateEngine(OSystem *syst, const ADGameDescription *gd)
_loadGameMask = NULL;
// Interface
_frame = new Common::String("inface/general/inface2.bmp");
_framePath = new Common::String("inface/general/inface2.bmp");
// Police
_policeBustEnabled = false;
@ -176,6 +176,12 @@ Common::Error PrivateEngine::run() {
_compositeSurface->create(_screenW, _screenH, _pixelFormat);
_compositeSurface->setTransparentColor(_transparentColor);
// Load the game frame once
Common::File frameFile;
assert(frameFile.open(convertPath(*_framePath)));
_image->loadStream(frameFile);
_frame = _image->getSurface()->convertTo(_pixelFormat, _image->getPalette());
// Debugger console
Console *console = new Console(this);
setDebugger(console);
@ -278,6 +284,7 @@ Common::Error PrivateEngine::run() {
_nextSetting = NULL;
execute(prog);
changeCursor("default");
drawScreen();
}
g_system->updateScreen();
@ -907,19 +914,11 @@ void PrivateEngine::loadImage(const Common::String &name, int x, int y) {
surf->free();
delete surf;
_image->destroy();
drawScreen();
//drawScreen();
}
void PrivateEngine::drawScreenFrame(Graphics::Surface *surf) {
Common::String path = convertPath(*_frame);
Common::File file;
assert(file.open(path));
_image->loadStream(file);
Graphics::Surface *csurf = _image->getSurface()->convertTo(_pixelFormat, _image->getPalette());
surf->copyRectToSurface(*csurf, 0, 0, Common::Rect(0, 0, _screenW, _screenH));
csurf->free();
delete csurf;
_image->destroy();
surf->copyRectToSurface(*_frame, 0, 0, Common::Rect(0, 0, _screenW, _screenH));
}
@ -949,7 +948,7 @@ Graphics::ManagedSurface *PrivateEngine::loadMask(const Common::String &name, in
void PrivateEngine::drawMask(Graphics::ManagedSurface *surf) {
_compositeSurface->transBlitFrom(surf->rawSurface(), *_origin, _transparentColor);
drawScreen();
//drawScreen();
}
void PrivateEngine::drawScreen() {

28
engines/private/private.h
View File

@ -132,8 +132,6 @@ private:
Graphics::PixelFormat _pixelFormat;
Image::ImageDecoder *_image;
Graphics::ManagedSurface *_compositeSurface;
int _screenW, _screenH;
public:
@ -141,7 +139,6 @@ public:
~PrivateEngine();
const ADGameDescription *_gameDescription;
bool isDemo() const;
Audio::SoundHandle _fgSoundHandle;
@ -155,7 +152,6 @@ public:
void initializePath(const Common::FSNode &gamePath) override;
// User input
void selectPauseMovie(Common::Point);
void selectMask(Common::Point);
void selectExit(Common::Point);
@ -163,7 +159,6 @@ public:
void selectSaveGame(Common::Point);
// Cursors
bool cursorPauseMovie(Common::Point);
bool cursorExit(Common::Point);
bool cursorMask(Common::Point);
@ -193,23 +188,25 @@ public:
void changeCursor(Common::String);
void initCursors();
// Rendering
Graphics::ManagedSurface *_compositeSurface;
Graphics::ManagedSurface *loadMask(const Common::String &, int, int, bool);
void drawMask(Graphics::ManagedSurface *);
bool inMask(Graphics::ManagedSurface *, Common::Point);
uint32 _transparentColor;
Common::Rect *screenRect;
Common::String *_framePath;
Graphics::Surface *_frame;
Common::String *_nextVS;
void drawScreen();
// global state
const Common::Point *_origin;
Common::String *_nextSetting;
Common::String *_currentSetting;
Common::String *_nextVS;
Common::String *_frame;
bool _toTake;
// Dossiers
DossierArray _dossiers;
unsigned int _dossierSuspect;
unsigned int _dossierPage;
@ -220,7 +217,6 @@ public:
void loadDossier();
// Police Bust
int policeVideoIndex;
void policeBust();
bool _policeBustEnabled;
@ -232,7 +228,6 @@ public:
Common::String *_policeBustSetting;
// Diary
InvList inventory;
Common::String *_diaryLocPrefix;
void loadLocations(Common::Rect *);
@ -251,12 +246,10 @@ public:
Common::String *_pausedSetting;
// Masks/Exits
ExitList _exits;
MaskList _masks;
// Sounds
void playSound(const Common::String &, uint, bool, bool);
void stopSound(bool);
bool _noStopSounds;
@ -270,37 +263,26 @@ public:
Common::String *_sirenSound;
// Radios
//Common::String *_radioSound;
Common::String *_infaceRadioPath;
MaskInfo *_AMRadioArea;
//Common::String *_AMRadioPrefix;
MaskInfo *_policeRadioArea;
//Common::String *_policeRadioPrefix;
MaskInfo *_phoneArea;
Common::String *_phonePrefix;
Common::String *_phoneCallSound;
SoundList _AMRadio;
SoundList _policeRadio;
PhoneList _phone;
char *getRandomPhoneClip(char *, int, int);
void selectAMRadioArea(Common::Point);
void selectPoliceRadioArea(Common::Point);
void selectPhoneArea(Common::Point);
void checkPhoneCall();
// Random values
bool getRandomBool(uint);
// Timers
bool installTimer(uint32, Common::String *);
void removeTimer();