aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/sludge/builtin.cpp3
-rw-r--r--engines/sludge/graphics.h5
-rw-r--r--engines/sludge/loadsave.cpp8
-rw-r--r--engines/sludge/thumbnail.cpp247
-rw-r--r--engines/sludge/thumbnail.h34
5 files changed, 74 insertions, 223 deletions
diff --git a/engines/sludge/builtin.cpp b/engines/sludge/builtin.cpp
index a092518c26..d63eb972b5 100644
--- a/engines/sludge/builtin.cpp
+++ b/engines/sludge/builtin.cpp
@@ -47,7 +47,6 @@
#include "sludge/savedata.h"
#include "sludge/freeze.h"
#include "sludge/language.h"
-#include "sludge/thumbnail.h"
#include "sludge/sludge.h"
#include "sludge/utf8.h"
#include "sludge/graphics.h"
@@ -2440,7 +2439,7 @@ builtIn(showThumbnail) {
Common::String aaaaa = getTextFromAnyVar(fun->stack->thisVar);
trimStack(fun->stack);
Common::String file = encodeFilename(aaaaa);
- showThumbnail(file, x, y);
+ g_sludge->_gfxMan->showThumbnail(file, x, y);
return BR_CONTINUE;
}
diff --git a/engines/sludge/graphics.h b/engines/sludge/graphics.h
index bb84b0b1fb..063006df1d 100644
--- a/engines/sludge/graphics.h
+++ b/engines/sludge/graphics.h
@@ -163,6 +163,11 @@ public:
void saveColors(Common::WriteStream *stream);
void loadColors(Common::SeekableReadStream *stream);
+ // Thumb nail
+ bool saveThumbnail(Common::WriteStream *stream);
+ bool skipThumbnail(Common::SeekableReadStream *stream);
+ void showThumbnail(const Common::String &filename, int x, int y);
+
private:
SludgeEngine *_vm;
diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 1588ffdc01..21c80f7e25 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -44,7 +44,6 @@
#include "sludge/sound.h"
#include "sludge/loadsave.h"
#include "sludge/bg_effects.h"
-#include "sludge/thumbnail.h"
#include "sludge/utf8.h"
#include "sludge/version.h"
#include "sludge/graphics.h"
@@ -354,7 +353,7 @@ bool saveGame(const Common::String &fname) {
fp->writeByte(MAJOR_VERSION);
fp->writeByte(MINOR_VERSION);
- if (!saveThumbnail(fp))
+ if (!g_sludge->_gfxMan->saveThumbnail(fp))
return false;
fp->write(&fileTime, sizeof(FILETIME));
@@ -481,11 +480,10 @@ bool loadGame(const Common::String &fname) {
int majVersion = fp->readByte();
int minVersion = fp->readByte();
- ssgVersion = majVersion * 256 + minVersion;
-
+ ssgVersion = VERSION(majVersion, minVersion);
if (ssgVersion >= VERSION(1, 4)) {
- if (!skipThumbnail(fp))
+ if (!g_sludge->_gfxMan->skipThumbnail(fp))
return fatal(ERROR_GAME_LOAD_CORRUPT, fname);
}
diff --git a/engines/sludge/thumbnail.cpp b/engines/sludge/thumbnail.cpp
index 424feb40dd..285b43ad86 100644
--- a/engines/sludge/thumbnail.cpp
+++ b/engines/sludge/thumbnail.cpp
@@ -20,8 +20,13 @@
*
*/
+#include "common/savefile.h"
+#include "image/png.h"
+
#include "sludge/allfiles.h"
#include "sludge/errors.h"
+#include "sludge/graphics.h"
+#include "sludge/imgloader.h"
#include "sludge/moreio.h"
#include "sludge/sludger.h"
#include "sludge/backdrop.h"
@@ -30,157 +35,68 @@
namespace Sludge {
-bool freeze();
-void unfreeze(bool); // Because FREEZE.H needs a load of other includes
-
int thumbWidth = 0, thumbHeight = 0;
-bool saveThumbnail(Common::WriteStream *stream) {
-#if 0
- GLuint thumbnailTextureName = 0;
+bool GraphicsManager::saveThumbnail(Common::WriteStream *stream) {
- fp->writeUint32LE(thumbWidth);
- fp->writeUint32LE(thumbHeight);
+ stream->writeUint32LE(thumbWidth);
+ stream->writeUint32LE(thumbHeight);
if (thumbWidth && thumbHeight) {
- if (! freeze()) return false;
-
- setPixelCoords(true);
-#if 0
- glUseProgram(shader.texture);
-
- setPMVMatrix(shader.texture);
-
- glGenTextures(1, &thumbnailTextureName);
- glBindTexture(GL_TEXTURE_2D, thumbnailTextureName);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-
- texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, thumbWidth, thumbHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, 0, thumbnailTextureName);
-
- // Render the backdrop (scaled)
- //glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
- glBindTexture(GL_TEXTURE_2D, backdropTextureName);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-
- const GLfloat vertices[] = {
- 0., 0., 0.,
- thumbWidth - 1.f, 0., 0.,
- 0., thumbHeight - 1.f, 0.,
- thumbWidth - 1.f, thumbHeight - 1.f, 0.
- };
-
- const GLfloat texCoords[] = {
- 0.0f, 0.0f,
- backdropTexW, 0.0f,
- 0.0f, backdropTexH,
- backdropTexW, backdropTexH
- };
-
- drawQuad(shader.texture, vertices, 1, texCoords);
-
- if (gameSettings.antiAlias < 0) {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
- } else {
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
- }
-
- deleteTextures(1, &thumbnailTextureName);
- thumbnailTextureName = 0;
-
- // Save Our ViewPort
- GLushort *image = new GLushort [thumbWidth * thumbHeight];
- GLuint *tmp = new GLuint [thumbWidth * thumbHeight];
- if (! checkNew(image)) return false;
- glReadPixels(viewportOffsetX, viewportOffsetY, thumbWidth, thumbHeight, GL_RGBA, GL_UNSIGNED_BYTE, tmp);
- for (int y = 0; y < thumbHeight; y++) {
- for (int x = 0; x < thumbWidth; x++) {
- const GLuint a = tmp[y * thumbWidth + x];
- image[y * thumbWidth + x] = ((a & 0x00f80000) >> (16 + 3)) | ((a & 0x0000fc00) >> (8 + 2 - 5)) | ((a & 0x000000f8) << (11 - 3));
- }
- }
- delete[] tmp;
+ if (!freeze())
+ return false;
- glUseProgram(0);
-#endif
- setPixelCoords(false);
+ if(!Image::writePNG(*stream, _renderSurface))
+ return false;
- for (int y = 0; y < thumbHeight; y++) {
- for (int x = 0; x < thumbWidth; x++) {
- put2bytes((*(image + y * thumbWidth + x)), fp);
- }
- }
- delete[] image;
- image = NULL;
unfreeze(true);
}
- fputc('!', fp);
-#endif
+ stream->writeByte('!');
return true;
}
-void showThumbnail(const Common::String &filename, int atX, int atY) {
-#if 0
- GLubyte *thumbnailTexture = NULL;
- GLuint thumbnailTextureName = 0;
+void GraphicsManager::showThumbnail(const Common::String &filename, int atX, int atY) {
+ Common::InSaveFile *fp = g_system->getSavefileManager()->openForLoading(filename);
+
+ if (fp == nullptr)
+ return;
+
+ bool headerBad = false;
+ if (fp->readByte() != 'S')
+ headerBad = true;
+ if (fp->readByte() != 'L')
+ headerBad = true;
+ if (fp->readByte() != 'U')
+ headerBad = true;
+ if (fp->readByte() != 'D')
+ headerBad = true;
+ if (fp->readByte() != 'S')
+ headerBad = true;
+ if (fp->readByte() != 'A')
+ headerBad = true;
+ if (headerBad) {
+ fatal(ERROR_GAME_LOAD_NO, filename);
+ return;
+ }
+ char c = fp->readByte();
+ while ((c = fp->readByte()))
+ ;
- GLfloat texCoordW = 1.0;
- GLfloat texCoordH = 1.0;
+ int majVersion = fp->readByte();
+ int minVersion = fp->readByte();
+ int ssgVersion = VERSION(majVersion, minVersion);
- int ssgVersion;
- FILE *fp = openAndVerify(filename, 'S', 'A', ERROR_GAME_LOAD_NO, ssgVersion);
if (ssgVersion >= VERSION(1, 4)) {
- if (fp == NULL) return;
int fileWidth = fp->readUint32LE();
int fileHeight = fp->readUint32LE();
- int picWidth = fileWidth;
- int picHeight = fileHeight;
- if (! NPOT_textures) {
- picWidth = getNextPOT(picWidth);
- picHeight = getNextPOT(picHeight);
- texCoordW = ((double)fileWidth) / picWidth;
- texCoordH = ((double)fileHeight) / picHeight;
-
- }
-
- thumbnailTexture = new GLubyte [picHeight * picWidth * 4];
- if (thumbnailTexture == NULL) return;
-
- int t1, t2;
- uint16 c;
- GLubyte *target;
- for (t2 = 0; t2 < fileHeight; t2++) {
- t1 = 0;
- while (t1 < fileWidth) {
- c = (uint16) fp->readUint16BE();
- target = thumbnailTexture + 4 * picWidth * t2 + t1 * 4;
- target[0] = (GLubyte) redValue(c);
- target[1] = (GLubyte) greenValue(c);
- target[2] = (GLubyte) blueValue(c);
- target[3] = (GLubyte) 255;
- t1++;
- }
- }
-
- fclose(fp);
+ Graphics::TransparentSurface thumbnail;
+ if (!ImgLoader::loadPNGImage(fp, &thumbnail))
+ return;
- glGenTextures(1, &thumbnailTextureName);
- glBindTexture(GL_TEXTURE_2D, thumbnailTextureName);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
- glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
+ delete fp;
+ fp = nullptr;
- texImage2D(GL_TEXTURE_2D, 0, GL_RGBA, picWidth, picHeight, 0, GL_RGBA, GL_UNSIGNED_BYTE, thumbnailTexture, thumbnailTextureName);
-
- delete thumbnailTexture;
- thumbnailTexture = NULL;
if (atX < 0) {
fileWidth += atX;
@@ -190,64 +106,31 @@ void showThumbnail(const Common::String &filename, int atX, int atY) {
fileHeight += atY;
atY = 0;
}
- if (fileWidth + atX > sceneWidth) fileWidth = sceneWidth - atX;
- if (fileHeight + atY > sceneHeight) fileHeight = sceneHeight - atY;
-
- setPixelCoords(true);
-
- glUseProgram(shader.texture);
- setPMVMatrix(shader.texture);
-
- int xoffset = 0;
- while (xoffset < fileWidth) {
- int w = (fileWidth - xoffset < viewportWidth) ? fileWidth - xoffset : viewportWidth;
-
- int yoffset = 0;
- while (yoffset < fileHeight) {
- int h = (fileHeight - yoffset < viewportHeight) ? fileHeight - yoffset : viewportHeight;
- glBindTexture(GL_TEXTURE_2D, thumbnailTextureName);
- const GLfloat vertices[] = {
- (GLfloat)fileWidth - 1.f - xoffset, (GLfloat) - yoffset, 0.,
- (GLfloat) - xoffset, (GLfloat) - yoffset, 0.,
- (GLfloat)fileWidth - 1.f - xoffset, (GLfloat)fileHeight - 1.f - yoffset, 0.,
- (GLfloat) - xoffset, (GLfloat)fileHeight - 1.f - yoffset, 0.
- };
-
- const GLfloat texCoords[] = {
- texCoordW, 0.0f,
- 0.0f, 0.0f,
- texCoordW, texCoordH,
- 0.0f, texCoordH
- };
-
- drawQuad(shader.texture, vertices, 1, texCoords);
- glDisable(GL_BLEND);
- // Copy Our ViewPort To The Texture
- copyTexSubImage2D(GL_TEXTURE_2D, 0, atX + xoffset, atY + yoffset, viewportOffsetX, viewportOffsetY, w, h, backdropTextureName);
-
- yoffset += viewportHeight;
- }
- xoffset += viewportWidth;
- }
- glUseProgram(0);
+ if (fileWidth + atX > (int)_sceneWidth)
+ fileWidth = _sceneWidth - atX;
+ if (fileHeight + atY > (int)_sceneHeight)
+ fileHeight = _sceneHeight - atY;
- setPixelCoords(false);
- deleteTextures(1, &thumbnailTextureName);
-
- thumbnailTextureName = 0;
+ thumbnail.blit(_backdropSurface, atX, atY, Graphics::FLIP_NONE, nullptr, TS_ARGB(255, 255, 255, 255), fileWidth, fileHeight);
+ thumbnail.free();
}
-#endif
}
-bool skipThumbnail(Common::SeekableReadStream *stream) {
-#if 0
+bool GraphicsManager::skipThumbnail(Common::SeekableReadStream *stream) {
thumbWidth = stream->readUint32LE();
thumbHeight = stream->readUint32LE();
- uint32 skippy = thumbWidth;
- skippy *= thumbHeight << 1;
- stream->seek(skippy, 1);
+
+ // Load image
+ Graphics::Surface tmp;
+ if (thumbWidth & thumbHeight) {
+ if (!ImgLoader::loadPNGImage(stream, &tmp))
+ return false;
+ else
+ tmp.free();
+ }
+
+ // Check flag
return (stream->readByte() == '!');
-#endif
return true;
}
diff --git a/engines/sludge/thumbnail.h b/engines/sludge/thumbnail.h
deleted file mode 100644
index 43c0e6b475..0000000000
--- a/engines/sludge/thumbnail.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* 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.
- *
- */
-#ifndef SLUDGE_THUMBNAIL_H
-#define SLUDGE_THUMBNAIL_H
-
-namespace Sludge {
-
-bool saveThumbnail(Common::WriteStream *stream);
-bool skipThumbnail(Common::SeekableReadStream *stream);
-
-void showThumbnail(const Common::String &filename, int x, int y);
-
-} // End of namespace Sludge
-
-#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-28 04:20:29 +0000