libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-03-05 17:57:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ACCESS: Decompress sprite resource frames immediately on creation

Browse Source
This commit is contained in:
Paul Gilbert 2014-08-10 16:55:06 -04:00
parent 47d75ae128
commit 6801cb0855
6 changed files with 80 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/access/access.cpp
View File

@ -45,7 +45,6 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
_destIn = nullptr;
_current = nullptr;
clearCellTable();
_pCount = 0;
_selectCommand = 0;
_normalMouse = true;
@ -82,6 +81,7 @@ AccessEngine::AccessEngine(OSystem *syst, const AccessGameDescription *gameDesc)
_intTim[3] = 0;
_timer[3] = 0;
_timerFlag = false;
Common::fill(&_objectsTable[0], &_objectsTable[100], (SpriteResource *)nullptr);
Common::fill(&_establishTable[0], &_establishTable[100], 0);
Common::fill(&_flags[0], &_flags[256], 0);
_establishFlag = false;

2
engines/access/amazon/amazon_room.cpp
View File

@ -123,7 +123,7 @@ void AmazonRoom::roomSet() {
void AmazonRoom::roomMenu() {
byte *iconData = _vm->_files->loadFile("ICONS.LZ");
SpriteResource *spr = new SpriteResource(_vm, _icon, _vm->_files->_filesize);
SpriteResource *spr = new SpriteResource(_vm, iconData, _vm->_files->_filesize);
delete[] iconData;
_vm->_screen->saveScreen();

58
engines/access/asurface.cpp
View File

@ -21,10 +21,64 @@
*/
#include "common/algorithm.h"
#include "common/endian.h"
#include "common/memstream.h"
#include "access/access.h"
#include "access/asurface.h"
namespace Access {
SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
DisposeAfterUse::Flag disposeMemory) {
Common::MemoryReadStream stream(data, size);
Common::Array<uint32> offsets;
int count = stream.readUint16LE();
for (int i = 0; i < count; i++)
offsets.push_back(stream.readUint32LE());
offsets.push_back(size); // For easier calculations of Noctropolis sizes
// Build up the frames
for (int i = 0; i < count; ++i) {
stream.seek(offsets[i]);
int frameSize = offsets[i + 1] - offsets[i];
SpriteFrame *frame = new SpriteFrame(vm, stream, frameSize);
_frames.push_back(frame);
}
if (disposeMemory == DisposeAfterUse::YES)
delete[] data;
}
SpriteResource::~SpriteResource() {
for (uint i = 0; i < _frames.size(); ++i)
delete _frames[i];
}
SpriteFrame::SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize) {
int w = stream.readUint16LE();
int h = stream.readUint16LE();
create(w, h, Graphics::PixelFormat::createFormatCLUT8());
// Empty surface
byte *data = (byte *)getPixels();
Common::fill(data, data + w * h, 0);
// Decode the data
for (int y = 0; y < h; ++y) {
int offset = stream.readByte();
int len = stream.readByte();
assert((offset + len) <= w);
byte *destP = (byte *)getBasePtr(offset, y);
stream.read(destP, len);
}
}
SpriteFrame::~SpriteFrame() {
free();
}
/*------------------------------------------------------------------------*/
@ -114,6 +168,9 @@ void ASurface::plotImage(SpriteResource *sprite, int frameNum, const Common::Poi
}
void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt) {
return;
/*
byte *destP = (byte *)getBasePtr(pt.x, _scrollY + pt.y);
byte *srcP = frame->_data;
@ -144,6 +201,7 @@ void ASurface::plotFrame(SpriteFrame *frame, const Common::Point &pt) {
warning("TODO: Line draw");
}
}
*/
}
} // End of namespace Access

20
engines/access/asurface.h
View File

@ -25,12 +25,32 @@
#include "common/scummsys.h"
#include "common/array.h"
#include "common/memstream.h"
#include "common/rect.h"
#include "graphics/surface.h"
#include "access/data.h"
namespace Access {
class SpriteFrame : public Graphics::Surface {
public:
SpriteFrame(AccessEngine *vm, Common::MemoryReadStream &stream, int frameSize);
~SpriteFrame();
};
class SpriteResource {
public:
Common::Array<SpriteFrame *> _frames;
public:
SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO);
~SpriteResource();
int getCount() { return _frames.size(); }
SpriteFrame *getFrame(int idx) { return _frames[idx]; }
};
class ASurface : public Graphics::Surface {
public:
static int _leftSkip, _rightSkip;

42
engines/access/data.cpp
View File

@ -21,50 +21,8 @@
*/
#include "common/algorithm.h"
#include "common/endian.h"
#include "common/memstream.h"
#include "access/access.h"
#include "access/data.h"
namespace Access {
SpriteResource::SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
DisposeAfterUse::Flag disposeMemory) {
Common::MemoryReadStream stream(data, size);
Common::Array<uint32> offsets;
int count = stream.readUint16LE();
for (int i = 0; i < count; i++)
offsets.push_back(stream.readUint32LE());
offsets.push_back(size); // For easier calculations of Noctropolis sizes
// Build up the frames
for (int i = 0; i < count; ++i) {
stream.seek(offsets[i]);
SpriteFrame *frame = new SpriteFrame();
frame->_width = stream.readUint16LE();
frame->_height = stream.readUint16LE();
frame->_size = (vm->getGameID() == GType_MeanStreets) ? stream.readUint16LE() :
offsets[i + 1] - offsets[i];
frame->_data = new byte[frame->_size];
stream.read(frame->_data, frame->_size);
_frames.push_back(frame);
}
if (disposeMemory == DisposeAfterUse::YES)
delete[] data;
}
SpriteResource::~SpriteResource() {
for (uint i = 0; i < _frames.size(); ++i)
delete _frames[i];
}
SpriteFrame::~SpriteFrame() {
delete[] _data;
}
} // End of namespace Access

22
engines/access/data.h
View File

@ -59,28 +59,6 @@ public:
int _vidSTable1;
};
class SpriteFrame : public Graphics::Surface {
public:
uint16 _width, _height;
byte *_data;
uint32 _size;
~SpriteFrame();
};
class SpriteResource {
public:
Common::Array<SpriteFrame *> _frames;
public:
SpriteResource(AccessEngine *vm, const byte *data, uint32 size,
DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO);
~SpriteResource();
int getCount() { return _frames.size(); }
SpriteFrame *getFrame(int idx) { return _frames[idx]; }
};
} // End of namespace Access
#endif /* ACCESS_DATA_H */