aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--engines/illusions/actorresource.cpp245
-rw-r--r--engines/illusions/actorresource.h121
-rw-r--r--engines/illusions/graphics.h4
-rw-r--r--engines/illusions/illusions.cpp11
-rw-r--r--engines/illusions/illusions.h3
-rw-r--r--engines/illusions/module.mk1
6 files changed, 384 insertions, 1 deletions
diff --git a/engines/illusions/actorresource.cpp b/engines/illusions/actorresource.cpp
new file mode 100644
index 0000000000..59123bb2db
--- /dev/null
+++ b/engines/illusions/actorresource.cpp
@@ -0,0 +1,245 @@
+/* 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.
+ *
+ */
+
+#include "illusions/illusions.h"
+#include "illusions/actorresource.h"
+
+namespace Illusions {
+
+// ActorResourceLoader
+
+void ActorResourceLoader::load(Resource *resource) {
+ // TODO
+ debug("ActorResourceLoader::load() Loading actor %08X from %s...", resource->_resId, resource->_filename.c_str());
+
+ ActorResource *actorResource = new ActorResource();
+ actorResource->load(resource->_data, resource->_dataSize);
+
+ ActorItem *actorItem = _vm->_actorItems->allocActorItem();
+ actorItem->_tag = resource->_tag;
+ actorItem->_pauseCtr = 0;
+ actorItem->_actRes = actorResource;
+
+ for (uint i = 0; i < actorResource->_actorTypes.size(); ++i) {
+ ActorType *actorType = &actorResource->_actorTypes[i];
+ ActorType *actorType2 = 0;// TODO _vm->getActorType(actorType->_actorTypeId);
+ if (actorType2) {
+ actorType->_surfInfo._dimensions._width = MAX(actorType->_surfInfo._dimensions._width,
+ actorType2->_surfInfo._dimensions._width);
+ actorType->_surfInfo._dimensions._height = MAX(actorType->_surfInfo._dimensions._height,
+ actorType2->_surfInfo._dimensions._height);
+ if (actorType->_color.r == 255 && actorType->_color.g == 255 && actorType->_color.b == 255)
+ actorType->_color = actorType2->_color;
+ if (actorType->_value1E == 0)
+ actorType->_value1E = actorType2->_value1E;
+ }
+ // TODO _vm->addActorType(actorType->_actorTypeId, actorType);
+ }
+
+ for (uint i = 0; i < actorResource->_sequences.size(); ++i) {
+ Sequence *sequence = &actorResource->_sequences[i];
+ // TODO _vm->addSequence(sequence->_sequence, sequence);
+ }
+
+}
+
+void ActorResourceLoader::unload(Resource *resource) {
+}
+
+void ActorResourceLoader::buildFilename(Resource *resource) {
+ resource->_filename = Common::String::format("%08X.act", resource->_resId);
+}
+
+bool ActorResourceLoader::isFlag(int flag) {
+ return
+ flag == kRlfLoadFile;
+}
+
+void Frame::load(byte *dataStart, Common::SeekableReadStream &stream) {
+ stream.readUint32LE(); //field_0 dd
+ stream.readUint32LE(); // TODO config dd
+ _pixelSize = stream.readUint32LE();
+ _dimensions.load(stream);
+ uint32 compressedPixelsOffs = stream.readUint32LE();
+ _compressedPixels = dataStart + compressedPixelsOffs;
+
+ debug("Frame::load() _pixelSize: %d; compressedPixelsOffs: %08X",
+ _pixelSize, compressedPixelsOffs);
+}
+
+void Sequence::load(byte *dataStart, Common::SeekableReadStream &stream) {
+ _sequenceId = stream.readUint32LE();
+ _unk4 = stream.readUint32LE();
+ uint32 sequenceCodeOffs = stream.readUint32LE();
+ _sequenceCode = dataStart + sequenceCodeOffs;
+
+ debug("Sequence::load() _sequenceId: %08X; _unk4: %d; sequenceCodeOffs: %08X",
+ _sequenceId, _unk4, sequenceCodeOffs);
+}
+
+void ActorType::load(byte *dataStart, Common::SeekableReadStream &stream) {
+ _actorTypeId = stream.readUint32LE();
+ _surfInfo.load(stream);
+ stream.readUint32LE(); // TODO config dd
+ stream.readUint16LE(); // TODO namedPointsCount dw
+ stream.skip(2); // Skip padding
+ stream.readUint32LE(); // TODO namedPoints dd
+ _color.r = stream.readByte();
+ _color.g = stream.readByte();
+ _color.b = stream.readByte();
+ stream.readByte(); // Skip padding
+ _scale = stream.readByte();
+ _priority = stream.readByte();
+ _value1E = stream.readUint16LE();
+ _bgItem28sIndex = stream.readUint16LE();
+ _bgItem22sIndex = stream.readUint16LE();
+ _bgItem30sIndex = stream.readUint16LE();
+ _bgItem26sIndex = stream.readUint16LE();
+ _bgItem38sIndex = stream.readUint16LE();
+ _flags = stream.readUint16LE();
+
+ debug("ActorType::load() _actorTypeId: %08X; _color(%d,%d,%d); _scale: %d; _priority: %d; _value1E: %d",
+ _actorTypeId, _color.r, _color.g, _color.b, _scale, _priority, _value1E);
+ debug("ActorType::load() _bgItem28sIndex: %d; _bgItem22sIndex: %d; _bgItem30sIndex: %d",
+ _bgItem28sIndex, _bgItem22sIndex, _bgItem30sIndex);
+ debug("ActorType::load() _bgItem26sIndex: %d; _bgItem38sIndex: %d; _flags: %04X",
+ _bgItem26sIndex, _bgItem38sIndex,_flags);
+}
+
+// ActorResource
+
+ActorResource::ActorResource() {
+}
+
+ActorResource::~ActorResource() {
+}
+
+void ActorResource::load(byte *data, uint32 dataSize) {
+ Common::MemoryReadStream stream(data, dataSize, DisposeAfterUse::NO);
+
+ _totalSize = stream.readUint32LE();
+
+ // Load actor types
+ stream.seek(0x06);
+ uint actorTypesCount = stream.readUint16LE();
+ stream.seek(0x10);
+ uint32 actorTypesOffs = stream.readUint32LE();
+ stream.seek(actorTypesOffs);
+ _actorTypes.reserve(actorTypesCount);
+ for (uint i = 0; i < actorTypesCount; ++i) {
+ ActorType actorType;
+ actorType.load(data, stream);
+ _actorTypes.push_back(actorType);
+ }
+
+ // Load sequences
+ stream.seek(0x08);
+ uint sequencesCount = stream.readUint16LE();
+ stream.seek(0x14);
+ uint32 sequencesOffs = stream.readUint32LE();
+ stream.seek(sequencesOffs);
+ _actorTypes.reserve(sequencesCount);
+ for (uint i = 0; i < sequencesCount; ++i) {
+ Sequence sequence;
+ sequence.load(data, stream);
+ _sequences.push_back(sequence);
+ }
+
+ // Load frames
+ stream.seek(0x0A);
+ uint framesCount = stream.readUint16LE();
+ stream.seek(0x18);
+ uint32 framesOffs = stream.readUint32LE();
+ stream.seek(framesOffs);
+ _actorTypes.reserve(framesCount);
+ for (uint i = 0; i < framesCount; ++i) {
+ Frame frame;
+ frame.load(data, stream);
+ _frames.push_back(frame);
+ }
+
+}
+
+// ActorItem
+
+ActorItem::ActorItem() {
+}
+
+ActorItem::~ActorItem() {
+}
+
+void ActorItem::pause() {
+ ++_pauseCtr;
+ if (_pauseCtr == 1) {
+ /* TODO
+ for (uint i = 0; i < _actRes->_actorTypes.size(); ++i)
+ // TODO _vm->removeActorType(_actRes->_actorTypes[i]._actorTypeId);
+ for (uint i = 0; i < actorResource->_sequences.size(); ++i)
+ // TODO _vm->removeSequence(_actRes->_sequences[i]._sequence);
+ */
+ }
+}
+
+void ActorItem::unpause() {
+ --_pauseCtr;
+ if (_pauseCtr == 0) {
+ /* TODO
+ for (uint i = 0; i < _actRes->_actorTypes.size(); ++i) {
+ ActorType *actorType = &_actRes->_actorTypes[i];
+ // TODO _vm->addActorType(actorType->_actorTypeId, actorType);
+ }
+ for (uint i = 0; i < _actRes->_sequences.size(); ++i) {
+ Sequence *sequence = &_actRes->_sequences[i];
+ // TODO _vm->addSequence(sequence->_sequence, sequence);
+ }
+ */
+ }
+}
+
+// ActorItems
+
+ActorItems::ActorItems(IllusionsEngine *vm)
+ : _vm(vm) {
+}
+
+ActorItems::~ActorItems() {
+}
+
+ActorItem *ActorItems::allocActorItem() {
+ ActorItem *actorItem = new ActorItem();
+ _items.push_back(actorItem);
+ return actorItem;
+}
+
+void ActorItems::pauseByTag(uint32 tag) {
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ if ((*it)->_tag == tag)
+ (*it)->pause();
+}
+
+void ActorItems::unpauseByTag(uint32 tag) {
+ for (ItemsIterator it = _items.begin(); it != _items.end(); ++it)
+ if ((*it)->_tag == tag)
+ (*it)->pause();
+}
+
+} // End of namespace Illusions
diff --git a/engines/illusions/actorresource.h b/engines/illusions/actorresource.h
new file mode 100644
index 0000000000..196d72d063
--- /dev/null
+++ b/engines/illusions/actorresource.h
@@ -0,0 +1,121 @@
+/* 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 ILLUSIONS_ACTORRESOURCE_H
+#define ILLUSIONS_ACTORRESOURCE_H
+
+#include "illusions/graphics.h"
+#include "illusions/resourcesystem.h"
+#include "graphics/surface.h"
+
+namespace Illusions {
+
+class IllusionsEngine;
+
+class ActorResourceLoader : public BaseResourceLoader {
+public:
+ ActorResourceLoader(IllusionsEngine *vm) : _vm(vm) {}
+ virtual ~ActorResourceLoader() {}
+ virtual void load(Resource *resource);
+ virtual void unload(Resource *resource);
+ virtual void buildFilename(Resource *resource);
+ virtual bool isFlag(int flag);
+protected:
+ IllusionsEngine *_vm;
+};
+
+struct Frame {
+ //field_0 dd
+ // TODO config dd
+ uint32 _pixelSize;
+ WidthHeight _dimensions;
+ byte *_compressedPixels;
+ void load(byte *dataStart, Common::SeekableReadStream &stream);
+};
+
+struct Sequence {
+ uint32 _sequenceId;
+ uint32 _unk4;
+ byte *_sequenceCode;
+ void load(byte *dataStart, Common::SeekableReadStream &stream);
+};
+
+struct ActorType {
+ uint32 _actorTypeId;
+ SurfInfo _surfInfo;
+ // TODO config dd
+ // TODO namedPointsCount dw
+ // TODO namedPoints dd
+ RGB _color;
+ byte _scale;
+ byte _priority;
+ int16 _value1E;
+ uint16 _bgItem28sIndex;
+ uint16 _bgItem22sIndex;
+ uint16 _bgItem30sIndex;
+ uint16 _bgItem26sIndex;
+ uint16 _bgItem38sIndex;
+ uint16 _flags;
+ void load(byte *dataStart, Common::SeekableReadStream &stream);
+};
+
+class ActorResource {
+public:
+ ActorResource();
+ ~ActorResource();
+ void load(byte *data, uint32 dataSize);
+public:
+ uint32 _totalSize;
+ Common::Array<ActorType> _actorTypes;
+ Common::Array<Sequence> _sequences;
+ Common::Array<Frame> _frames;
+};
+
+class ActorItem {
+public:
+ ActorItem();
+ ~ActorItem();
+ void pause();
+ void unpause();
+public:
+ uint32 _tag;
+ int _pauseCtr;
+ ActorResource *_actRes;
+};
+
+class ActorItems {
+public:
+ ActorItems(IllusionsEngine *vm);
+ ~ActorItems();
+ ActorItem *allocActorItem();
+ void pauseByTag(uint32 tag);
+ void unpauseByTag(uint32 tag);
+protected:
+ typedef Common::List<ActorItem*> Items;
+ typedef Items::iterator ItemsIterator;
+ IllusionsEngine *_vm;
+ Items _items;
+};
+
+} // End of namespace Illusions
+
+#endif // ILLUSIONS_ACTORRESOURCE_H
diff --git a/engines/illusions/graphics.h b/engines/illusions/graphics.h
index 5a5cb02d7a..4f50f159d1 100644
--- a/engines/illusions/graphics.h
+++ b/engines/illusions/graphics.h
@@ -44,6 +44,10 @@ struct WRect {
Common::Point _bottomRight;
};
+struct RGB {
+ byte r, g, b;
+};
+
void loadPoint(Common::SeekableReadStream &stream, Common::Point &pt);
} // End of namespace Illusions
diff --git a/engines/illusions/illusions.cpp b/engines/illusions/illusions.cpp
index e36518d148..8cfd29e110 100644
--- a/engines/illusions/illusions.cpp
+++ b/engines/illusions/illusions.cpp
@@ -30,6 +30,7 @@
#include "illusions/spritedrawqueue.h"
#include "illusions/spritedecompressqueue.h"
#include "illusions/actor.h"
+#include "illusions/actorresource.h"
#include "audio/audiostream.h"
#include "common/config-manager.h"
@@ -77,16 +78,23 @@ Common::Error IllusionsEngine::run() {
initGraphics(640, 480, true, &pixelFormat16);
_resSys = new ResourceSystem();
+ _resSys->addResourceLoader(0x00060000, new ActorResourceLoader(this));
+ _resSys->addResourceLoader(0x00100000, new ActorResourceLoader(this));
_resSys->addResourceLoader(0x00110000, new BackgroundResourceLoader(this));
+
+ _actorItems = new ActorItems(this);
_backgroundItems = new BackgroundItems(this);
_camera = new Camera(this);
- _resSys->loadResource(0x0011000B, 0, 0);
+ _resSys->loadResource(0x00100006, 0, 0);
+ /*
+ _resSys->loadResource(0x0011000B, 0, 0);
BackgroundItem *backgroundItem = _backgroundItems->debugFirst();
_system->copyRectToScreen(backgroundItem->_surfaces[0]->getPixels(), backgroundItem->_surfaces[0]->pitch,
0, 0, 640, 480);
_system->updateScreen();
+ */
while (!shouldQuit()) {
updateEvents();
@@ -94,6 +102,7 @@ Common::Error IllusionsEngine::run() {
delete _camera;
delete _backgroundItems;
+ delete _actorItems;
delete _resSys;
return Common::kNoError;
diff --git a/engines/illusions/illusions.h b/engines/illusions/illusions.h
index 8978d8dd10..f375477b47 100644
--- a/engines/illusions/illusions.h
+++ b/engines/illusions/illusions.h
@@ -48,6 +48,8 @@ class ResourceSystem;
struct SurfInfo;
+class ActorItem;
+class ActorItems;
class BackgroundItem;
class BackgroundItems;
class BackgroundResource;
@@ -71,6 +73,7 @@ public:
void updateEvents();
+ ActorItems *_actorItems;
BackgroundItems *_backgroundItems;
Camera *_camera;
diff --git a/engines/illusions/module.mk b/engines/illusions/module.mk
index 30fd9b9cd7..722a55254d 100644
--- a/engines/illusions/module.mk
+++ b/engines/illusions/module.mk
@@ -2,6 +2,7 @@ MODULE := engines/illusions
MODULE_OBJS := \
actor.o \
+ actorresource.o \
backgroundresource.o \
camera.o \
detection.o \
generated by cgit v1.2.3 (git 2.25.1) at 2025-02-23 20:04:47 +0000