libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-16 22:58:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ZVISION: Update renderImageToScreen to handle TGZ image files

Browse Source
This commit is contained in:
richiesams 2013-07-07 10:35:56 -05:00
parent 89693d4074
commit 399e512be2
3 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
engines/zvision/console.cpp
View File

@ -34,11 +34,11 @@ namespace ZVision {
}
bool Console::cmdLoadImage(int argc, const char **argv) {
if (argc != 6) {
DebugPrintf("Use loadimage <fileName> <x> <y> <width> <height> to load an image to the screen");
if (argc != 4) {
DebugPrintf("Use loadimage <fileName> <x> <y> to load an image to the screen");
return false;
}
_engine->renderImageToScreen(argv[1], atoi(argv[2]), atoi(argv[3]), atoi(argv[4]), atoi(argv[5]));
_engine->renderImageToScreen(argv[1], atoi(argv[2]), atoi(argv[3]));
return true;
}

46
engines/zvision/image.cpp
View File

@ -28,25 +28,55 @@
#include "graphics/decoders/tga.h"
#include "zvision/zvision.h"
#include "zvision/lzss_read_stream.h"
namespace ZVision {
void ZVision::renderImageToScreen(const Common::String &fileName, uint32 x, uint32 y, uint32 width, uint32 height) {
void ZVision::renderImageToScreen(const Common::String &fileName, uint32 x, uint32 y) {
Common::File file;
if (file.open(fileName)) {
Graphics::TGADecoder tga;
if (!tga.loadStream(file))
error("Error while reading TGA image");
file.close();
// Read the magic number
// Some files are true TGA, while others are TGZ
char fileType[4];
file.read(fileType, 4);
const Graphics::Surface *tgaSurface = tga.getSurface();
// Check for true TGA files
if (fileType[0] == 'T' && fileType[1] == 'G' && fileType[2] == 'A' && fileType[3] == '\0') {
// Reset the cursor
file.seek(0);
_system->copyRectToScreen(tgaSurface->pixels, tgaSurface->pitch, x, y, width, height);
// Decode
Graphics::TGADecoder tga;
if (!tga.loadStream(file))
error("Error while reading TGA image");
file.close();
const Graphics::Surface *tgaSurface = tga.getSurface();
_system->copyRectToScreen(tgaSurface->pixels, tgaSurface->pitch, x, y, tgaSurface->w, tgaSurface->h);
tga.destroy();
} else {
// TGZ files have a header and then Bitmap data that is compressed with LZSS
uint32 decompressedSize = file.readSint32LE();
uint32 width = file.readSint32LE();
uint32 height = file.readSint32LE();
LzssReadStream stream(&file, false, decompressedSize);
byte *buffer = new byte[stream.currentSize()];
stream.read(buffer, stream.currentSize());
//Graphics::PixelFormat format(16, 5, 6, 5, 0, 11, 5, 0, 0);
// Graphics::PixelFormat format(16, 5, 5, 5, 1, 11, 6, 1, 0);
_system->copyRectToScreen(buffer, width * 2, x, y, width, height);
}
tga.destroy();
_needsScreenUpdate = true;
} else {
error("Could not open file %s", fileName.c_str());
}
}

2
engines/zvision/zvision.h
View File

@ -71,7 +71,7 @@ public:
virtual Common::Error run();
ScriptManager *getScriptManager() const;
Common::RandomSource *getRandomSource() const;
void renderImageToScreen(const Common::String &fileName, uint32 x, uint32 y, uint32 width, uint32 height);
void renderImageToScreen(const Common::String &fileName, uint32 x, uint32 y);
private:
void initialize();