Skip to content

Commit

Permalink
NEVERHOOD: Start with AnimatedSprite and AnimResource
Browse files Browse the repository at this point in the history
  • Loading branch information
@johndoe123 @wjp
johndoe123 authored and wjp committed May 8, 2013
1 parent 0614b28 commit f01f934
Show file tree
Hide file tree
Showing 6 changed files with 533 additions and 12 deletions.
3 changes: 3 additions & 0 deletions engines/neverhood/graphics.h
View file
Expand Up @@ -62,6 +62,9 @@ class BaseSurface {
void drawSpriteResource(SpriteResource &spriteResource);
int getPriority() const { return _priority; }
void setPriority(int priority) { _priority = priority; }
NDrawRect& getDrawRect() { return _drawRect; }
NDrawRect& getSysRect() { return _sysRect; }
NRect& getClipRect() { return _clipRect; }
protected:
NeverhoodEngine *_vm;
int _priority;
Expand Down
9 changes: 8 additions & 1 deletion engines/neverhood/neverhood.cpp
View file
Expand Up @@ -112,7 +112,7 @@ Common::Error NeverhoodEngine::run() {
_res->unuseResource(resourceHandle);
#endif

#if 1
#if 0
{ // Create a new scope
SpriteResource r(this);
BaseSurface *surf = new BaseSurface(this, 0, 640, 480);
Expand All @@ -123,6 +123,13 @@ Common::Error NeverhoodEngine::run() {
}
#endif

#if 1
{ // Create a new scope
AnimResource r(this);
r.load(0x000540B0);
}
#endif

delete _res;

return Common::kNoError;
Expand Down
153 changes: 153 additions & 0 deletions engines/neverhood/resource.cpp
View file
Expand Up @@ -25,6 +25,8 @@

namespace Neverhood {

// SpriteResource

SpriteResource::SpriteResource(NeverhoodEngine *vm)
: _vm(vm), _resourceHandle(-1), _pixels(NULL) {
}
Expand Down Expand Up @@ -87,6 +89,8 @@ void SpriteResource::unload() {
_rle = false;
}

// PaletteResource

PaletteResource::PaletteResource(NeverhoodEngine *vm)
: _vm(vm), _resourceHandle(-1), _palette(NULL) {
}
Expand Down Expand Up @@ -134,4 +138,153 @@ void PaletteResource::copyPalette(byte *destPalette) {
}
}

// AnimResource

AnimResource::AnimResource(NeverhoodEngine *vm)
: _vm(vm), _width(0), _height(0), _currSpriteData(NULL) {

clear();
clear2();
}

AnimResource::~AnimResource() {
unloadInternal();
}

bool AnimResource::load(uint32 fileHash) {

if (fileHash == _fileHash)
return true;

unload();
_resourceHandle = _vm->_res->useResource(fileHash);
if (_resourceHandle == -1)
return false;

byte *resourceData, *animList, *frameList;
uint16 animInfoStartOfs, animListIndex, animListCount;
uint16 frameListStartOfs, frameCount;
uint32 spriteDataOfs, paletteDataOfs;

if (_vm->_res->getResourceType(_resourceHandle) != 4) {
_vm->_res->unuseResource(_resourceHandle);
_resourceHandle = -1;
return false;
}

resourceData = _vm->_res->loadResource(_resourceHandle);
if (!resourceData) {
_vm->_res->unuseResource(_resourceHandle);
_resourceHandle = -1;
return false;
}

animListCount = READ_LE_UINT16(resourceData);
animInfoStartOfs = READ_LE_UINT16(resourceData + 2);
spriteDataOfs = READ_LE_UINT32(resourceData + 4);
paletteDataOfs = READ_LE_UINT32(resourceData + 8);

animList = resourceData + 12;
for (animListIndex = 0; animListIndex < animListCount; animListIndex++) {
debug("hash: %08X", READ_LE_UINT32(animList));
if (READ_LE_UINT32(animList) == fileHash)
break;
animList += 8;
}

if (animListIndex >= animListCount) {
_vm->_res->unloadResource(_resourceHandle);
_vm->_res->unuseResource(_resourceHandle);
_resourceHandle = -1;
return false;
}

_spriteData = resourceData + spriteDataOfs;
if (paletteDataOfs > 0)
_paletteData = resourceData + paletteDataOfs;

frameCount = READ_LE_UINT16(animList + 4);
frameListStartOfs = READ_LE_UINT16(animList + 6);

debug("frameCount = %d; frameListStartOfs = %04X; animInfoStartOfs = %04X", frameCount, frameListStartOfs, animInfoStartOfs);

frameList = resourceData + animInfoStartOfs + frameListStartOfs;

_frames.clear();
_frames.reserve(frameCount);

for (uint16 frameIndex = 0; frameIndex < frameCount; frameIndex++) {
AnimFrameInfo frameInfo;
frameInfo.frameHash = READ_LE_UINT32(frameList);
frameInfo.counter = READ_LE_UINT16(frameList + 4);
frameInfo.rect.x1 = READ_LE_UINT16(frameList + 6);
frameInfo.rect.y1 = READ_LE_UINT16(frameList + 8);
frameInfo.rect.x2 = READ_LE_UINT16(frameList + 10);
frameInfo.rect.y2 = READ_LE_UINT16(frameList + 12);
frameInfo.deltaX = READ_LE_UINT16(frameList + 14);
frameInfo.deltaY = READ_LE_UINT16(frameList + 16);
frameInfo.deltaRect.x = READ_LE_UINT16(frameList + 18);
frameInfo.deltaRect.y = READ_LE_UINT16(frameList + 20);
frameInfo.deltaRect.width = READ_LE_UINT16(frameList + 22);
frameInfo.deltaRect.height = READ_LE_UINT16(frameList + 24);
frameInfo.field_1A = READ_LE_UINT16(frameList + 26);
frameInfo.spriteDataOffs = READ_LE_UINT32(frameList + 28);
debug("frameHash = %08X; counter = %d; rect = (%d,%d,%d,%d); deltaX = %d; deltaY = %d; deltaRect = (%d,%d,%d,%d); field_1A = %04X; spriteDataOffs = %08X",
frameInfo.frameHash, frameInfo.counter,
frameInfo.rect.x1, frameInfo.rect.y1, frameInfo.rect.x2, frameInfo.rect.y2,
frameInfo.deltaX, frameInfo.deltaY,
frameInfo.deltaRect.x, frameInfo.deltaRect.y, frameInfo.deltaRect.width, frameInfo.deltaRect.height,
frameInfo.field_1A, frameInfo.spriteDataOffs);
frameList += 32;
_frames.push_back(frameInfo);
}

_fileHash = fileHash;

return true;

}

void AnimResource::unload() {
if (_resourceHandle != -1) {
_vm->_res->unloadResource(_resourceHandle);
_vm->_res->unuseResource(_resourceHandle);
clear();
}
}

void AnimResource::clear() {
_resourceHandle = -1;
// _count = 0;
// _infoStructs = NULL;
_currSpriteData = NULL;
_fileHash = 0;
_paletteData = NULL;
_spriteData = NULL;
}

void AnimResource::clear2() {
clear();
_replEnabled = true;
_replOldByte = 0;
_replNewByte = 0;
}

bool AnimResource::loadInternal(uint32 fileHash) {
unloadInternal();
return load(fileHash);
}

void AnimResource::unloadInternal() {
unload();
clear2();
}

int16 AnimResource::getFrameIndex(uint32 frameHash) {
for (uint i = 0; i < _frames.size(); i++)
if (_frames[i].frameHash == frameHash)
return (int16)i;
return -1;
}

} // End of namespace Neverhood
38 changes: 38 additions & 0 deletions engines/neverhood/resource.h
View file
Expand Up @@ -61,6 +61,44 @@ class PaletteResource {
byte *_palette;
};

struct AnimFrameInfo {
uint32 frameHash;
int16 counter;
NRect rect;
int16 deltaX, deltaY;
NDrawRect deltaRect;
uint16 field_1A;
uint32 spriteDataOffs;
};

class AnimResource {
public:
AnimResource(NeverhoodEngine *vm);
~AnimResource();
bool load(uint32 fileHash);
void unload();
void clear();
void clear2();
bool loadInternal(uint32 fileHash);
void unloadInternal();
uint getFrameCount() const { return _frames.size(); }
const AnimFrameInfo& getFrameInfo(int16 index) const { return _frames[index]; }
int16 getFrameIndex(uint32 frameHash);
protected:
NeverhoodEngine *_vm;
int _resourceHandle;
int16 _width, _height;
byte *_currSpriteData;
uint32 _fileHash;
byte *_paletteData;
byte *_spriteData;
bool _replEnabled;
byte _replOldByte;
byte _replNewByte;
Common::Array<AnimFrameInfo> _frames;
};


} // End of namespace Neverhood

#endif /* NEVERHOOD_RESOURCE_H */

0 comments on commit f01f934

Please sign in to comment.