aboutsummaryrefslogtreecommitdiff
path: root/engines/prince
diff options
context:
space:
mode:
authorlukaslw2014-07-31 23:02:43 +0200
committerlukaslw2014-07-31 23:02:43 +0200
commitd8853725a6c8e4830dbfe813f94ca364794779af (patch)
treeb17c454c649d9a287a88fbcffc5badebcb371b27 /engines/prince
parent34f496c38a84347d54c47812a1e7c59001c444ec (diff)
downloadscummvm-rg350-d8853725a6c8e4830dbfe813f94ca364794779af.tar.gz
scummvm-rg350-d8853725a6c8e4830dbfe813f94ca364794779af.tar.bz2
scummvm-rg350-d8853725a6c8e4830dbfe813f94ca364794779af.zip
PRINCE: Animations - update, optimization
Diffstat (limited to 'engines/prince')
-rw-r--r--engines/prince/animation.cpp81
-rw-r--r--engines/prince/animation.h8
2 files changed, 52 insertions, 37 deletions
diff --git a/engines/prince/animation.cpp b/engines/prince/animation.cpp
index f5beb8674f..39040a5181 100644
--- a/engines/prince/animation.cpp
+++ b/engines/prince/animation.cpp
@@ -28,6 +28,23 @@
namespace Prince {
+Animation::Animation() : _idXDiff(0), _idYDiff(0), _loopCount(0), _phaseCount(0), _frameCount(0), _baseX(0), _baseY(0)
+{
+}
+
+Animation::~Animation() {
+ clear();
+}
+
+void Animation::clear() {
+ _phaseList.clear();
+ for (int i = 0; i < _frameCount; i++) {
+ _frameList[i]._surface->free();
+ delete _frameList[i]._surface;
+ _frameList[i]._surface = nullptr;
+ }
+}
+
bool Animation::loadFromStream(Common::SeekableReadStream &stream) {
_idXDiff = stream.readByte();
_idYDiff = stream.readByte();
@@ -56,6 +73,7 @@ bool Animation::loadFromStream(Common::SeekableReadStream &stream) {
_frameCount++;
}
+ Frame tempFrame;
for (int frame = 0; frame < _frameCount; frame++) {
stream.seek(tableOfFrameOffsets + frame * 4);
uint32 frameInfoOffset = stream.readUint32LE();
@@ -65,52 +83,28 @@ bool Animation::loadFromStream(Common::SeekableReadStream &stream) {
uint32 frameDataPos = stream.pos();
uint32 frameDataOffset = stream.readUint32BE();
- Graphics::Surface *surf = new Graphics::Surface();
- surf->create(frameWidth, frameHeight, Graphics::PixelFormat::createFormatCLUT8());
+ tempFrame._surface = new Graphics::Surface();
+ tempFrame._surface->create(frameWidth, frameHeight, Graphics::PixelFormat::createFormatCLUT8());
if (frameDataOffset == MKTAG('m', 'a', 's', 'm')) {
- // Compressed
- Decompressor dec;
- uint32 ddataSize = stream.readUint32LE();
- byte *data = (byte *)malloc(ddataSize);
- byte *ddata = (byte *)malloc(ddataSize);
-
- stream.read(data, ddataSize);
- dec.decompress(data, ddata, ddataSize);
- for (uint16 i = 0; i < frameHeight; i++) {
- memcpy(surf->getBasePtr(0, i), ddata + frameWidth * i, frameWidth);
- }
- free(ddata);
- free(data);
+ tempFrame._isCompressed = true;
+ tempFrame._dataSize = stream.readUint32LE();
+ tempFrame._compressedData = (byte *)malloc(tempFrame._dataSize);
+ stream.read(tempFrame._compressedData, tempFrame._dataSize);
} else {
+ tempFrame._isCompressed = false;
+ tempFrame._dataSize = 0;
+ tempFrame._compressedData = nullptr;
stream.seek(frameDataPos);
- // Uncompressed
for (uint16 i = 0; i < frameHeight; i++) {
- stream.read(surf->getBasePtr(0, i), frameWidth);
+ stream.read(tempFrame._surface->getBasePtr(0, i), frameWidth);
}
}
- _frameList.push_back(surf);
+ _frameList.push_back(tempFrame);
}
return true;
}
-Animation::Animation() : _idXDiff(0), _idYDiff(0), _loopCount(0), _phaseCount(0), _frameCount(0), _baseX(0), _baseY(0)
-{
-}
-
-Animation::~Animation() {
- clear();
-}
-
-void Animation::clear() {
- _phaseList.clear();
- for (int i = 0; i < _frameCount; i++) {
- _frameList[i]->free();
- delete _frameList[i];
- _frameList[i] = nullptr;
- }
-}
-
bool Animation::testId() const {
if (_idXDiff == 'A' && _idYDiff == 'N') {
return true;
@@ -172,7 +166,22 @@ int16 Animation::getPhaseFrameIndex(int phaseIndex) const {
Graphics::Surface *Animation::getFrame(int frameIndex) {
if (frameIndex < _frameCount) {
- return _frameList[frameIndex];
+ if (_frameList[frameIndex]._isCompressed) {
+ Decompressor dec;
+ byte *ddata = (byte *)malloc(_frameList[frameIndex]._dataSize);
+ dec.decompress(_frameList[frameIndex]._compressedData, ddata, _frameList[frameIndex]._dataSize);
+ int frameHeight = _frameList[frameIndex]._surface->h;
+ int frameWidth = _frameList[frameIndex]._surface->w;
+ for (uint16 i = 0; i < frameHeight; i++) {
+ memcpy(_frameList[frameIndex]._surface->getBasePtr(0, i), ddata + frameWidth * i, frameWidth);
+ }
+ free(ddata);
+ free(_frameList[frameIndex]._compressedData);
+ _frameList[frameIndex]._compressedData = nullptr;
+ _frameList[frameIndex]._dataSize = 0;
+ _frameList[frameIndex]._isCompressed = false;
+ }
+ return _frameList[frameIndex]._surface;
} else {
error("getFrame() frameIndex: %d, frameCount: %d", frameIndex, _frameCount);
}
diff --git a/engines/prince/animation.h b/engines/prince/animation.h
index 23a1b5808a..0634d7a937 100644
--- a/engines/prince/animation.h
+++ b/engines/prince/animation.h
@@ -56,7 +56,13 @@ private:
int16 _phaseOffsetY;
uint16 _phaseToFrameIndex;
};
- Common::Array<Graphics::Surface *> _frameList;
+ struct Frame {
+ bool _isCompressed;
+ uint32 _dataSize;
+ byte *_compressedData;
+ Graphics::Surface *_surface;
+ };
+ Common::Array<Frame> _frameList;
Common::Array<Phase> _phaseList;
int8 _idXDiff;
int8 _idYDiff;