[Scummvm-cvs-logs] SF.net SVN: scummvm: [21670] scummvm/trunk/engines/simon
kirben at users.sourceforge.net
kirben at users.sourceforge.net
Fri Apr 7 07:28:09 CEST 2006
Revision: 21670
Author: kirben
Date: 2006-04-07 07:27:28 -0700 (Fri, 07 Apr 2006)
ViewCVS: http://svn.sourceforge.net/scummvm/?rev=21670&view=rev
Log Message:
-----------
Cleanup and split scrolling code
Modified Paths:
--------------
scummvm/trunk/engines/simon/res.cpp
scummvm/trunk/engines/simon/simon.h
scummvm/trunk/engines/simon/vga.cpp
Modified: scummvm/trunk/engines/simon/res.cpp
===================================================================
--- scummvm/trunk/engines/simon/res.cpp 2006-04-07 13:39:59 UTC (rev 21669)
+++ scummvm/trunk/engines/simon/res.cpp 2006-04-07 14:27:28 UTC (rev 21670)
@@ -128,6 +128,13 @@
return READ_BE_UINT16(src);
}
+uint32 SimonEngine::readUint32Wrapper(const void *src) {
+ if (getGameType() == GType_FF)
+ return READ_LE_UINT32(src);
+ else
+ return READ_BE_UINT32(src);
+}
+
void SimonEngine::loadOffsets(const char *filename, int number, uint32 &file, uint32 &offset, uint32 &srcSize, uint32 &dstSize) {
Common::File in;
Modified: scummvm/trunk/engines/simon/simon.h
===================================================================
--- scummvm/trunk/engines/simon/simon.h 2006-04-07 13:39:59 UTC (rev 21669)
+++ scummvm/trunk/engines/simon/simon.h 2006-04-07 14:27:28 UTC (rev 21670)
@@ -464,6 +464,7 @@
protected:
uint16 to16Wrapper(uint value);
uint16 readUint16Wrapper(const void *src);
+ uint32 readUint32Wrapper(const void *src);
int allocGamePcVars(Common::File *in);
void setUserFlag(Item *item, int a, int b);
@@ -996,7 +997,10 @@
void drawImages_Feeble(VC10_state *state);
bool drawImages_clip(VC10_state *state);
void scaleClip(int16 h, int16 w, int16 y, int16 x, int16 scrollY);
+ void horizontalScroll(VC10_state *state);
+ void verticalScroll(VC10_state *state);
+
void delete_vga_timer(VgaTimerEntry * vte);
void vcResumeSprite(const byte *code_ptr, uint16 cur_file, uint16 cur_sprite);
int vcReadVarOrWord();
Modified: scummvm/trunk/engines/simon/vga.cpp
===================================================================
--- scummvm/trunk/engines/simon/vga.cpp 2006-04-07 13:39:59 UTC (rev 21669)
+++ scummvm/trunk/engines/simon/vga.cpp 2006-04-07 14:27:28 UTC (rev 21670)
@@ -689,9 +689,6 @@
width = READ_LE_UINT16(p2 + 6);
height = READ_LE_UINT16(p2 + 4) & 0x7FFF;
flags = p2[5];
-
- debug(1, "vc10_draw: image %d palette %d x %d y %d drawFlags 0x0%x\n", state.image, state.palette, state.x, state.y, state.flags);
- debug(1, "vc10_draw: width %d height %d flags 0x%x", width, height, flags);
} else {
state.depack_src = _curVgaFile2 + READ_BE_UINT32(p2);
width = READ_BE_UINT16(p2 + 6) / 16;
@@ -721,65 +718,21 @@
}
}
- if (getGameType() == GType_FF) {
- if (width > 640) {
- debug(0, "Horizontal scrolling");
+ state.width = state.draw_width = width; /* cl */
+ state.height = state.draw_height = height; /* ch */
- const byte *src;
- byte *dst;
- uint w;
+ state.depack_cont = -0x80;
- _scrollXMax = width - 640;
- _scrollYMax = 0;
- _scrollImage = state.depack_src;
- _scrollHeight = height;
- if (_variableArray[34] == -1)
- state.x = _variableArray[251];
+ state.x_skip = 0; /* colums to skip = bh */
+ state.y_skip = 0; /* rows to skip = bl */
- _scrollX = state.x;
-
- vcWriteVar(251, _scrollX);
-
- dst = getBackBuf();
- src = state.depack_src + _scrollX / 2;
-
- for (w = 0; w < 80; w++) {
- decodeStripA(dst, src + READ_LE_UINT32(src), height);
- dst += 8;
- src += 4;
- }
-
- return;
- }
- if (height > 480) {
- debug(0, "Vertical scrolling not supported");
- return;
- }
+ uint maxWidth = (getGameType() == GType_FF) ? 640 : 20;
+ if ((getGameType() == GType_SIMON2 || getGameType() == GType_FF) && width > maxWidth) {
+ horizontalScroll(&state);
+ return;
}
- if (getGameType() == GType_SIMON2 && width > 20) {
- const byte *src;
- byte *dst;
- uint w;
-
- _scrollXMax = width * 2 - 40;
- _scrollImage = state.depack_src;
- _scrollHeight = height;
- if (_variableArray[34] == -1)
- state.x = _variableArray[251];
-
- _scrollX = state.x;
-
- vcWriteVar(251, _scrollX);
-
- dst = getBackBuf();
- src = state.depack_src + _scrollX * 4;
-
- for (w = 0; w < 40; w++) {
- decodeStripA(dst, src + READ_BE_UINT32(src), height);
- dst += 8;
- src += 4;
- }
-
+ if (getGameType() == GType_FF && height > 480) {
+ verticalScroll(&state);
return;
}
@@ -791,14 +744,6 @@
}
}
- state.width = state.draw_width = width; /* cl */
- state.height = state.draw_height = height; /* ch */
-
- state.depack_cont = -0x80;
-
- state.x_skip = 0; /* colums to skip = bh */
- state.y_skip = 0; /* rows to skip = bl */
-
state.surf2_addr = getFrontBuf();
state.surf2_pitch = _dxSurfacePitch;
@@ -1033,70 +978,6 @@
}
}
-void SimonEngine::scaleClip(int16 h, int16 w, int16 y, int16 x, int16 scrollY) {
- Common::Rect srcRect, dstRect;
- float factor, xscale;
-
- srcRect.left = 0;
- srcRect.top = 0;
- srcRect.right = w;
- srcRect.bottom = h;
-
- if (scrollY > _baseY)
- factor = 1 + ((scrollY - _baseY) * _scale);
- else
- factor = 1 - ((_baseY - scrollY) * _scale);
-
- xscale = ((w * factor) / 2);
-
- dstRect.left = (int16)(x - xscale);
- if (dstRect.left > _screenWidth - 1)
- return;
- dstRect.top = (int16)(y - (h * factor));
- if (dstRect.top > _screenHeight - 1)
- return;
-
- dstRect.right = (int16)(x + xscale);
- dstRect.bottom = y;
-
- _feebleRect = dstRect;
-
- _variableArray[20] = _feebleRect.top;
- _variableArray[21] = _feebleRect.left;
- _variableArray[22] = _feebleRect.bottom;
- _variableArray[23] = _feebleRect.right;
-
- debug(1, "Left %d Right %d Top %d Bottom %d", dstRect.left, dstRect.right, dstRect.top, dstRect.bottom);
-
- // Unlike normal rectangles in ScummVM, it seems that in the case of
- // the destination rectangle the bottom and right coordinates are
- // considered to be inside the rectangle. For the source rectangle,
- // I believe that they are not.
-
- int scaledW = dstRect.width() + 1;
- int scaledH = dstRect.height() + 1;
-
- byte *src = getScaleBuf();
- byte *dst = getBackBuf();
-
- dst += _dxSurfacePitch * dstRect.top + dstRect.left;
-
- for (int dstY = 0; dstY < h; dstY++) {
- if (dstRect.top + dstY >= 0 && dstRect.top + dstY < _screenHeight) {
- int srcY = (dstY * h) / scaledH;
- byte *srcPtr = src + _dxSurfacePitch * srcY;
- byte *dstPtr = dst + _dxSurfacePitch * dstY;
- for (int dstX = 0; dstX < w; dstX++) {
- if (dstRect.left + dstX >= 0 && dstRect.left + dstX < _screenWidth) {
- int srcX = (dstX * w) / scaledW;
- if (srcPtr[srcX])
- dstPtr[dstX] = srcPtr[srcX];
- }
- }
- }
- }
-}
-
void SimonEngine::drawImages(VC10_state *state) {
const uint16 *vlut = &_video_windows[_windowNum * 4];
@@ -1374,6 +1255,131 @@
}
}
+void SimonEngine::horizontalScroll(VC10_state *state) {
+ const byte *src;
+ byte *dst;
+ int w;
+
+ if (getGameType() == GType_FF)
+ _scrollXMax = state->width - 640;
+ else
+ _scrollXMax = state->width * 2 - 40;
+ _scrollYMax = 0;
+ _scrollImage = state->depack_src;
+ _scrollHeight = state->height;
+ if (_variableArray[34] == -1)
+ state->x = _variableArray[251];
+
+ _scrollX = state->x;
+
+ vcWriteVar(251, _scrollX);
+
+ dst = getBackBuf();
+
+ if (getGameType() == GType_FF)
+ src = state->depack_src + _scrollX / 2;
+ else
+ src = state->depack_src + _scrollX * 4;
+
+ for (w = 0; w < _screenWidth; w += 8) {
+ decodeStripA(dst, src + readUint32Wrapper(src), state->height);
+ dst += 8;
+ src += 4;
+ }
+}
+
+void SimonEngine::verticalScroll(VC10_state *state) {
+ debug(0, "Vertical scrolling not supported");
+
+ const byte *src;
+ byte *dst;
+ int h;
+
+ _scrollXMax = 0;
+ _scrollYMax = state->height - 480;
+ _scrollImage = state->depack_src;
+ _scrollWidth = state->width;
+ if (_variableArray[34] == -1)
+ state->y = _variableArray[250];
+
+ _scrollY = state->y;
+
+ vcWriteVar(250, _scrollY);
+
+ dst = getBackBuf();
+ src = state->depack_src + _scrollY / 2;
+
+ for (h = 0; h < _screenHeight; h += 8) {
+ //decodeRow(dst, src + READ_BE_UINT32(src), state->width);
+ dst += 8;
+ src += 4;
+ }
+}
+
+void SimonEngine::scaleClip(int16 h, int16 w, int16 y, int16 x, int16 scrollY) {
+ Common::Rect srcRect, dstRect;
+ float factor, xscale;
+
+ srcRect.left = 0;
+ srcRect.top = 0;
+ srcRect.right = w;
+ srcRect.bottom = h;
+
+ if (scrollY > _baseY)
+ factor = 1 + ((scrollY - _baseY) * _scale);
+ else
+ factor = 1 - ((_baseY - scrollY) * _scale);
+
+ xscale = ((w * factor) / 2);
+
+ dstRect.left = (int16)(x - xscale);
+ if (dstRect.left > _screenWidth - 1)
+ return;
+ dstRect.top = (int16)(y - (h * factor));
+ if (dstRect.top > _screenHeight - 1)
+ return;
+
+ dstRect.right = (int16)(x + xscale);
+ dstRect.bottom = y;
+
+ _feebleRect = dstRect;
+
+ _variableArray[20] = _feebleRect.top;
+ _variableArray[21] = _feebleRect.left;
+ _variableArray[22] = _feebleRect.bottom;
+ _variableArray[23] = _feebleRect.right;
+
+ debug(1, "Left %d Right %d Top %d Bottom %d", dstRect.left, dstRect.right, dstRect.top, dstRect.bottom);
+
+ // Unlike normal rectangles in ScummVM, it seems that in the case of
+ // the destination rectangle the bottom and right coordinates are
+ // considered to be inside the rectangle. For the source rectangle,
+ // I believe that they are not.
+
+ int scaledW = dstRect.width() + 1;
+ int scaledH = dstRect.height() + 1;
+
+ byte *src = getScaleBuf();
+ byte *dst = getBackBuf();
+
+ dst += _dxSurfacePitch * dstRect.top + dstRect.left;
+
+ for (int dstY = 0; dstY < h; dstY++) {
+ if (dstRect.top + dstY >= 0 && dstRect.top + dstY < _screenHeight) {
+ int srcY = (dstY * h) / scaledH;
+ byte *srcPtr = src + _dxSurfacePitch * srcY;
+ byte *dstPtr = dst + _dxSurfacePitch * dstY;
+ for (int dstX = 0; dstX < w; dstX++) {
+ if (dstRect.left + dstX >= 0 && dstRect.left + dstX < _screenWidth) {
+ int srcX = (dstX * w) / scaledW;
+ if (srcPtr[srcX])
+ dstPtr[dstX] = srcPtr[srcX];
+ }
+ }
+ }
+ }
+}
+
void SimonEngine::vc11_clearPathFinder() {
memset(&_pathFindArray, 0, sizeof(_pathFindArray));
}
@@ -2519,5 +2525,4 @@
}
}
-
} // End of namespace Simon
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list