diff options
| author | richiesams | 2013-08-29 01:58:12 -0500 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-09-24 13:59:38 +0200 |
| commit | 0271a2c59dd553b79cae95376b40654a70190089 (patch) | |
| tree | 7c7c2932ed9e53a2265aedb880b515da7f4f7700 | |
| parent | c15454d7d4a8b670f6e71f035f5b8439166e71e1 (diff) | |
| download | scummvm-rg350-0271a2c59dd553b79cae95376b40654a70190089.tar.gz scummvm-rg350-0271a2c59dd553b79cae95376b40654a70190089.tar.bz2 scummvm-rg350-0271a2c59dd553b79cae95376b40654a70190089.zip | |
ZVISION: Transpose is done in RenderManager::readImageToSurface(), so remove it from mutateImage
| -rw-r--r-- | engines/zvision/render_table.cpp | 8 | ||||
| -rw-r--r-- | engines/zvision/render_table.h | 2 |
2 files changed, 3 insertions, 7 deletions
diff --git a/engines/zvision/render_table.cpp b/engines/zvision/render_table.cpp index 0a8175e54e..ee3628299a 100644 --- a/engines/zvision/render_table.cpp +++ b/engines/zvision/render_table.cpp @@ -98,7 +98,7 @@ uint16 mixTwoRGB(uint16 colorOne, uint16 colorTwo, float percentColorOne) { return returnColor; } -void RenderTable::mutateImage(uint16 *sourceBuffer, uint16* destBuffer, int16 imageWidth, int16 imageHeight, int16 destinationX, int16 destinationY, const Common::Rect &subRect, bool wrap, bool isTransposed) { +void RenderTable::mutateImage(uint16 *sourceBuffer, uint16* destBuffer, int16 imageWidth, int16 imageHeight, int16 destinationX, int16 destinationY, const Common::Rect &subRect, bool wrap) { for (int16 y = subRect.top; y < subRect.bottom; y++) { int16 normalizedY = y - subRect.top; int32 internalColumnIndex = (normalizedY + destinationY) * _numColumns; @@ -135,11 +135,7 @@ void RenderTable::mutateImage(uint16 *sourceBuffer, uint16* destBuffer, int16 im sourceXIndex = CLIP<int16>(sourceXIndex, 0, imageWidth - 1); } - if (isTransposed) { - destBuffer[destColumnIndex + normalizedX] = sourceBuffer[sourceXIndex * imageHeight + sourceYIndex]; - } else { - destBuffer[destColumnIndex + normalizedX] = sourceBuffer[sourceYIndex * imageWidth + sourceXIndex]; - } + destBuffer[destColumnIndex + normalizedX] = sourceBuffer[sourceYIndex * imageWidth + sourceXIndex]; } } } diff --git a/engines/zvision/render_table.h b/engines/zvision/render_table.h index bbf5e1b22a..e5820803cb 100644 --- a/engines/zvision/render_table.h +++ b/engines/zvision/render_table.h @@ -66,7 +66,7 @@ public: const Common::Point convertWarpedCoordToFlatCoord(const Common::Point &point); - void mutateImage(uint16 *sourceBuffer, uint16* destBuffer, int16 imageWidth, int16 imageHeight, int16 destinationX, int16 destinationY, const Common::Rect &subRect, bool wrap, bool isTransposed); + void mutateImage(uint16 *sourceBuffer, uint16* destBuffer, int16 imageWidth, int16 imageHeight, int16 destinationX, int16 destinationY, const Common::Rect &subRect, bool wrap); void generateRenderTable(); void setPanoramaFoV(float fov); |