diff options
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/zvision/events.cpp | 88 | ||||
| -rw-r--r-- | engines/zvision/graphics.cpp | 37 | ||||
| -rw-r--r-- | engines/zvision/scriptManager.h | 42 | ||||
| -rw-r--r-- | engines/zvision/scripts.cpp | 31 | ||||
| -rw-r--r-- | engines/zvision/video.cpp | 185 | ||||
| -rw-r--r-- | engines/zvision/zvision.cpp | 245 | ||||
| -rw-r--r-- | engines/zvision/zvision.h | 30 |
7 files changed, 461 insertions, 197 deletions
diff --git a/engines/zvision/events.cpp b/engines/zvision/events.cpp new file mode 100644 index 0000000000..8d10485ddf --- /dev/null +++ b/engines/zvision/events.cpp @@ -0,0 +1,88 @@ +/* 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 "common/scummsys.h" + +#include "zvision.h" +#include "common/EventRecorder.h" + + +namespace ZVision { + +void ZVision::processEvents() { + while (_eventMan->pollEvent(_event)) { + switch (_event.type) { + case Common::EVENT_LBUTTONDOWN: + onMouseDown(_event.mouse); + break; + + case Common::EVENT_LBUTTONUP: + break; + + case Common::EVENT_RBUTTONDOWN: + break; + + case Common::EVENT_MOUSEMOVE: + onMouseMove(_event.mouse); + break; + + case Common::EVENT_KEYDOWN: + switch (_event.kbd.keycode) { + case Common::KEYCODE_d: + if (_event.kbd.hasFlags(Common::KBD_CTRL)) { + // Start the debugger + getDebugger()->attach(); + getDebugger()->onFrame(); + } + break; + + case Common::KEYCODE_q: + if (_event.kbd.hasFlags(Common::KBD_CTRL)) + quitGame(); + break; + + default: + break; + } + + onKeyDown(_event.kbd.keycode); + break; + + default: + break; + } + } +} + +void ZVision::onMouseDown(const Common::Point &pos) { + +} + +void ZVision::onMouseMove(const Common::Point &pos) { + +} + +void ZVision::onKeyDown(uint16 keyCode) { + +} + +} // End of namespace ZVision diff --git a/engines/zvision/graphics.cpp b/engines/zvision/graphics.cpp new file mode 100644 index 0000000000..17e7a4f06b --- /dev/null +++ b/engines/zvision/graphics.cpp @@ -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 "common/scummsys.h" + +#include "zvision/zvision.h" + +namespace ZVision { + +void ZVision::updateScripts() { + +} + +void ZVision::updateAnimations(uint32 detaTimeMillis) { + +} + +} // End namespace ZVision diff --git a/engines/zvision/scriptManager.h b/engines/zvision/scriptManager.h new file mode 100644 index 0000000000..a6c9f2b57c --- /dev/null +++ b/engines/zvision/scriptManager.h @@ -0,0 +1,42 @@ +/* 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 ZVISION_SCRIPT_MANAGER_H +#define ZVISION_SCRIPT_MANAGER_H + +#include "common/hashmap.h" + +namespace ZVision { + +class ScriptManager { +public: + ScriptManager(); + ~ScriptManager(); + +private: + Common::HashMap<uint32, byte> _globalState; +}; + + +} // End namespace ZVision + +#endif diff --git a/engines/zvision/scripts.cpp b/engines/zvision/scripts.cpp new file mode 100644 index 0000000000..40bad8f3a1 --- /dev/null +++ b/engines/zvision/scripts.cpp @@ -0,0 +1,31 @@ +/* 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 "common/scummsys.h" + +#include "zvision/zvision.h" + +namespace ZVision { + + + +} // End namespace ZVision diff --git a/engines/zvision/video.cpp b/engines/zvision/video.cpp new file mode 100644 index 0000000000..ce686839e8 --- /dev/null +++ b/engines/zvision/video.cpp @@ -0,0 +1,185 @@ +/* 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 "common/scummsys.h" +#include "common/system.h" + +#include "engines/engine.h" +#include "graphics/decoders/tga.h" + +#include "zvision/zork_avi_decoder.h" +#include "zvision/zork_raw.h" + +#include "common/EventRecorder.h" +#include "common/file.h" + +namespace ZVision { + +// Taken from SCI +void scale2x(const byte *src, byte *dst, int16 srcWidth, int16 srcHeight, byte bytesPerPixel) { + assert(bytesPerPixel == 1 || bytesPerPixel == 2); + const int newWidth = srcWidth * 2; + const int pitch = newWidth * bytesPerPixel; + const byte *srcPtr = src; + + if (bytesPerPixel == 1) { + for (int y = 0; y < srcHeight; y++) { + for (int x = 0; x < srcWidth; x++) { + const byte color = *srcPtr++; + dst[0] = color; + dst[1] = color; + dst[newWidth] = color; + dst[newWidth + 1] = color; + dst += 2; + } + dst += newWidth; + } + } else if (bytesPerPixel == 2) { + for (int y = 0; y < srcHeight; y++) { + for (int x = 0; x < srcWidth; x++) { + const byte color = *srcPtr++; + const byte color2 = *srcPtr++; + dst[0] = color; + dst[1] = color2; + dst[2] = color; + dst[3] = color2; + dst[pitch] = color; + dst[pitch + 1] = color2; + dst[pitch + 2] = color; + dst[pitch + 3] = color2; + dst += 4; + } + dst += pitch; + } + } +} + +void playVideo(Video::VideoDecoder *videoDecoder /*, VideoState videoState*/) { + if (!videoDecoder) + return; + + videoDecoder->start(); + + byte *scaleBuffer = 0; + byte bytesPerPixel = videoDecoder->getPixelFormat().bytesPerPixel; + uint16 width = videoDecoder->getWidth(); + uint16 height = videoDecoder->getHeight(); + uint16 pitch = videoDecoder->getWidth() * bytesPerPixel; + uint16 screenWidth = 640;//g_sci->_gfxScreen->getDisplayWidth(); + uint16 screenHeight = 480;//g_sci->_gfxScreen->getDisplayHeight(); + + bool zoom2x = true; + + if (zoom2x) { + width *= 2; + height *= 2; + pitch *= 2; + scaleBuffer = new byte[width * height * bytesPerPixel]; + } + + uint16 x, y; + + x = (screenWidth - width) / 2; + y = (screenHeight - height) / 2; + + bool skipVideo = false; + + while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo() && !skipVideo) { + if (videoDecoder->needsUpdate()) { + const Graphics::Surface *frame = videoDecoder->decodeNextFrame(); + + if (frame) { + if (scaleBuffer) { + scale2x((byte *)frame->pixels, scaleBuffer, videoDecoder->getWidth(), videoDecoder->getHeight(), bytesPerPixel); + g_system->copyRectToScreen(scaleBuffer, pitch, x, y, width, height); + } else { + g_system->copyRectToScreen(frame->pixels, frame->pitch, x, y, width, height); + } + + g_system->updateScreen(); + } + } + + Common::Event event; + while (g_system->getEventManager()->pollEvent(event)) { + if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP) + skipVideo = true; + } + + g_system->delayMillis(10); + } + + delete[] scaleBuffer; + delete videoDecoder; +} + +void tests() { +#if 0 + // Video test + Video::VideoDecoder *videoDecoder = new ZorkAVIDecoder(); + if (videoDecoder && videoDecoder->loadFile("zassets/temple/t000a11c.avi")) { + Common::List<Graphics::PixelFormat> formats; + formats.push_back(videoDecoder->getPixelFormat()); + //initGraphics(640, 480, true, formats); + + playVideo(videoDecoder); + } +#endif + + Common::File f; + +#if 0 + // Image test + + //initGraphics(640, 480, true, &format); + + if (f.open("zassets/castle/cb8eb11c.tga")) { + Graphics::TGADecoder tga; + if (!tga.loadStream(f)) + error("Error while reading TGA image"); + f.close(); + + const Graphics::Surface *tgaSurface = tga.getSurface(); + + Graphics::Surface *screen = g_system->lockScreen(); + for (uint16 y = 0; y < tgaSurface->h; y++) + memcpy(screen->getBasePtr(0, y), tgaSurface->getBasePtr(0, y), tgaSurface->pitch); + g_system->unlockScreen(); + + tga.destroy(); + } + + +#endif + +#if 0 + // Sound test + if (f.open("zassets/castle/c000h9tc.raw")) { + Audio::SeekableAudioStream *audioStream = makeRawZorkStream(&f, 22050, DisposeAfterUse::YES); + Audio::SoundHandle handle; + g_system->getMixer()->playStream(Audio::Mixer::kSFXSoundType, &handle, audioStream); + } + +#endif +} + +} // End of namespace ZVision diff --git a/engines/zvision/zvision.cpp b/engines/zvision/zvision.cpp index b347782f59..2cc0b47113 100644 --- a/engines/zvision/zvision.cpp +++ b/engines/zvision/zvision.cpp @@ -1,29 +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.
+ *
+ */
+
#include "common/scummsys.h"
-
+
#include "common/config-manager.h"
#include "common/debug.h"
#include "common/debug-channels.h"
#include "common/error.h"
-#include "common/EventRecorder.h"
+#include "common/system.h"
#include "common/file.h"
-#include "common/fs.h"
-
-#include "audio/audiostream.h"
-#include "audio/mixer.h"
-
-#include "graphics/palette.h"
-#include "graphics/surface.h"
-#include "graphics/decoders/tga.h"
-
-#include "video/video_decoder.h"
-#include "video/avi_decoder.h"
#include "engines/util.h"
#include "zvision/zvision.h"
#include "zvision/zfsArchive.h"
-#include "zvision/zork_avi_decoder.h"
-#include "zvision/zork_raw.h"
+
+#include "graphics/decoders/tga.h"
namespace ZVision {
@@ -36,9 +47,9 @@ ZVision::ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc) : Engine // However this is the place to specify all default directories
const Common::FSNode gameDataDir(ConfMan.get("path"));
- SearchMan.addSubDirectoryMatching(gameDataDir, "data1");
- SearchMan.addSubDirectoryMatching(gameDataDir, "data2");
- SearchMan.addSubDirectoryMatching(gameDataDir, "data3");
+ SearchMan.addSubDirectoryMatching(gameDataDir, "data1", 0, 4);
+ SearchMan.addSubDirectoryMatching(gameDataDir, "data2", 0, 4);
+ SearchMan.addSubDirectoryMatching(gameDataDir, "data3", 0, 4);
SearchMan.addSubDirectoryMatching(gameDataDir, "znemmx");
SearchMan.addSubDirectoryMatching(gameDataDir, "znemscr");
@@ -62,109 +73,12 @@ ZVision::~ZVision() { DebugMan.clearAllDebugChannels();
}
-// Taken from SCI
-void scale2x(const byte *src, byte *dst, int16 srcWidth, int16 srcHeight, byte bytesPerPixel) {
- assert(bytesPerPixel == 1 || bytesPerPixel == 2);
- const int newWidth = srcWidth * 2;
- const int pitch = newWidth * bytesPerPixel;
- const byte *srcPtr = src;
-
- if (bytesPerPixel == 1) {
- for (int y = 0; y < srcHeight; y++) {
- for (int x = 0; x < srcWidth; x++) {
- const byte color = *srcPtr++;
- dst[0] = color;
- dst[1] = color;
- dst[newWidth] = color;
- dst[newWidth + 1] = color;
- dst += 2;
- }
- dst += newWidth;
- }
- } else if (bytesPerPixel == 2) {
- for (int y = 0; y < srcHeight; y++) {
- for (int x = 0; x < srcWidth; x++) {
- const byte color = *srcPtr++;
- const byte color2 = *srcPtr++;
- dst[0] = color;
- dst[1] = color2;
- dst[2] = color;
- dst[3] = color2;
- dst[pitch] = color;
- dst[pitch + 1] = color2;
- dst[pitch + 2] = color;
- dst[pitch + 3] = color2;
- dst += 4;
- }
- dst += pitch;
- }
- }
-}
-
-void playVideo(Video::VideoDecoder *videoDecoder /*, VideoState videoState*/) {
- if (!videoDecoder)
- return;
-
- videoDecoder->start();
-
- byte *scaleBuffer = 0;
- byte bytesPerPixel = videoDecoder->getPixelFormat().bytesPerPixel;
- uint16 width = videoDecoder->getWidth();
- uint16 height = videoDecoder->getHeight();
- uint16 pitch = videoDecoder->getWidth() * bytesPerPixel;
- uint16 screenWidth = 640;//g_sci->_gfxScreen->getDisplayWidth();
- uint16 screenHeight = 480;//g_sci->_gfxScreen->getDisplayHeight();
-
- bool zoom2x = true;
-
- if (zoom2x) {
- width *= 2;
- height *= 2;
- pitch *= 2;
- scaleBuffer = new byte[width * height * bytesPerPixel];
- }
-
- uint16 x, y;
-
- x = (screenWidth - width) / 2;
- y = (screenHeight - height) / 2;
-
- bool skipVideo = false;
-
- while (!g_engine->shouldQuit() && !videoDecoder->endOfVideo() && !skipVideo) {
- if (videoDecoder->needsUpdate()) {
- const Graphics::Surface *frame = videoDecoder->decodeNextFrame();
-
- if (frame) {
- if (scaleBuffer) {
- scale2x((byte *)frame->pixels, scaleBuffer, videoDecoder->getWidth(), videoDecoder->getHeight(), bytesPerPixel);
- g_system->copyRectToScreen(scaleBuffer, pitch, x, y, width, height);
- } else {
- g_system->copyRectToScreen(frame->pixels, frame->pitch, x, y, width, height);
- }
-
- g_system->updateScreen();
- }
- }
-
- Common::Event event;
- while (g_system->getEventManager()->pollEvent(event)) {
- if ((event.type == Common::EVENT_KEYDOWN && event.kbd.keycode == Common::KEYCODE_ESCAPE) || event.type == Common::EVENT_LBUTTONUP)
- skipVideo = true;
- }
-
- g_system->delayMillis(10);
- }
-
- delete[] scaleBuffer;
- delete videoDecoder;
-}
-
Common::Error ZVision::run() {
- // Register the files within the zfs archive files with the SearchMan
+ // Find zfs archive files
Common::ArchiveMemberList list;
SearchMan.listMatchingMembers(list, "*.zfs");
+ // Register the file entries within the zfs archives with the SearchMan
for (Common::ArchiveMemberList::iterator iter = list.begin(); iter != list.end(); ++iter) {
Common::String name = (*iter)->getName();
ZfsArchive *archive = new ZfsArchive(name, (*iter)->createReadStream());
@@ -178,86 +92,35 @@ Common::Error ZVision::run() { // Create debugger console. It requires GFX to be initialized
_console = new Console(this);
-
- // Additional setup.
- debug("ZVision::init");
-
- // Your main even loop should be (invoked from) here.
- debug("ZVision::go: Hello, World!");
-
- // This test will show up if -d1 and --debugflags=example are specified on the commandline
- //debugC(1, kZVisionDebugExample, "Example debug call");
-
- // This test will show up if --debugflags=example or --debugflags=example2 or both of them and -d3 are specified on the commandline
- //debugC(3, kZVisionDebugExample | kZVisionDebugExample2, "Example debug call two");
-
- Common::File file;
-
- if (file.open("ADLIB.MDI")) {
- file.close();
- }
-
-
-
-#if 1
- // Video test
- Video::VideoDecoder *videoDecoder = new ZorkAVIDecoder();
- if (videoDecoder && videoDecoder->loadFile("ZASSETS/TEMPLE/T000A11C.AVI")) {
- Common::List<Graphics::PixelFormat> formats;
- formats.push_back(videoDecoder->getPixelFormat());
- initGraphics(640, 480, true, formats);
-
- playVideo(videoDecoder);
- }
-#endif
-
- Common::File f;
-
-#if 1
- // Image test
-
- initGraphics(640, 480, true, &format);
-
- if (f.open("zassets/castle/CB8EB11C.TGA")) {
- Graphics::TGADecoder tga;
- if (!tga.loadStream(f))
- error("Error while reading TGA image");
- f.close();
-
- const Graphics::Surface *tgaSurface = tga.getSurface();
-
- Graphics::Surface *screen = g_system->lockScreen();
- for (uint16 y = 0; y < tgaSurface->h; y++)
- memcpy(screen->getBasePtr(0, y), tgaSurface->getBasePtr(0, y), tgaSurface->pitch);
- g_system->unlockScreen();
-
- tga.destroy();
- }
-
-
-#endif
-
-#if 1
- // Sound test
- if (f.open("zassets/castle/C000H9TC.RAW")) {
- Audio::SeekableAudioStream *audioStream = makeRawZorkStream(&f, 22050, DisposeAfterUse::YES);
- Audio::SoundHandle handle;
- g_system->getMixer()->playStream(Audio::Mixer::kSFXSoundType, &handle, audioStream);
- }
-
-#endif
// Main loop
- Common::EventManager *eventMan = g_system->getEventManager();
- Common::Event event;
+ uint32 currentTime = _system->getMillis();
+ uint32 lastTime = currentTime;
+ const uint32 desiredFrameTime = 33; // ~30 fps
while (!shouldQuit()) {
- eventMan->pollEvent(event); // eat events
- g_system->updateScreen();
- g_system->delayMillis(10);
+ processEvents();
+
+ currentTime = _system->getMillis();
+ uint32 deltaTime = currentTime - lastTime;
+ lastTime = currentTime;
+
+ updateScripts();
+ updateAnimations(deltaTime);
+
+ if (_needsScreenUpdate)
+ {
+ _system->updateScreen();
+ }
+
+ // Calculate the frame delay based off a desired frame rate
+ int delay = desiredFrameTime - (currentTime - _system->getMillis());
+ // Ensure non-negative
+ delay = delay < 0 ? 0 : delay;
+ _system->delayMillis(delay);
}
return Common::kNoError;
}
-
+
} // End of namespace ZVision
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h index c2a42f1e21..b4664d0e29 100644 --- a/engines/zvision/zvision.h +++ b/engines/zvision/zvision.h @@ -23,9 +23,12 @@ #ifndef ZVISION_H
#define ZVISION_H
-
+
#include "common/random.h"
+#include "common/events.h"
+
#include "engines/engine.h"
+
#include "gui/debugger.h"
namespace ZVision {
@@ -45,17 +48,32 @@ class ZVision : public Engine { public:
ZVision(OSystem *syst, const ZVisionGameDescription *gameDesc);
~ZVision();
-
- uint32 getFeatures() const;
- Common::Language getLanguage() const;
- virtual Common::Error run();
-
+
private:
Console *_console;
const ZVisionGameDescription *_gameDescription;
// We need random numbers
Common::RandomSource *_rnd;
+
+ // To prevent allocation every time we process events
+ Common::Event _event;
+
+ bool _needsScreenUpdate;
+
+public:
+ uint32 getFeatures() const;
+ Common::Language getLanguage() const;
+ virtual Common::Error run();
+
+private:
+ void processEvents();
+ void onMouseDown(const Common::Point &pos); + void onMouseMove(const Common::Point &pos); + void onKeyDown(uint16 keyCode);
+
+ void updateScripts();
+ void updateAnimations(uint32 detaTimeMillis);
};
// Example console class
|