libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-22 01:39:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MYST3: Refactor the dialog class to allow for different implementations

Browse Source
This commit is contained in:
Bastien Bouclet 2014-09-08 09:18:48 +02:00
parent d3c17a742e
commit 7de1765262
3 changed files with 68 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
engines/myst3/menu.cpp
View File

@ -161,34 +161,21 @@ void Menu::goToNode(uint16 node) {
Dialog::Dialog(Myst3Engine *vm, uint id):
_vm(vm),
_texture(0),
_frameToDisplay(0),
_previousframe(0) {
const DirectorySubEntry *buttonsDesc = _vm->getFileDescription("DLGB", 1000, 0, DirectorySubEntry::kNumMetadata);
_texture(0) {
const DirectorySubEntry *movieDesc = _vm->getFileDescription("DLOG", id, 0, DirectorySubEntry::kDialogMovie);
const DirectorySubEntry *countDesc = _vm->getFileDescription("DLGI", id, 0, DirectorySubEntry::kNumMetadata);
if (!buttonsDesc || !movieDesc || !countDesc)
if (!movieDesc || !countDesc)
error("Unable to load dialog %d", id);
// Retrieve button count
_buttonCount = countDesc->getMiscData(0);
assert(_buttonCount <= 3);
// Load available buttons
for (uint i = 0; i < 3; i++) {
uint32 left = buttonsDesc->getMiscData(i * 4);
uint32 top = buttonsDesc->getMiscData(i * 4 + 1);
uint32 width = buttonsDesc->getMiscData(i * 4 + 2);
uint32 height = buttonsDesc->getMiscData(i * 4 + 3);
_buttons[i] = Common::Rect(width, height);
_buttons[i].translate(left, top);
}
// Load the movie
_movieStream = movieDesc->getData();
Common::MemoryReadStream *movieStream = movieDesc->getData();
_bink.setDefaultHighColorFormat(Graphics::PixelFormat(4, 8, 8, 8, 8, 0, 8, 16, 24));
_bink.loadStream(_movieStream);
_bink.loadStream(movieStream);
_bink.start();
const Graphics::Surface *frame = _bink.decodeNextFrame();
@ -202,15 +189,6 @@ Dialog::~Dialog() {
}
void Dialog::draw() {
if (_frameToDisplay != _previousframe) {
_bink.seekToFrame(_frameToDisplay);
const Graphics::Surface *frame = _bink.decodeNextFrame();
_texture->update(frame);
_previousframe = _frameToDisplay;
}
Common::Rect textureRect = Common::Rect(_texture->width, _texture->height);
_vm->_gfx->drawTexturedRect2D(getPosition(), textureRect, _texture);
}
@ -222,7 +200,47 @@ Common::Rect Dialog::getPosition() {
return screenRect;
}
int16 Dialog::update() {
ButtonsDialog::ButtonsDialog(Myst3Engine *vm, uint id):
Dialog(vm, id),
_frameToDisplay(0),
_previousframe(0) {
loadButtons();
}
ButtonsDialog::~ButtonsDialog() {
}
void ButtonsDialog::loadButtons() {
const DirectorySubEntry *buttonsDesc = _vm->getFileDescription("DLGB", 1000, 0, DirectorySubEntry::kNumMetadata);
if (!buttonsDesc)
error("Unable to load dialog buttons description");
for (uint i = 0; i < 3; i++) {
uint32 left = buttonsDesc->getMiscData(i * 4);
uint32 top = buttonsDesc->getMiscData(i * 4 + 1);
uint32 width = buttonsDesc->getMiscData(i * 4 + 2);
uint32 height = buttonsDesc->getMiscData(i * 4 + 3);
_buttons[i] = Common::Rect(width, height);
_buttons[i].translate(left, top);
}
}
void ButtonsDialog::draw() {
if (_frameToDisplay != _previousframe) {
_bink.seekToFrame(_frameToDisplay);
const Graphics::Surface *frame = _bink.decodeNextFrame();
_texture->update(frame);
_previousframe = _frameToDisplay;
}
Dialog::draw();
}
int16 ButtonsDialog::update() {
// Process events
Common::Event event;
while (_vm->getEventManager()->pollEvent(event)) {

33
engines/myst3/menu.h
View File

@ -97,24 +97,35 @@ private:
class Dialog : public Drawable {
public:
Dialog(Myst3Engine *vm, uint id);
~Dialog();
void draw();
int16 update();
virtual ~Dialog();
virtual void draw() override;
virtual int16 update() = 0;
protected:
Myst3Engine *_vm;
Video::BinkDecoder _bink;
Texture *_texture;
uint _buttonCount;
Common::Rect getPosition();
};
class ButtonsDialog : public Dialog {
public:
ButtonsDialog(Myst3Engine *vm, uint id);
virtual ~ButtonsDialog();
void draw() override;
int16 update() override;
private:
Myst3Engine *_vm;
Common::MemoryReadStream *_movieStream;
Video::BinkDecoder _bink;
uint16 _previousframe;
uint16 _frameToDisplay;
uint _buttonCount;
Common::Rect _buttons[3];
Texture *_texture;
Common::Rect getPosition();
void loadButtons();
};
} // End of namespace Myst3

2
engines/myst3/myst3.cpp
View File

@ -1266,7 +1266,7 @@ Graphics::Surface *Myst3Engine::decodeJpeg(const DirectorySubEntry *jpegDesc) {
}
int16 Myst3Engine::openDialog(uint16 id) {
Dialog dialog(this, id);
ButtonsDialog dialog(this, id);
_drawables.push_back(&dialog);