mirror of
https://github.com/libretro/scummvm.git
synced 2024-12-15 06:08:35 +00:00
BLADERUNNER: Read set objects and walkboxes
This commit is contained in:
parent
420d7f9ecc
commit
abf98fca03
37
engines/bladerunner/boundingbox.cpp
Normal file
37
engines/bladerunner/boundingbox.cpp
Normal file
@ -0,0 +1,37 @@
|
||||
/* 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 "bladerunner/boundingbox.h"
|
||||
|
||||
namespace BladeRunner {
|
||||
|
||||
BoundingBox::BoundingBox(float x0, float y0, float z0, float x1, float y1, float z1) {
|
||||
_vertices[0].x = x0;
|
||||
_vertices[0].y = y0;
|
||||
_vertices[0].z = z0;
|
||||
|
||||
_vertices[1].x = x1;
|
||||
_vertices[1].y = y1;
|
||||
_vertices[1].z = z1;
|
||||
}
|
||||
|
||||
} // End of namespace BladeRunner
|
40
engines/bladerunner/boundingbox.h
Normal file
40
engines/bladerunner/boundingbox.h
Normal file
@ -0,0 +1,40 @@
|
||||
/* 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 BLADERUNNER_BOUNDING_BOX_H
|
||||
#define BLADERUNNER_BOUNDING_BOX_H
|
||||
|
||||
#include "vector.h"
|
||||
|
||||
namespace BladeRunner {
|
||||
|
||||
class BoundingBox {
|
||||
Vector3 _vertices[2];
|
||||
|
||||
public:
|
||||
BoundingBox() {}
|
||||
BoundingBox(float x0, float y0, float z0, float x1, float y1, float z1);
|
||||
};
|
||||
|
||||
} // End of namespace BladeRunner
|
||||
|
||||
#endif
|
@ -6,6 +6,7 @@ MODULE_OBJS = \
|
||||
aud_decoder.o \
|
||||
audio_player.o \
|
||||
bladerunner.o \
|
||||
boundingbox.o \
|
||||
chapters.o \
|
||||
decompress_lcw.o \
|
||||
decompress_lzo.o \
|
||||
|
@ -70,8 +70,8 @@ bool Scene::open(int setId, int sceneId, bool isLoadingGame) {
|
||||
_vm->_script->InitializeScene();
|
||||
|
||||
Common::String setResourceName = Common::String::format("%s-MIN.SET", sceneName.c_str());
|
||||
// if (!_set->open(setResourceName))
|
||||
// return false;
|
||||
if (!_set->open(setResourceName))
|
||||
return false;
|
||||
|
||||
// TODO: Set view
|
||||
if (isLoadingGame) {
|
||||
|
@ -23,6 +23,9 @@
|
||||
#ifndef BLADERUNNER_SCENE_H
|
||||
#define BLADERUNNER_SCENE_H
|
||||
|
||||
#include "bladerunner/bladerunner.h"
|
||||
|
||||
#include "bladerunner/set.h"
|
||||
#include "bladerunner/view.h"
|
||||
#include "bladerunner/vqa_player.h"
|
||||
|
||||
@ -34,6 +37,7 @@ class Scene {
|
||||
BladeRunnerEngine *_vm;
|
||||
|
||||
public:
|
||||
Set *_set;
|
||||
int _setId;
|
||||
int _sceneId;
|
||||
VQAPlayer _vqaPlayer;
|
||||
@ -49,6 +53,7 @@ public:
|
||||
public:
|
||||
Scene(BladeRunnerEngine *vm)
|
||||
: _vm(vm),
|
||||
_set(new Set(vm)),
|
||||
_setId(-1),
|
||||
_sceneId(-1),
|
||||
_vqaPlayer(vm),
|
||||
|
@ -24,6 +24,7 @@
|
||||
|
||||
#include "bladerunner/bladerunner.h"
|
||||
|
||||
#include "common/debug.h"
|
||||
#include "common/ptr.h"
|
||||
#include "common/str.h"
|
||||
#include "common/stream.h"
|
||||
@ -32,6 +33,18 @@ namespace BladeRunner {
|
||||
|
||||
#define kSet0 0x53657430
|
||||
|
||||
Set::Set(BladeRunnerEngine *vm) : _vm(vm) {
|
||||
_objectCount = 0;
|
||||
_walkboxCount = 0;
|
||||
_objects = new Object[85];
|
||||
_walkboxes = new Walkbox[95];
|
||||
}
|
||||
|
||||
Set::~Set() {
|
||||
delete[] _objects;
|
||||
delete[] _walkboxes;
|
||||
}
|
||||
|
||||
bool Set::open(const Common::String &name) {
|
||||
Common::ScopedPtr<Common::SeekableReadStream> s(_vm->getResourceStream(name));
|
||||
|
||||
@ -39,6 +52,57 @@ bool Set::open(const Common::String &name) {
|
||||
if (sig != kSet0)
|
||||
return false;
|
||||
|
||||
s->skip(4); // TODO: LITE length
|
||||
|
||||
_objectCount = s->readUint32LE();
|
||||
assert(_objectCount <= 85);
|
||||
|
||||
for (uint32 i = 0; i != _objectCount; ++i) {
|
||||
s->read(_objects[i]._name, 20);
|
||||
|
||||
float x0, y0, z0, x1, y1, z1;
|
||||
x0 = s->readFloatLE();
|
||||
y0 = s->readFloatLE();
|
||||
z0 = s->readFloatLE();
|
||||
x1 = s->readFloatLE();
|
||||
y1 = s->readFloatLE();
|
||||
z1 = s->readFloatLE();
|
||||
|
||||
_objects[i]._bbox = BoundingBox(x0, y0, z0, x1, y1, z1);
|
||||
|
||||
_objects[i]._isObstacle = s->readByte();
|
||||
_objects[i]._isClickable = s->readByte();
|
||||
_objects[i]._isHotMouse = 0;
|
||||
_objects[i]._isCombatTarget = 0;
|
||||
s->skip(4);
|
||||
|
||||
// debug("OBJECT: %s", _objects[i]._name);
|
||||
}
|
||||
|
||||
_walkboxCount = s->readUint32LE();
|
||||
assert(_walkboxCount <= 95);
|
||||
|
||||
for (uint32 i = 0; i != _walkboxCount; ++i) {
|
||||
float x, y, z;
|
||||
|
||||
s->read(_walkboxes[i]._name, 20);
|
||||
y = s->readFloatLE();
|
||||
_walkboxes[i]._vertexCount = s->readUint32LE();
|
||||
|
||||
assert(_walkboxes[i]._vertexCount <= 8);
|
||||
|
||||
for (uint32 j = 0; j != _walkboxes[i]._vertexCount; ++j) {
|
||||
x = s->readFloatLE();
|
||||
z = s->readFloatLE();
|
||||
|
||||
_walkboxes[i]._vertices[j] = Vector3(x, y, z);
|
||||
}
|
||||
|
||||
// debug("WALKBOX: %s", _walkboxes[i]._name);
|
||||
}
|
||||
|
||||
// TODO: Read LITE
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -23,6 +23,9 @@
|
||||
#ifndef BLADERUNNER_SET_H
|
||||
#define BLADERUNNER_SET_H
|
||||
|
||||
#include "bladerunner/boundingbox.h"
|
||||
|
||||
#include "common/scummsys.h"
|
||||
#include "common/str.h"
|
||||
|
||||
namespace BladeRunner {
|
||||
@ -31,13 +34,36 @@ class BladeRunnerEngine;
|
||||
|
||||
class VQADecoder;
|
||||
|
||||
struct Object {
|
||||
char _name[20];
|
||||
BoundingBox _bbox;
|
||||
uint8 _isObstacle;
|
||||
uint8 _isClickable;
|
||||
uint8 _isHotMouse;
|
||||
uint8 _isCombatTarget;
|
||||
};
|
||||
|
||||
struct Walkbox {
|
||||
char _name[20];
|
||||
float _altitude;
|
||||
uint32 _vertexCount;
|
||||
Vector3 _vertices[8];
|
||||
};
|
||||
|
||||
class Set {
|
||||
BladeRunnerEngine *_vm;
|
||||
|
||||
uint32 _objectCount;
|
||||
uint32 _walkboxCount;
|
||||
Object *_objects;
|
||||
Walkbox *_walkboxes;
|
||||
int _walkboxStepSound[85];
|
||||
int _footstepSoundOverride;
|
||||
float _unknown[10];
|
||||
|
||||
public:
|
||||
Set(BladeRunnerEngine *vm)
|
||||
{
|
||||
}
|
||||
Set(BladeRunnerEngine *vm);
|
||||
~Set();
|
||||
|
||||
bool open(const Common::String &name);
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user