thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: added new SciGui32 class, Gfx class needs some work though and hopefully i didnt overlook some kernel function that is also used by sci32. now using plane left/top

Browse source 
svn-id: r47679
This commit is contained in:
Martin Kiewitz 2010-01-29 21:30:46 +00:00
parent 85517515a7
commit a800855bf4
14 changed files with 614 additions and 215 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/sci/console.cpp
View file

@ -43,6 +43,7 @@
#endif
#include "sci/sound/drivers/mididriver.h"
#include "sci/graphics/gui.h"
#include "sci/graphics/gui32.h"
#include "sci/graphics/cursor.h"
#include "sci/parser/vocabulary.h"
@ -1112,7 +1113,7 @@ bool Console::cmdDrawRobot(int argc, const char **argv) {
uint16 resourceId = atoi(argv[1]);
_vm->_gamestate->_gui->drawRobot(resourceId);
_vm->_gamestate->_gui32->drawRobot(resourceId);
return true;
}
#endif

1
engines/sci/engine/game.cpp
View file

@ -270,6 +270,7 @@ int game_init(EngineState *s) {
}
// Initialize menu TODO: Actually this should be another init()
if (s->_gui)
s->_gui->menuReset();
s->successor = NULL; // No successor

13
engines/sci/engine/kernel32.cpp
View file

