Skip to content

Commit

Permalink
SCI: WIP GfxText32 code
Browse files Browse the repository at this point in the history 
This at least prevents SQ6 from crashing when going into the
introduction
  • Loading branch information
@csnover
csnover committed Feb 18, 2016
1 parent 3bddd86 commit 20ccad8
Show file tree
Hide file tree
Showing 10 changed files with 460 additions and 79 deletions.
2 changes: 1 addition & 1 deletion engines/sci/engine/kernel_tables.h
View file
Expand Up @@ -670,7 +670,7 @@ static SciKernelMapEntry s_kernelMap[] = {
{ MAP_CALL(CelInfo), SIG_EVERYWHERE, "iiiiii", NULL, NULL },
{ MAP_CALL(SetLanguage), SIG_EVERYWHERE, "r", NULL, NULL },
{ MAP_CALL(ScrollWindow), SIG_EVERYWHERE, "i(.*)", kScrollWindow_subops, NULL },
{ MAP_CALL(SetFontRes), SIG_EVERYWHERE, "ii", NULL, NULL },
{ MAP_DUMMY(SetFontRes), SIG_EVERYWHERE, "(.*)", NULL, NULL },
{ MAP_CALL(Font), SIG_EVERYWHERE, "i(.*)", NULL, NULL },
{ MAP_CALL(Bitmap), SIG_EVERYWHERE, "(.*)", NULL, NULL },
{ MAP_CALL(AddLine), SIG_EVERYWHERE, "oiiiiiiiii", NULL, NULL },
Expand Down
118 changes: 65 additions & 53 deletions engines/sci/engine/kgraphics32.cpp
View file
Expand Up @@ -174,41 +174,53 @@ reg_t kIsOnMe(EngineState *s, int argc, reg_t *argv) {
}

reg_t kCreateTextBitmap(EngineState *s, int argc, reg_t *argv) {
switch (argv[0].toUint16()) {
case 0: {
if (argc != 4) {
warning("kCreateTextBitmap(0): expected 4 arguments, got %i", argc);
return NULL_REG;
}
reg_t object = argv[3];
Common::String text = s->_segMan->getString(readSelector(s->_segMan, object, SELECTOR(text)));
debugC(kDebugLevelStrings, "kCreateTextBitmap case 0 (%04x:%04x, %04x:%04x, %04x:%04x)",
PRINT_REG(argv[1]), PRINT_REG(argv[2]), PRINT_REG(argv[3]));
debugC(kDebugLevelStrings, "%s", text.c_str());
int16 maxWidth = argv[1].toUint16();
int16 maxHeight = argv[2].toUint16();
g_sci->_gfxCoordAdjuster->fromScriptToDisplay(maxHeight, maxWidth);
// These values can be larger than the screen in the SQ6 demo, room 100
// TODO: Find out why. For now, don't show any text in that room.
if (g_sci->getGameId() == GID_SQ6 && g_sci->isDemo() && s->currentRoomNumber() == 100)
return NULL_REG;
return g_sci->_gfxText32->createTextBitmap(object, maxWidth, maxHeight);
}
case 1: {
if (argc != 2) {
warning("kCreateTextBitmap(1): expected 2 arguments, got %i", argc);
return NULL_REG;
}
reg_t object = argv[1];
Common::String text = s->_segMan->getString(readSelector(s->_segMan, object, SELECTOR(text)));
debugC(kDebugLevelStrings, "kCreateTextBitmap case 1 (%04x:%04x)", PRINT_REG(argv[1]));
debugC(kDebugLevelStrings, "%s", text.c_str());
return g_sci->_gfxText32->createTextBitmap(object);
}
default:
warning("CreateTextBitmap(%d)", argv[0].toUint16());
SegManager *segMan = s->_segMan;

int16 subop = argv[0].toUint16();

int16 width;
int16 height;
reg_t object;

if (subop == 0) {
width = argv[1].toUint16();
height = argv[2].toUint16();
object = argv[3];
} else if (subop == 1) {
object = argv[1];
} else {
warning("Invalid kCreateTextBitmap subop %d", subop);
return NULL_REG;
}

Common::String text = segMan->getString(readSelector(segMan, object, SELECTOR(text)));
int16 foreColor = readSelectorValue(segMan, object, SELECTOR(fore));
int16 backColor = readSelectorValue(segMan, object, SELECTOR(back));
int16 skipColor = readSelectorValue(segMan, object, SELECTOR(skip));
GuiResourceId fontId = (GuiResourceId)readSelectorValue(segMan, object, SELECTOR(font));
int16 borderColor = readSelectorValue(segMan, object, SELECTOR(borderColor));
int16 dimmed = readSelectorValue(segMan, object, SELECTOR(dimmed));

Common::Rect rect(
readSelectorValue(segMan, object, SELECTOR(textLeft)),
readSelectorValue(segMan, object, SELECTOR(textTop)),
readSelectorValue(segMan, object, SELECTOR(textRight)),
readSelectorValue(segMan, object, SELECTOR(textBottom))
);

if (subop == 0) {
TextAlign alignment = (TextAlign)readSelectorValue(segMan, object, SELECTOR(mode));
reg_t out;
return g_sci->_gfxText32->createFontBitmap(width, height, rect, text, foreColor, backColor, skipColor, fontId, alignment, borderColor, dimmed, 1, &out);
} else {
CelInfo32 celInfo;
celInfo.type = kCelTypeView;
celInfo.resourceId = readSelectorValue(segMan, object, SELECTOR(view));
celInfo.loopNo = readSelectorValue(segMan, object, SELECTOR(loop));
celInfo.celNo = readSelectorValue(segMan, object, SELECTOR(cel));
reg_t out;
return g_sci->_gfxText32->createTitledFontBitmap(celInfo, rect, text, foreColor, backColor, fontId, skipColor, borderColor, dimmed, &out);
}
}

reg_t kDisposeTextBitmap(EngineState *s, int argc, reg_t *argv) {
Expand Down Expand Up @@ -455,34 +467,26 @@ reg_t kScrollWindow(EngineState *s, int argc, reg_t *argv) {
}
#endif

reg_t kSetFontRes(EngineState *s, int argc, reg_t *argv) {
// TODO: This defines the resolution that the fonts are supposed to be displayed
// in. Currently, this is only used for showing high-res fonts in GK1 Mac, but
// should be extended to handle other font resolutions such as those

int xResolution = argv[0].toUint16();
//int yResolution = argv[1].toUint16();

g_sci->_gfxScreen->setFontIsUpscaled(xResolution == 640 &&
g_sci->_gfxScreen->getUpscaledHires() != GFX_SCREEN_UPSCALED_DISABLED);

return s->r_acc;
}

reg_t kFont(EngineState *s, int argc, reg_t *argv) {
// Handle font settings for SCI2.1
// TODO: Handle font settings for SCI2.1

switch (argv[0].toUint16()) {
case 1:
// Set font resolution
return kSetFontRes(s, argc - 1, argv + 1);
g_sci->_gfxText32->_scaledWidth = argv[1].toUint16();
g_sci->_gfxText32->_scaledHeight = argv[2].toUint16();
return NULL_REG;
default:
warning("kFont: unknown subop %d", argv[0].toUint16());
error("kFont: unknown subop %d", argv[0].toUint16());
}

return s->r_acc;
}

// TODO: Is this actually a thing??
reg_t kSetFontRes(EngineState *s, int argc, reg_t *argv) {
return kStub(s, argc, argv);
}

// TODO: Eventually, all of the kBitmap operations should be put
// in a separate class

Expand Down Expand Up @@ -516,8 +520,16 @@ reg_t kBitmap(EngineState *s, int argc, reg_t *argv) {
memset(memoryPtr + BITMAP_HEADER_SIZE, back, width * height);
// Save totalWidth, totalHeight
// TODO: Save the whole bitmap header, like SSCI does
WRITE_LE_UINT16(memoryPtr, width);
WRITE_LE_UINT16(memoryPtr + 2, height);
WRITE_SCI11ENDIAN_UINT16(memoryPtr, width);
WRITE_SCI11ENDIAN_UINT16(memoryPtr + 2, height);
WRITE_SCI11ENDIAN_UINT16(memoryPtr + 4, 0);
WRITE_SCI11ENDIAN_UINT16(memoryPtr + 6, 0);
memoryPtr[8] = 0;
WRITE_SCI11ENDIAN_UINT16(memoryPtr + 10, 0);
WRITE_SCI11ENDIAN_UINT16(memoryPtr + 20, BITMAP_HEADER_SIZE);
WRITE_SCI11ENDIAN_UINT32(memoryPtr + 28, 46);
WRITE_SCI11ENDIAN_UINT16(memoryPtr + 36, width);
WRITE_SCI11ENDIAN_UINT16(memoryPtr + 38, width);
return memoryId;
}
break;
Expand Down
5 changes: 5 additions & 0 deletions engines/sci/engine/selector.cpp
View file
Expand Up @@ -179,6 +179,7 @@ void Kernel::mapSelectors() {
FIND_SELECTOR(fore);
FIND_SELECTOR(back);
FIND_SELECTOR(skip);
FIND_SELECTOR(borderColor);
FIND_SELECTOR(fixPriority);
FIND_SELECTOR(mirrored);
FIND_SELECTOR(visible);
Expand All @@ -187,6 +188,10 @@ void Kernel::mapSelectors() {
FIND_SELECTOR(inLeft);
FIND_SELECTOR(inBottom);
FIND_SELECTOR(inRight);
FIND_SELECTOR(textTop);
FIND_SELECTOR(textLeft);
FIND_SELECTOR(textBottom);
FIND_SELECTOR(textRight);
FIND_SELECTOR(magnifier);
#endif
}
Expand Down
2 changes: 2 additions & 0 deletions engines/sci/engine/selector.h
View file
Expand Up @@ -146,13 +146,15 @@ struct SelectorCache {
Selector back;
Selector skip;
Selector dimmed;
Selector borderColor;

Selector fixPriority;
Selector mirrored;
Selector visible;

Selector useInsetRect;
Selector inTop, inLeft, inBottom, inRight;
Selector textTop, textLeft, textBottom, textRight;

Selector magnifier;
#endif
Expand Down
11 changes: 11 additions & 0 deletions engines/sci/graphics/helpers.h
View file
Expand Up @@ -127,6 +127,17 @@ struct Window : public Port, public Common::Serializable {
};

#ifdef ENABLE_SCI32
/**
* Multiplies a rectangle by two ratios with default
* rounding. Modifies the rect directly.
*/
inline void mul(Common::Rect &rect, const Common::Rational &ratioX, const Common::Rational &ratioY) {
rect.left = (rect.left * ratioX).toInt();
rect.top = (rect.top * ratioY).toInt();
rect.right = (rect.right * ratioX).toInt();
rect.bottom = (rect.bottom * ratioY).toInt();
}

/**
* Multiplies a number by a rational number, rounding up to
* the nearest whole number.
Expand Down

0 comments on commit 20ccad8

Please sign in to comment.