Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BLADERUNNER: Add basic Scene, Set, and Script support.
- Loading branch information
Showing
18 changed files
with
527 additions
and
50 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,112 @@ | ||
| /* 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/scene.h" | ||
|
|
||
| #include "bladerunner/bladerunner.h" | ||
| #include "bladerunner/chapters.h" | ||
| #include "bladerunner/gameinfo.h" | ||
| #include "bladerunner/script/script.h" | ||
|
|
||
| #include "common/str.h" | ||
| #include "common/stream.h" | ||
|
|
||
| namespace BladeRunner { | ||
|
|
||
| bool Scene::open(int setId, int sceneId, bool isLoadingGame) { | ||
| if (!isLoadingGame) { | ||
| // flush ADQ | ||
| } | ||
|
|
||
| _setId = setId; | ||
| _sceneId = sceneId; | ||
|
|
||
| const Common::String setName = _vm->_gameInfo->getSetName(_sceneId); | ||
|
|
||
| if (isLoadingGame) { | ||
| // TODO: Set up overlays | ||
| } else { | ||
| // TODO: Clear regions | ||
| // TODO: Destroy all overlays | ||
| _defaultLoop = 0; | ||
| _frame = -1; | ||
| } | ||
|
|
||
| Common::String vqaName; | ||
| int currentResourceId = _vm->_chapters->currentResourceId(); | ||
| if (currentResourceId == 1) { | ||
| vqaName = Common::String::format("%s.VQA", setName.c_str()); | ||
| } else { | ||
| vqaName = Common::String::format("%s_%d.VQA", setName.c_str(), MIN(currentResourceId, 3)); | ||
| } | ||
|
|
||
| if (!_vqaPlayer.open(vqaName)) | ||
| return false; | ||
|
|
||
| Common::String sceneName = _vm->_gameInfo->getSetName(sceneId); | ||
| if (!_vm->_script->open(sceneName)) | ||
| return false; | ||
|
|
||
| if (!isLoadingGame) | ||
| _vm->_script->InitializeScene(); | ||
|
|
||
| Common::String setResourceName = Common::String::format("%s-MIN.SET", sceneName.c_str()); | ||
| // if (!_set->open(setResourceName)) | ||
| // return false; | ||
|
|
||
| // TODO: Set view | ||
| if (isLoadingGame) { | ||
| if (sceneId >= 73 && sceneId <= 76) | ||
| _vm->_script->InitializeScene(); | ||
| return true; | ||
| } | ||
|
|
||
| // TODO: set VQADecoder parameters | ||
| // TODO: Set actor position from scene info | ||
| // TODO: Set actor set | ||
| // TODO: call SCRIPT_Scene_Loaded | ||
| _vm->_script->SceneLoaded(); | ||
|
|
||
| #if 0 | ||
| // Init click map | ||
| int actorCount = _vm->_gameInfo->getActorCount(); | ||
| for (int i = 0; i != actorCount; ++i) { | ||
| Actor *actor = _vm->_actors[i]; | ||
| if (actor->getSet() == setId) { | ||
|
|
||
| } | ||
| } | ||
| // TODO: Update click map for set, items | ||
| #endif | ||
|
|
||
| return true; | ||
| } | ||
|
|
||
| int Scene::advanceFrame(Graphics::Surface &surface) { | ||
| int frame = _vqaPlayer.update(); | ||
| if (frame >= 0) { | ||
| surface.copyFrom(*_vqaPlayer.getSurface()); | ||
| } | ||
| return frame; | ||
| } | ||
|
|
||
| } // End of namespace BladeRunner |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| /* 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_SCENE_H | ||
| #define BLADERUNNER_SCENE_H | ||
|
|
||
| #include "bladerunner/vqa_player.h" | ||
|
|
||
| namespace BladeRunner { | ||
|
|
||
| class BladeRunnerEngine; | ||
|
|
||
| class Scene { | ||
| BladeRunnerEngine *_vm; | ||
|
|
||
| public: | ||
| int _setId; | ||
| int _sceneId; | ||
| VQAPlayer _vqaPlayer; | ||
| int _defaultLoop; | ||
| int _nextSetId; | ||
| int _nextSceneId; | ||
| int _frame; | ||
| bool _playerWalkedIn; | ||
|
|
||
| public: | ||
| Scene(BladeRunnerEngine *vm) | ||
| : _vm(vm), | ||
| _setId(-1), | ||
| _sceneId(-1), | ||
| _vqaPlayer(vm), | ||
| _defaultLoop(0), | ||
| _nextSetId(-1), | ||
| _nextSceneId(-1), | ||
| _playerWalkedIn(false) | ||
| { | ||
| } | ||
|
|
||
| bool open(int setId, int sceneId, bool isLoadingGame); | ||
| int advanceFrame(Graphics::Surface &surface); | ||
| }; | ||
|
|
||
| } // End of namespace BladeRunner | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* 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/script/script.h" | ||
|
|
||
| #include "bladerunner/bladerunner.h" | ||
|
|
||
| namespace BladeRunner { | ||
|
|
||
| void ScriptRC01::InitializeScene() { | ||
| _vm->outtakePlay(28, true); | ||
| _vm->outtakePlay(41, true); | ||
| _vm->outtakePlay( 0, false); | ||
| } | ||
|
|
||
| void ScriptRC01::SceneLoaded() { | ||
|
|
||
| } | ||
|
|
||
| void ScriptRC01::SceneFrameAdvanced(int frame) { | ||
|
|
||
| } | ||
|
|
||
| } // End of namespace BladeRunner |
Oops, something went wrong.