@ -30,6 +30,7 @@
#include "sci/engine/state.h"
#include "sci/engine/selector.h"
#include "sci/graphics/gui.h"
#include "sci/graphics/gui32.h"
namespace Sci {
@ -649,7 +650,7 @@ reg_t kSave(EngineState *s, int argc, reg_t *argv) {
reg_t kAddScreenItem(EngineState *s, int argc, reg_t *argv) {
reg_t viewObj = argv[0];
s->_gui->addScreenItem(viewObj);
s->_gui32->addScreenItem(viewObj);
return NULL_REG;
}
@ -663,7 +664,7 @@ reg_t kUpdateScreenItem(EngineState *s, int argc, reg_t *argv) {
reg_t kDeleteScreenItem(EngineState *s, int argc, reg_t *argv) {
reg_t viewObj = argv[0];
s->_gui->deleteScreenItem(viewObj);
s->_gui32->deleteScreenItem(viewObj);
/*
reg_t viewObj = argv[0];
@ -685,7 +686,7 @@ reg_t kDeleteScreenItem(EngineState *s, int argc, reg_t *argv) {
reg_t kAddPlane(EngineState *s, int argc, reg_t *argv) {
reg_t planeObj = argv[0];
s->_gui->addPlane(planeObj);
s->_gui32->addPlane(planeObj);
warning("kAddPlane object %04x:%04x", PRINT_REG(planeObj));
return NULL_REG;
}
@ -693,7 +694,7 @@ reg_t kAddPlane(EngineState *s, int argc, reg_t *argv) {
reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv) {
reg_t planeObj = argv[0];
s->_gui->deletePlane(planeObj);
s->_gui32->deletePlane(planeObj);
warning("kDeletePlane object %04x:%04x", PRINT_REG(planeObj));
return NULL_REG;
}
@ -701,7 +702,7 @@ reg_t kDeletePlane(EngineState *s, int argc, reg_t *argv) {
reg_t kUpdatePlane(EngineState *s, int argc, reg_t *argv) {
reg_t planeObj = argv[0];
s->_gui->updatePlane(planeObj);
s->_gui32->updatePlane(planeObj);
return s->r_acc;
}
@ -719,7 +720,7 @@ reg_t kFrameOut(EngineState *s, int argc, reg_t *argv) {
// as its called right after a view is updated
// TODO
s->_gui->frameOut();
s->_gui32->frameOut();
return NULL_REG;
}

24
engines/sci/engine/kevent.cpp
View file

@ -31,6 +31,7 @@
#include "sci/debug.h" // for g_debug_simulated_key
#include "sci/event.h"
#include "sci/graphics/gui.h"
#include "sci/graphics/gui32.h"
#include "sci/graphics/cursor.h"
namespace Sci {
@ -44,7 +45,12 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
int oldx, oldy;
int modifier_mask = getSciVersion() <= SCI_VERSION_01 ? SCI_KEYMOD_ALL : SCI_KEYMOD_NO_FOOLOCK;
SegManager *segMan = s->_segMan;
const Common::Point mousePos = s->_gui->getCursorPos();
Common::Point mousePos;
if (s->_gui)
mousePos = s->_gui->getCursorPos();
else
mousePos = s->_gui32->getCursorPos();
// If there's a simkey pending, and the game wants a keyboard event, use the
// simkey instead of a normal event
@ -215,11 +221,13 @@ reg_t kGlobalToLocal(EngineState *s, int argc, reg_t *argv) {
int16 y = GET_SEL32V(segMan, obj, y);
#ifdef ENABLE_SCI32
if (argc > 1)
s->_gui->globalToLocal(&x, &y, argv[1]);
else
if (s->_gui)
#endif
s->_gui->globalToLocal(&x, &y);
#ifdef ENABLE_SCI32
else
s->_gui32->globalToLocal(&x, &y, argv[1]);
#endif
PUT_SEL32V(segMan, obj, x, x);
PUT_SEL32V(segMan, obj, y, y);
@ -238,11 +246,13 @@ reg_t kLocalToGlobal(EngineState *s, int argc, reg_t *argv) {
int16 y = GET_SEL32V(segMan, obj, y);
#ifdef ENABLE_SCI32
if (argc > 1)
s->_gui->localToGlobal(&x, &y, argv[1]);
else
if (s->_gui)
#endif
s->_gui->localToGlobal(&x, &y);
#ifdef ENABLE_SCI32
else
s->_gui32->localToGlobal(&x, &y, argv[1]);
#endif
PUT_SEL32V(segMan, obj, x, x);
PUT_SEL32V(segMan, obj, y, y);

95
engines/sci/engine/kgraphics.cpp
View file

@ -35,6 +35,7 @@
#include "sci/engine/selector.h"
#include "sci/engine/kernel.h"
#include "sci/graphics/gui.h"
#include "sci/graphics/gui32.h"
#include "sci/graphics/animate.h"
#include "sci/graphics/cursor.h"
#include "sci/graphics/screen.h"
@ -77,7 +78,10 @@ void _k_dirloop(reg_t object, uint16 angle, EngineState *s, int argc, reg_t *arg
else loopNo = -1;
}
if (s->_gui)
maxLoops = s->_gui->getLoopCount(viewId);
else
maxLoops = s->_gui32->getLoopCount(viewId);
if ((loopNo > 1) && (maxLoops < 4))
return;
@ -112,7 +116,10 @@ static reg_t kSetCursorSci11(EngineState *s, int argc, reg_t *argv) {
case 1:
switch (argv[0].toSint16()) {
case 0:
if (s->_gui)
s->_gui->hideCursor();
else
s->_gui32->hideCursor();
break;
case -1:
// TODO: Special case at least in kq6, check disassembly
@ -121,13 +128,19 @@ static reg_t kSetCursorSci11(EngineState *s, int argc, reg_t *argv) {
// TODO: Special case at least in kq6, check disassembly
break;
default:
if (s->_gui)
s->_gui->showCursor();
else
s->_gui32->showCursor();
break;
}
case 2:
pos.y = argv[1].toSint16();
pos.x = argv[0].toSint16();
if (s->_gui)
s->_gui->setCursorPos(pos);
else
s->_gui32->setCursorPos(pos);
break;
case 4: {
int16 top = argv[0].toSint16();
@ -137,7 +150,10 @@ static reg_t kSetCursorSci11(EngineState *s, int argc, reg_t *argv) {
if ((right >= left) && (bottom >= top)) {
Common::Rect rect = Common::Rect(left, top, right, bottom);
if (s->_gui)
s->_gui->setCursorZone(rect);
else
s->_gui32->setCursorZone(rect);
} else {
warning("kSetCursor: Ignoring invalid mouse zone (%i, %i)-(%i, %i)", left, top, right, bottom);
}
@ -148,7 +164,10 @@ static reg_t kSetCursorSci11(EngineState *s, int argc, reg_t *argv) {
hotspot = new Common::Point(argv[3].toSint16(), argv[4].toSint16());
// Fallthrough
case 3:
if (s->_gui)
s->_gui->setCursorView(argv[0].toUint16(), argv[1].toUint16(), argv[2].toUint16(), hotspot);
else
s->_gui32->setCursorView(argv[0].toUint16(), argv[1].toUint16(), argv[2].toUint16(), hotspot);
break;
default :
warning("kSetCursor: Unhandled case: %d arguments given", argc);
@ -324,7 +343,10 @@ reg_t kTextSize(EngineState *s, int argc, reg_t *argv) {
}
textWidth = dest[3].toUint16(); textHeight = dest[2].toUint16();
if (s->_gui)
s->_gui->textSize(s->strSplit(text.c_str(), sep).c_str(), font_nr, maxwidth, &textWidth, &textHeight);
else
s->_gui32->textSize(s->strSplit(text.c_str(), sep).c_str(), font_nr, maxwidth, &textWidth, &textHeight);
debugC(2, kDebugLevelStrings, "GetTextSize '%s' -> %dx%d\n", text.c_str(), textWidth, textHeight);
dest[2] = make_reg(0, textHeight);
@ -379,7 +401,11 @@ reg_t kDirLoop(EngineState *s, int argc, reg_t *argv) {
reg_t kCanBeHere(EngineState *s, int argc, reg_t *argv) {
reg_t curObject = argv[0];
reg_t listReference = (argc > 1) ? argv[1] : NULL_REG;
bool canBeHere = s->_gui->canBeHere(curObject, listReference);
bool canBeHere;
if (s->_gui)
canBeHere = s->_gui->canBeHere(curObject, listReference);
else
canBeHere = s->_gui32->canBeHere(curObject, listReference);
return make_reg(0, canBeHere);
}
@ -387,7 +413,11 @@ reg_t kCanBeHere(EngineState *s, int argc, reg_t *argv) {
reg_t kCantBeHere(EngineState *s, int argc, reg_t *argv) {
reg_t curObject = argv[0];
reg_t listReference = (argc > 1) ? argv[1] : NULL_REG;
bool canBeHere = s->_gui->canBeHere(curObject, listReference);
bool canBeHere;
if (s->_gui)
canBeHere = s->_gui->canBeHere(curObject, listReference);
else
canBeHere = s->_gui32->canBeHere(curObject, listReference);
return make_reg(0, !canBeHere);
}
@ -407,8 +437,13 @@ reg_t kCelHigh(EngineState *s, int argc, reg_t *argv) {
return NULL_REG;
int16 loopNo = argv[1].toSint16();
int16 celNo = (argc >= 3) ? argv[2].toSint16() : 0;
int16 celHeight;
return make_reg(0, s->_gui->getCelHeight(viewId, loopNo, celNo));
if (s->_gui)
celHeight = s->_gui->getCelHeight(viewId, loopNo, celNo);
else
celHeight = s->_gui32->getCelHeight(viewId, loopNo, celNo);
return make_reg(0, celHeight);
}
reg_t kCelWide(EngineState *s, int argc, reg_t *argv) {
@ -417,14 +452,24 @@ reg_t kCelWide(EngineState *s, int argc, reg_t *argv) {
return NULL_REG;
int16 loopNo = argv[1].toSint16();
int16 celNo = (argc >= 3) ? argv[2].toSint16() : 0;
int16 celWidth;
return make_reg(0, s->_gui->getCelWidth(viewId, loopNo, celNo));
if (s->_gui)
celWidth = s->_gui->getCelWidth(viewId, loopNo, celNo);
else
celWidth = s->_gui32->getCelWidth(viewId, loopNo, celNo);
return make_reg(0, celWidth);
}
reg_t kNumLoops(EngineState *s, int argc, reg_t *argv) {
reg_t object = argv[0];
GuiResourceId viewId = GET_SEL32V(s->_segMan, object, view);
int16 loopCount = s->_gui->getLoopCount(viewId);
int16 loopCount;
if (s->_gui)
loopCount = s->_gui->getLoopCount(viewId);
else
loopCount = s->_gui32->getLoopCount(viewId);
debugC(2, kDebugLevelGraphics, "NumLoops(view.%d) = %d\n", viewId, loopCount);
@ -435,7 +480,12 @@ reg_t kNumCels(EngineState *s, int argc, reg_t *argv) {
reg_t object = argv[0];
GuiResourceId viewId = GET_SEL32V(s->_segMan, object, view);
int16 loopNo = GET_SEL32V(s->_segMan, object, loop);
int16 celCount = s->_gui->getCelCount(viewId, loopNo);
int16 celCount;
if (s->_gui)
celCount = s->_gui->getCelCount(viewId, loopNo);
else
celCount = s->_gui32->getCelCount(viewId, loopNo);
debugC(2, kDebugLevelGraphics, "NumCels(view.%d, %d) = %d\n", viewId, loopNo, celCount);
@ -503,7 +553,10 @@ reg_t kDrawPic(EngineState *s, int argc, reg_t *argv) {
reg_t kBaseSetter(EngineState *s, int argc, reg_t *argv) {
reg_t object = argv[0];
if (s->_gui)
s->_gui->baseSetter(object);
else
s->_gui32->baseSetter(object);
// WORKAROUND for a problem in LSL1VGA. This allows the casino door to be opened,
// till the actual problem is found
@ -516,11 +569,17 @@ reg_t kBaseSetter(EngineState *s, int argc, reg_t *argv) {
}
reg_t kSetNowSeen(EngineState *s, int argc, reg_t *argv) {
if (s->_gui)
s->_gui->setNowSeen(argv[0]);
else
s->_gui32->setNowSeen(argv[0]);
return s->r_acc;
}
reg_t kPalette(EngineState *s, int argc, reg_t *argv) {
if (!s->_gui)
return s->r_acc;
switch (argv[0].toUint16()) {
case 1: // Set resource palette
if (argc==3) {
@ -600,6 +659,9 @@ reg_t kPalette(EngineState *s, int argc, reg_t *argv) {
reg_t kPalVary(EngineState *s, int argc, reg_t *argv) {
uint16 operation = argv[0].toUint16();
if (!s->_gui)
return s->r_acc;
switch (operation) {
case 0: { // Init
GuiResourceId paletteId;
@ -1040,9 +1102,16 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
// Hide the cursor if it's showing and then show it again if it was
// previously visible.
bool reshowCursor = s->_gui->isCursorVisible();
bool reshowCursor;
if (s->_gui) {
reshowCursor = s->_gui->isCursorVisible();
if (reshowCursor)
s->_gui->hideCursor();
} else {
reshowCursor = s->_gui32->isCursorVisible();
if (reshowCursor)
s->_gui32->hideCursor();
}
// The Windows and DOS versions use different video format as well
// as a different argument set.
@ -1081,11 +1150,19 @@ reg_t kShowMovie(EngineState *s, int argc, reg_t *argv) {
delete seqDecoder;
}
if (playedVideo)
if (playedVideo) {
if (s->_gui)
s->_gui->syncWithFramebuffer();
else
s->_gui32->syncWithFramebuffer();
}
if (reshowCursor)
if (reshowCursor) {
if (s->_gui)
s->_gui->showCursor();
else
s->_gui32->showCursor();
}
return s->r_acc;
}

2
engines/sci/engine/state.h
View file

@ -52,6 +52,7 @@ namespace Sci {
class SciEvent;
class Menubar;
class SciGui;
class SciGui32;
class Cursor;
class MessageState;
class SoundCommandParser;
@ -144,6 +145,7 @@ public:
/* Non-VM information */
SciGui *_gui; /* Currently active Gui */
SciGui32 *_gui32;
SciEvent *_event; // Event handling

13
engines/sci/graphics/gfx.cpp
View file

@ -446,24 +446,21 @@ void Gfx::drawHiresCelAndShow(GuiResourceId viewId, int16 loopNo, int16 celNo, u
}
uint16 Gfx::onControl(uint16 screenMask, Common::Rect rect) {
Common::Rect outRect(rect.left, rect.top, rect.right, rect.bottom);
int16 x, y;
uint16 result = 0;
outRect.clip(_curPort->rect);
if (outRect.isEmpty()) // nothing to control
if (rect.isEmpty())
return 0;
OffsetRect(outRect);
if (screenMask & SCI_SCREEN_MASK_PRIORITY) {
for (y = outRect.top; y < outRect.bottom; y++) {
for (x = outRect.left; x < outRect.right; x++) {
for (y = rect.top; y < rect.bottom; y++) {
for (x = rect.left; x < rect.right; x++) {
result |= 1 << _screen->getPriority(x, y);
}
}
} else {
for (y = outRect.top; y < outRect.bottom; y++) {
for (x = outRect.left; x < outRect.right; x++) {
for (y = rect.top; y < rect.bottom; y++) {
for (x = rect.left; x < rect.right; x++) {
result |= 1 << _screen->getControl(x, y);
}
}

154
engines/sci/graphics/gui.cpp
View file

@ -41,7 +41,6 @@
#include "sci/graphics/controls.h"
#include "sci/graphics/menu.h"
#include "sci/graphics/portrait.h"
#include "sci/graphics/robot.h"
#include "sci/graphics/text.h"
#include "sci/graphics/transitions.h"
#include "sci/graphics/view.h"
@ -61,9 +60,6 @@ SciGui::SciGui(EngineState *state, Screen *screen, SciPalette *palette, Cursor *
_menu = new Menu(_s->_event, _s->_segMan, this, _gfx, _text, _screen, _cursor);
}
SciGui::SciGui() {
}
SciGui::~SciGui() {
delete _menu;
delete _controls;
@ -152,20 +148,6 @@ void SciGui::localToGlobal(int16 *x, int16 *y) {
*y = *y + curPort->top;
}
#ifdef ENABLE_SCI32
void SciGui::globalToLocal(int16 *x, int16 *y, reg_t planeObj) {
*x = *x - GET_SEL32V(_s->_segMan, planeObj, left);
*y = *y - GET_SEL32V(_s->_segMan, planeObj, top);
}
void SciGui::localToGlobal(int16 *x, int16 *y, reg_t planeObj) {
*x = *x + GET_SEL32V(_s->_segMan, planeObj, left);
*y = *y + GET_SEL32V(_s->_segMan, planeObj, top);
}
#endif
int16 SciGui::coordinateToPriority(int16 y) {
return _gfx->CoordinateToPriority(y);
}
@ -624,9 +606,13 @@ void SciGui::shakeScreen(uint16 shakeCount, uint16 directions) {
uint16 SciGui::onControl(byte screenMask, Common::Rect rect) {
Port *oldPort = _gfx->SetPort((Port *)_windowMgr->_picWind);
Common::Rect adjustedRect(rect.left, rect.top, rect.right, rect.bottom);
uint16 result;
result = _gfx->onControl(screenMask, rect);
adjustedRect.clip(_gfx->GetPort()->rect);
_gfx->OffsetRect(adjustedRect);
result = _gfx->onControl(screenMask, adjustedRect);
_gfx->SetPort(oldPort);
return result;
}
@ -728,6 +714,7 @@ void SciGui::setNowSeen(reg_t objectReference) {
bool SciGui::canBeHere(reg_t curObject, reg_t listReference) {
Port *oldPort = _gfx->SetPort((Port *)_windowMgr->_picWind);
Common::Rect checkRect;
Common::Rect adjustedRect;
uint16 signal, controlMask;
bool result;
@ -735,9 +722,14 @@ bool SciGui::canBeHere(reg_t curObject, reg_t listReference) {
checkRect.top = GET_SEL32V(_s->_segMan, curObject, brTop);
checkRect.right = GET_SEL32V(_s->_segMan, curObject, brRight);
checkRect.bottom = GET_SEL32V(_s->_segMan, curObject, brBottom);
adjustedRect = checkRect;
adjustedRect.clip(_gfx->GetPort()->rect);
_gfx->OffsetRect(adjustedRect);
signal = GET_SEL32V(_s->_segMan, curObject, signal);
controlMask = GET_SEL32V(_s->_segMan, curObject, illegalBits);
result = (_gfx->onControl(SCI_SCREEN_MASK_CONTROL, checkRect) & controlMask) ? false : true;
result = (_gfx->onControl(SCI_SCREEN_MASK_CONTROL, adjustedRect) & controlMask) ? false : true;
if ((result) && (signal & (kSignalIgnoreActor | kSignalRemoveView)) == 0) {
List *list = _s->_segMan->lookupList(listReference);
if (!list)
@ -908,128 +900,6 @@ void SciGui::doPalVary() {
// TODO: do palette transition here...
}
#ifdef ENABLE_SCI32
void SciGui::addScreenItem(reg_t object) {
_screenItems.push_back(object);
}
void SciGui::deleteScreenItem(reg_t object) {
for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) {
if (_screenItems[itemNr] == object) {
_screenItems.remove_at(itemNr);
return;
}
}
}
void SciGui::addPlane(reg_t object) {
_planes.push_back(object);
}
void SciGui::updatePlane(reg_t object) {
int16 picNum = GET_SEL32V(_s->_segMan, object, picture);
if (picNum > -1) {
drawPicture(picNum, 100, false, false, false, 0);
animateShowPic();
}
}
void SciGui::deletePlane(reg_t object) {
for (uint32 planeNr = 0; planeNr < _planes.size(); planeNr++) {
if (_planes[planeNr] == object) {
_planes.remove_at(planeNr);
return;
}
}
}
void SciGui::frameOut() {
for (uint32 planeNr = 0; planeNr < _planes.size(); planeNr++) {
reg_t planeObj = _planes[planeNr];
int16 priority = GET_SEL32V(_s->_segMan, planeObj, priority);
if (priority == -1)
continue;
int16 picNum = GET_SEL32V(_s->_segMan, planeObj, picture);
if (picNum > -1) {
drawPicture(picNum, 100, false, false, false, 0);
}
// FIXME: This code doesn't currently work properly because of the way we set up the
// view port. We are starting at 10 pixels from the top automatically. The offset should
// be based on the plane's top in SCI32 instead. Here we would be adding 10 to 10 and
// therefore drawing too low. We would need to draw each picture at the correct offset
// which doesn't currently happen.
//int16 planeTop = GET_SEL32V(_s->_segMan, planeObj, top);
//int16 planeLeft = GET_SEL32V(_s->_segMan, planeObj, left);
for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) {
reg_t viewObj = _screenItems[itemNr];
reg_t planeOfItem = GET_SEL32(_s->_segMan, viewObj, plane);
if (planeOfItem == _planes[planeNr]) {
uint16 viewId = GET_SEL32V(_s->_segMan, viewObj, view);
uint16 loopNo = GET_SEL32V(_s->_segMan, viewObj, loop);
uint16 celNo = GET_SEL32V(_s->_segMan, viewObj, cel);
uint16 x = GET_SEL32V(_s->_segMan, viewObj, x);
uint16 y = GET_SEL32V(_s->_segMan, viewObj, y);
uint16 z = GET_SEL32V(_s->_segMan, viewObj, z);
priority = GET_SEL32V(_s->_segMan, viewObj, priority);
uint16 scaleX = GET_SEL32V(_s->_segMan, viewObj, scaleX);
uint16 scaleY = GET_SEL32V(_s->_segMan, viewObj, scaleY);
//int16 signal = GET_SEL32V(_s->_segMan, viewObj, signal);
// FIXME: See above
//leftPos += planeLeft;
//topPos += planeTop;
// Theoretically, leftPos and topPos should be sane
// Apparently, sometimes they're not, therefore I'm adding some sanity checks here so that
// the hack underneath does not try and draw cels outside the screen coordinates
if (x >= _screen->getWidth()) {
continue;
}
if (y >= _screen->getHeight()) {
continue;
}
if (viewId != 0xffff) {
Common::Rect celRect;
View *view = _gfx->getView(viewId);
// Sometimes x,y are bottom right
view->getCelRect(loopNo, celNo, x, y, z, &celRect);
// leftPos = GET_SEL32V(_s->_segMan, viewObj, x);
// topPos = GET_SEL32V(_s->_segMan, viewObj, y);
// celRect.left = leftPos;
// celRect.top = topPos;
// celRect.right = leftPos + view->getWidth(loopNo, celNo);
// celRect.bottom = topPos + view->getHeight(loopNo, celNo);
// warning("view %d, loop %d, cel %d", viewId, loopNo, celNo);
//void View::getCelRect(int16 loopNo, int16 celNo, int16 x, int16 y, int16 z, Common::Rect *outRect) {
//celRect.right = leftPos;
//celRect.bottom = topPos;
//celRect.left = celRect.right - view->getWidth(loopNo, celNo);;
//celRect.top = celRect.bottom - view->getHeight(loopNo, celNo);
celRect.clip(_gfx->_curPort->rect);
_gfx->drawCel(view, loopNo, celNo, celRect, priority, 0, scaleX, scaleY);
}
//drawCel(viewId, loopNo, celNo, leftPos, topPos, priority, 0);
}
}
}
_screen->copyToScreen();
//animateShowPic();
}
void SciGui::drawRobot(GuiResourceId robotId) {
Robot *test = new Robot(_s->resMan, _screen, robotId);
test->draw();
delete test;
}
#endif
bool SciGui::debugUndither(bool flag) {
_screen->unditherSetState(flag);
return false;

20
engines/sci/graphics/gui.h
View file

@ -55,7 +55,6 @@ class Transitions;
class SciGui {
public:
SciGui(EngineState *s, Screen *screen, SciPalette *palette, Cursor *cursor, AudioPlayer *audio);
SciGui();
virtual ~SciGui();
virtual void init(bool usesOldGfxFunctions);
@ -156,20 +155,6 @@ public:
void togglePalVary(bool pause);
void stopPalVary();
#ifdef ENABLE_SCI32
// SCI32
virtual void addScreenItem(reg_t object);
virtual void deleteScreenItem(reg_t object);
virtual void addPlane(reg_t object);
virtual void updatePlane(reg_t object);
virtual void deletePlane(reg_t object);
virtual void frameOut();
virtual void globalToLocal(int16 *x, int16 *y, reg_t planeObj);
virtual void localToGlobal(int16 *x, int16 *y, reg_t planeObj);
virtual void drawRobot(GuiResourceId robotId);
#endif
virtual bool debugUndither(bool flag);
virtual bool debugShowMap(int mapNo);
virtual bool debugEGAdrawingVisualize(bool state);
@ -203,11 +188,6 @@ private:
uint32 _palVaryEnd;
bool _usesOldGfxFunctions;
#ifdef ENABLE_SCI32
Common::Array<reg_t> _screenItems;
Common::Array<reg_t> _planes;
#endif
};
} // End of namespace Sci

340
engines/sci/graphics/gui32.cpp Normal file
View file

@ -0,0 +1,340 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
#include "common/timer.h"
#include "common/util.h"
#include "sci/sci.h"
#include "sci/debug.h" // for g_debug_sleeptime_factor
#include "sci/event.h"
#include "sci/engine/state.h"
#include "sci/engine/selector.h"
#include "sci/graphics/gui32.h"
#include "sci/graphics/screen.h"
#include "sci/graphics/palette.h"
#include "sci/graphics/cursor.h"
#include "sci/graphics/gfx.h"
#include "sci/graphics/picture.h"
#include "sci/graphics/robot.h"
#include "sci/graphics/text.h"
#include "sci/graphics/view.h"
namespace Sci {
SciGui32::SciGui32(EngineState *state, Screen *screen, SciPalette *palette, Cursor *cursor)
: _s(state), _screen(screen), _palette(palette), _cursor(cursor) {
_gfx = new Gfx(_s->resMan, _s->_segMan, _s->_kernel, _screen, _palette);
}
SciGui32::~SciGui32() {
delete _gfx;
}
void SciGui32::resetEngineState(EngineState *s) {
_s = s;
}
void SciGui32::init() {
}
void SciGui32::globalToLocal(int16 *x, int16 *y, reg_t planeObj) {
*x = *x - GET_SEL32V(_s->_segMan, planeObj, left);
*y = *y - GET_SEL32V(_s->_segMan, planeObj, top);
}
void SciGui32::localToGlobal(int16 *x, int16 *y, reg_t planeObj) {
*x = *x + GET_SEL32V(_s->_segMan, planeObj, left);
*y = *y + GET_SEL32V(_s->_segMan, planeObj, top);
}
void SciGui32::textSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight) {
*textWidth = 0;
*textHeight = 0;
}
uint16 SciGui32::onControl(byte screenMask, Common::Rect rect) {
Common::Rect adjustedRect = rect;
uint16 result;
adjustedRect.translate(0, 10);
result = _gfx->onControl(screenMask, rect);
return result;
}
void SciGui32::setNowSeen(reg_t objectReference) {
_gfx->SetNowSeen(objectReference);
}
bool SciGui32::canBeHere(reg_t curObject, reg_t listReference) {
Common::Rect checkRect;
uint16 signal, controlMask;
bool result;
checkRect.left = GET_SEL32V(_s->_segMan, curObject, brLeft);
checkRect.top = GET_SEL32V(_s->_segMan, curObject, brTop);
checkRect.right = GET_SEL32V(_s->_segMan, curObject, brRight);
checkRect.bottom = GET_SEL32V(_s->_segMan, curObject, brBottom);
signal = GET_SEL32V(_s->_segMan, curObject, signal);
controlMask = GET_SEL32V(_s->_segMan, curObject, illegalBits);
result = (_gfx->onControl(SCI_SCREEN_MASK_CONTROL, checkRect) & controlMask) ? false : true;
if ((result)) { // gui16 && (signal & (kSignalIgnoreActor | kSignalRemoveView)) == 0) {
List *list = _s->_segMan->lookupList(listReference);
if (!list)
error("kCanBeHere called with non-list as parameter");
result = _gfx->CanBeHereCheckRectList(curObject, checkRect, list);
}
return result;
}
bool SciGui32::isItSkip(GuiResourceId viewId, int16 loopNo, int16 celNo, Common::Point position) {
View *tmpView = _gfx->getView(viewId);
CelInfo *celInfo = tmpView->getCelInfo(loopNo, celNo);
position.x = CLIP<int>(position.x, 0, celInfo->width - 1);
position.y = CLIP<int>(position.y, 0, celInfo->height - 1);
byte *celData = tmpView->getBitmap(loopNo, celNo);
bool result = (celData[position.y * celInfo->width + position.x] == celInfo->clearKey);
return result;
}
void SciGui32::baseSetter(reg_t object) {
if (lookup_selector(_s->_segMan, object, _s->_kernel->_selectorCache.brLeft, NULL, NULL) == kSelectorVariable) {
int16 x = GET_SEL32V(_s->_segMan, object, x);
int16 y = GET_SEL32V(_s->_segMan, object, y);
int16 z = (_s->_kernel->_selectorCache.z > -1) ? GET_SEL32V(_s->_segMan, object, z) : 0;
int16 yStep = GET_SEL32V(_s->_segMan, object, yStep);
GuiResourceId viewId = GET_SEL32V(_s->_segMan, object, view);
int16 loopNo = GET_SEL32V(_s->_segMan, object, loop);
int16 celNo = GET_SEL32V(_s->_segMan, object, cel);
View *tmpView = _gfx->getView(viewId);
Common::Rect celRect;
tmpView->getCelRect(loopNo, celNo, x, y, z, &celRect);
celRect.bottom = y + 1;
celRect.top = celRect.bottom - yStep;
PUT_SEL32V(_s->_segMan, object, brLeft, celRect.left);
PUT_SEL32V(_s->_segMan, object, brRight, celRect.right);
PUT_SEL32V(_s->_segMan, object, brTop, celRect.top);
PUT_SEL32V(_s->_segMan, object, brBottom, celRect.bottom);
}
}
void SciGui32::hideCursor() {
_cursor->hide();
}
void SciGui32::showCursor() {
_cursor->show();
}
bool SciGui32::isCursorVisible() {
return _cursor->isVisible();
}
void SciGui32::setCursorShape(GuiResourceId cursorId) {
_cursor->setShape(cursorId);
}
void SciGui32::setCursorView(GuiResourceId viewNum, int loopNum, int cellNum, Common::Point *hotspot) {
_cursor->setView(viewNum, loopNum, cellNum, hotspot);
}
void SciGui32::setCursorPos(Common::Point pos) {
//pos.y += _gfx->GetPort()->top;
//pos.x += _gfx->GetPort()->left;
moveCursor(pos);
}
Common::Point SciGui32::getCursorPos() {
return _cursor->getPosition();
}
void SciGui32::moveCursor(Common::Point pos) {
// pos.y += _windowMgr->_picWind->rect.top;
// pos.x += _windowMgr->_picWind->rect.left;
// pos.y = CLIP<int16>(pos.y, _windowMgr->_picWind->rect.top, _windowMgr->_picWind->rect.bottom - 1);
// pos.x = CLIP<int16>(pos.x, _windowMgr->_picWind->rect.left, _windowMgr->_picWind->rect.right - 1);
if (pos.x > _screen->getWidth() || pos.y > _screen->getHeight()) {
warning("attempt to place cursor at invalid coordinates (%d, %d)", pos.y, pos.x);
return;
}
_cursor->setPosition(pos);
// Trigger event reading to make sure the mouse coordinates will
// actually have changed the next time we read them.
_s->_event->get(SCI_EVENT_PEEK);
}
void SciGui32::setCursorZone(Common::Rect zone) {
_cursor->setMoveZone(zone);
}
int16 SciGui32::getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo) {
return _gfx->getView(viewId)->getCelInfo(loopNo, celNo)->width;
}
int16 SciGui32::getCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo) {
return _gfx->getView(viewId)->getCelInfo(loopNo, celNo)->height;
}
int16 SciGui32::getLoopCount(GuiResourceId viewId) {
return _gfx->getView(viewId)->getLoopCount();
}
int16 SciGui32::getCelCount(GuiResourceId viewId, int16 loopNo) {
return _gfx->getView(viewId)->getLoopInfo(loopNo)->celCount;
}
void SciGui32::syncWithFramebuffer() {
_screen->syncWithFramebuffer();
}
void SciGui32::addScreenItem(reg_t object) {
_screenItems.push_back(object);
}
void SciGui32::deleteScreenItem(reg_t object) {
for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) {
if (_screenItems[itemNr] == object) {
_screenItems.remove_at(itemNr);
return;
}
}
}
void SciGui32::addPlane(reg_t object) {
_planes.push_back(object);
}
void SciGui32::updatePlane(reg_t object) {
}
void SciGui32::deletePlane(reg_t object) {
for (uint32 planeNr = 0; planeNr < _planes.size(); planeNr++) {
if (_planes[planeNr] == object) {
_planes.remove_at(planeNr);
return;
}
}
}
void SciGui32::frameOut() {
for (uint32 planeNr = 0; planeNr < _planes.size(); planeNr++) {
reg_t planeObj = _planes[planeNr];
int16 priority = GET_SEL32V(_s->_segMan, planeObj, priority);
if (priority == -1)
continue;
int16 picNum = GET_SEL32V(_s->_segMan, planeObj, picture);
if (picNum > -1) {
SciGuiPicture *picture = new SciGuiPicture(_s->resMan, 0, _screen, _palette, picNum, false);
picture->draw(100, false, false, 0);
delete picture;
//_gfx->drawPicture(picNum, 100, false, false, 0);
}
// FIXME: This code doesn't currently work properly because of the way we set up the
// view port. We are starting at 10 pixels from the top automatically. The offset should
// be based on the plane's top in SCI32 instead. Here we would be adding 10 to 10 and
// therefore drawing too low. We would need to draw each picture at the correct offset
// which doesn't currently happen.
int16 planeTop = GET_SEL32V(_s->_segMan, planeObj, top);
int16 planeLeft = GET_SEL32V(_s->_segMan, planeObj, left);
for (uint32 itemNr = 0; itemNr < _screenItems.size(); itemNr++) {
reg_t viewObj = _screenItems[itemNr];
reg_t planeOfItem = GET_SEL32(_s->_segMan, viewObj, plane);
if (planeOfItem == _planes[planeNr]) {
uint16 viewId = GET_SEL32V(_s->_segMan, viewObj, view);
uint16 loopNo = GET_SEL32V(_s->_segMan, viewObj, loop);
uint16 celNo = GET_SEL32V(_s->_segMan, viewObj, cel);
uint16 x = GET_SEL32V(_s->_segMan, viewObj, x);
uint16 y = GET_SEL32V(_s->_segMan, viewObj, y);
uint16 z = GET_SEL32V(_s->_segMan, viewObj, z);
priority = GET_SEL32V(_s->_segMan, viewObj, priority);
uint16 scaleX = GET_SEL32V(_s->_segMan, viewObj, scaleX);
uint16 scaleY = GET_SEL32V(_s->_segMan, viewObj, scaleY);
//int16 signal = GET_SEL32V(_s->_segMan, viewObj, signal);
// FIXME: See above
x += planeLeft;
y += planeTop;
// Theoretically, leftPos and topPos should be sane
// Apparently, sometimes they're not, therefore I'm adding some sanity checks here so that
// the hack underneath does not try and draw cels outside the screen coordinates
if (y < 0 || x >= _screen->getWidth()) {
continue;
}
if (y < 0 || y >= _screen->getHeight()) {
continue;
}
if (viewId != 0xffff) {
Common::Rect celRect;
View *view = _gfx->getView(viewId);
view->getCelRect(loopNo, celNo, x, y, z, &celRect);
if (celRect.top < 0 || celRect.top >= _screen->getHeight())
continue;
if (celRect.left < 0 || celRect.left >= _screen->getWidth())
continue;
if ((scaleX == 128) && (scaleY == 128))
view->draw(celRect, celRect, celRect, loopNo, celNo, 255, 0, false);
else
view->drawScaled(celRect, celRect, celRect, loopNo, celNo, 255, scaleX, scaleY);
//_gfx->drawCel(view, loopNo, celNo, celRect, priority, 0, scaleX, scaleY);
}
}
}
}
_screen->copyToScreen();
}
void SciGui32::drawRobot(GuiResourceId robotId) {
Robot *test = new Robot(_s->resMan, _screen, robotId);
test->draw();
delete test;
}
bool SciGui32::debugShowMap(int mapNo) {
_screen->debugShowMap(mapNo);
return false;
}
} // End of namespace Sci

103
engines/sci/graphics/gui32.h Normal file
View file

@ -0,0 +1,103 @@
/* ScummVM - Graphic Adventure Engine
*
* ScummVM is the legal property of its developers, whose names
* are too numerous to list here. Please refer to the COPYRIGHT
* file distributed with this source distribution.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
* $URL$
* $Id$
*
*/
#ifndef SCI_GRAPHICS_GUI32_H
#define SCI_GRAPHICS_GUI32_H
#include "sci/graphics/helpers.h"
namespace Sci {
class Screen;
class SciPalette;
class Cursor;
class Gfx;
class Text;
class SciGui32 {
public:
SciGui32(EngineState *s, Screen *screen, SciPalette *palette, Cursor *cursor);
SciGui32();
~SciGui32();
void init();
void textSize(const char *text, int16 font, int16 maxWidth, int16 *textWidth, int16 *textHeight);
uint16 onControl(byte screenMask, Common::Rect rect);
void setNowSeen(reg_t objectReference);
bool canBeHere(reg_t curObject, reg_t listReference);
bool isItSkip(GuiResourceId viewId, int16 loopNo, int16 celNo, Common::Point position);
void baseSetter(reg_t object);
void hideCursor();
void showCursor();
bool isCursorVisible();
void setCursorShape(GuiResourceId cursorId);
void setCursorView(GuiResourceId viewNum, int loopNum, int cellNum, Common::Point *hotspot);
virtual void setCursorPos(Common::Point pos);
Common::Point getCursorPos();
virtual void moveCursor(Common::Point pos);
void setCursorZone(Common::Rect zone);
int16 getCelWidth(GuiResourceId viewId, int16 loopNo, int16 celNo);
int16 getCelHeight(GuiResourceId viewId, int16 loopNo, int16 celNo);
int16 getLoopCount(GuiResourceId viewId);
int16 getCelCount(GuiResourceId viewId, int16 loopNo);
void syncWithFramebuffer();
void addScreenItem(reg_t object);
void deleteScreenItem(reg_t object);
void addPlane(reg_t object);
void updatePlane(reg_t object);
void deletePlane(reg_t object);
void frameOut();
void globalToLocal(int16 *x, int16 *y, reg_t planeObj);
void localToGlobal(int16 *x, int16 *y, reg_t planeObj);
void drawRobot(GuiResourceId robotId);
bool debugShowMap(int mapNo);
// FIXME: Don't store EngineState
void resetEngineState(EngineState *s);
protected:
Cursor *_cursor;
EngineState *_s;
Screen *_screen;
SciPalette *_palette;
Gfx *_gfx;
private:
Common::Array<reg_t> _screenItems;
Common::Array<reg_t> _planes;
};
} // End of namespace Sci
#endif

9
engines/sci/graphics/picture.cpp
View file

@ -265,11 +265,20 @@ void SciGuiPicture::drawCelData(byte *inbuffer, int size, int headerPos, int rle
memcpy(celBitmap, rlePtr, pixelCount);
}
if (_gfx) {
// Set initial vertical coordinate by using current port
y = callerY + _gfx->GetPort()->top;
lastY = MIN<int16>(height + y, _gfx->GetPort()->rect.bottom + _gfx->GetPort()->top);
leftX = callerX + _gfx->GetPort()->left;
rightX = MIN<int16>(width + leftX, _gfx->GetPort()->rect.right + _gfx->GetPort()->left);
} else {
y = callerY + 10; // TODO: Implement plane support for SCI32
lastY = y + height;
if (lastY > _screen->getHeight())
lastY = _screen->getHeight();
leftX = callerX;
rightX = leftX + width;
}
// Change clearcolor to white, if we dont add to an existing picture. That way we will paint everything on screen
// but white and that wont matter because the screen is supposed to be already white. It seems that most (if not all)

1
engines/sci/module.mk
View file

@ -34,6 +34,7 @@ MODULE_OBJS := \
engine/state.o \
engine/vm.o \
graphics/gui.o \
graphics/gui32.o \
graphics/animate.o \
graphics/controls.o \
graphics/cursor.o \

7
engines/sci/sci.cpp
View file

@ -40,6 +40,7 @@
#include "sci/sound/audio.h"
#include "sci/sound/soundcmd.h"
#include "sci/graphics/gui.h"
#include "sci/graphics/gui32.h"
#include "sci/graphics/palette.h"
#include "sci/graphics/cursor.h"
#include "sci/graphics/screen.h"
@ -162,7 +163,10 @@ Common::Error SciEngine::run() {
if (script_init_engine(_gamestate))
return Common::kUnknownError;
if (getSciVersion() <= SCI_VERSION_1_1)
_gamestate->_gui = new SciGui(_gamestate, screen, palette, cursor, _audio);
else
_gamestate->_gui32 = new SciGui32(_gamestate, screen, palette, cursor);
if (game_init(_gamestate)) { /* Initialize */
warning("Game initialization failed: Aborting...");
@ -192,7 +196,10 @@ Common::Error SciEngine::run() {
syncSoundSettings();
if (_gamestate->_gui)
_gamestate->_gui->init(_gamestate->usesOldGfxFunctions());
else
_gamestate->_gui32->init();
debug("Emulating SCI version %s\n", getSciVersionDesc(getSciVersion()).c_str());