ASYLUM: * better resource abstraction using resman

git-svn-id: http://asylumengine.googlecode.com/svn/trunk@56 0bfb4aae-4ea4-11de-8d8d-752d95cf3e3c

engines/asylum/asylum.cpp

@@ -31,10 +31,8 @@
 #include "common/stream.h"
 #include "sound/audiostream.h"
 #include "sound/wave.h"
-
-#include "asylum/asylum.h"
 #include "asylum/screen.h"
-#include "asylum/video.h"
+#include "asylum/asylum.h"
 
 namespace Asylum {
 
@@ -52,7 +50,6 @@ AsylumEngine::~AsylumEngine() {
     //Common::clearAllDebugChannels();
     delete _screen;
 	delete _resMgr;
-	delete _video;
 }
 
 Common::Error AsylumEngine::run() {
@@ -68,8 +65,7 @@ Common::Error AsylumEngine::init() {
 	// initialize engine objects
 
 	_screen = new Screen(_system);
-	_resMgr = new ResourceManager;
-	_video = new Video(_mixer);
+	_resMgr = new ResourceManager(this);
 
 	// initializing game
 	// TODO: save dialogue key codes into sntrm_k.txt (need to figure out why they use such thing)
@@ -85,7 +81,8 @@ Common::Error AsylumEngine::init() {
 
 Common::Error AsylumEngine::go() {
 	// Play intro movie
-	_video->playVideo(0);
+
+	_resMgr->loadVideo(0);
 
 	showMainMenu();
 
@@ -117,7 +114,12 @@ Common::Error AsylumEngine::go() {
 }
 
 void AsylumEngine::showMainMenu() {
+	// main menu background
+	_resMgr->loadGraphic(1, 0, 0);
+	_resMgr->loadPalette(1, 17);
+	_resMgr->loadCursor(1, 2, 0);
 
+	/*
 
 	// Music - start
 
@@ -149,27 +151,7 @@ void AsylumEngine::showMainMenu() {
 	_mixer->playInputStream(Audio::Mixer::kMusicSoundType, &_musicHandle, mus);
 
 	// Music - end
-
-
-	// eyes animation index table
-	//const uint32 eyesTable[8] = {3, 5, 1, 7, 4, 8, 2, 6};
-	byte pal[256 * 3];
-	_resMgr->getPalette(1, 17, pal);
-	GraphicResource *bg  = _resMgr->getGraphic(1, 0)->getEntry(0);
-	GraphicResource *cur = _resMgr->getGraphic(1, 2)->getEntry(0);
-
-	_system->setMouseCursor(cur->data, cur->width, cur->height, 1, 1, 0);
-	// FIXME: is there any reason why the cursor palette is set here,
-	// when it's the same as the rest of the game's palette?
-	//_system->setCursorPalette(pal, 0, 1024);
-	_system->showMouse(true);
-
-	_screen->setFrontBuffer(
-			0, 0,
-			bg->width, bg->height,
-			bg->data);
-	_screen->setPalette(pal);
-	_screen->updateScreen();
+	 */
 }
 
 } // namespace Asylum

engines/asylum/asylum.h

@@ -27,14 +27,13 @@
 #define ASYLUM_ENGINE_H
 
 #include "engines/engine.h"
-
 #include "asylum/resman.h"
 
 namespace Asylum {
 
+class ResourceManager;
 class Screen;
 class Menu;
-class Video;
 
 class AsylumEngine: public Engine {
 public:
@@ -48,13 +47,16 @@ public:
     virtual Common::Error run();
     virtual bool hasFeature(EngineFeature f) const;
 
+    Screen* getScreen() {
+    		return _screen;
+    	}
+
 private:
     Common::Language     _language;
     Common::RandomSource _rnd;
 
     ResourceManager *_resMgr;
     Screen          *_screen;
-	Video			*_video;
 
     void showMainMenu();
 

engines/asylum/bundle.cpp

@@ -35,6 +35,10 @@ Bundle::Bundle() {
 	offset     = 0;
 }
 
+Bundle::Bundle(uint8 fileNum, uint32 index, uint32 length) {
+	loadRawRecord(parseFilename(fileNum), index, length);
+}
+
 Bundle::Bundle(uint8 fileNum) {
 	Common::File* file = new Common::File;
 	Common::String filename = parseFilename(fileNum);

engines/asylum/bundle.h

@@ -44,6 +44,7 @@ class Bundle {
 public:
 	Bundle();
 	Bundle(uint8 fileNum);
+	Bundle(uint8 fileNum, uint32 index, uint32 length);
 	virtual ~Bundle() {}
 
 	uint8*  getData() { return data; }

engines/asylum/resman.cpp

@@ -1,76 +1,124 @@
-/* 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.
- *
- * $URL$
- * $Id$
- *
- */
-
-#include "asylum/resman.h"
-
-namespace Asylum {
-
-GraphicBundle* ResourceManager::getGraphic(uint8 fileNum, uint32 offset) {
-	Bundle *bun = getBundle(fileNum);
-	Bundle *ent = bun->getEntry(offset);
-
-	if(!ent->initialized){
-		GraphicBundle *gra = new GraphicBundle(fileNum, ent->offset, ent->size);
-		bun->setEntry(offset, gra);
-	}
-
-	return (GraphicBundle*)bun->getEntry(offset);
-}
-
-void ResourceManager::getPalette(uint8 fileNum, uint32 offset, byte *palette) {
-	// Sub-optimal, but a bit cleaner (till we get john_doe's code in)
-	Common::File palFile;
-	char filename[256];
-	sprintf(filename, "res.%03d", fileNum);
-	palFile.open(filename);
-
-	// Read entries
-	/*uint32 entryCount =*/ palFile.readUint32LE();
-	palFile.skip(4 * offset);
-	uint32 offs = palFile.readUint32LE();
-	palFile.seek(offs, SEEK_SET);
-	palFile.skip(32);	// TODO: what are these?
-	palFile.read(palette, 256 * 3);
-	palFile.close();
-}
-
-Bundle* ResourceManager::getBundle(uint8 fileNum) {
-	// first check if the bundle exists in the cache
-	Bundle* bun = NULL;
-
-	for (uint32 i = 0; i < _bundleCache.size(); i++) {
-		if (_bundleCache[i].id == fileNum ){
-			*bun = _bundleCache[i];
-		}
-	}
-
-	if(!bun) {
-		bun = new Bundle(fileNum);
-	}
-
-	return bun;
-}
-
-} // end of namespace Asylum
+/* 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.
+ *
+ * $URL$
+ * $Id$
+ *
+ */
+
+#include "asylum/resman.h"
+
+namespace Asylum {
+
+ResourceManager::ResourceManager(AsylumEngine *vm): _vm(vm) {
+	_video = new Video(_vm->_mixer);
+}
+
+ResourceManager::~ResourceManager() {
+	delete _video;
+}
+
+bool ResourceManager::loadVideo(uint8 fileNum) {
+	return _video->playVideo(fileNum);
+}
+
+bool ResourceManager::loadGraphic(uint8 fileNum, uint32 offset, uint32 index) {
+	GraphicResource *res = getGraphic(fileNum, offset, index);
+
+	_vm->getScreen()->setFrontBuffer(0, 0, res->width, res->height, res->data);
+
+	// TODO proper error check
+	return true;
+}
+
+bool ResourceManager::loadPalette(uint8 fileNum, uint32 offset) {
+	Bundle *bun = getBundle(fileNum);
+	Bundle *ent = bun->getEntry(offset);
+
+	if(!ent->initialized){
+		ent = new Bundle(fileNum, ent->offset, ent->size);
+		bun->setEntry(offset, ent);
+	}
+
+	uint8 palette[256 * 3];
+	memcpy(palette, ent->getData() + 32, 256 * 3);
+
+	_vm->getScreen()->setPalette(palette);
+
+	// TODO proper error check
+	return true;
+}
+
+bool ResourceManager::loadCursor(uint8 fileNum, uint32 offet, uint32 index) {
+	GraphicResource *cur = getGraphic(fileNum, offet, index);
+	_vm->_system->setMouseCursor(cur->data, cur->width, cur->height, 1, 1, 0);
+	_vm->_system->showMouse(true);
+
+	// TODO proper error check
+	return true;
+}
+
+GraphicResource* ResourceManager::getGraphic(uint8 fileNum, uint32 offset, uint32 index) {
+	Bundle *bun = getBundle(fileNum);
+	Bundle *ent = bun->getEntry(offset);
+	GraphicBundle *gra;
+
+	if(!ent->initialized){
+		gra = new GraphicBundle(fileNum, ent->offset, ent->size);
+		bun->setEntry(offset, gra);
+	}else{
+		gra = (GraphicBundle*)bun->getEntry(offset);
+	}
+
+	return gra->getEntry(index);
+}
+
+/*
+GraphicBundle* ResourceManager::getGraphic(uint8 fileNum, uint32 offset) {
+	Bundle *bun = getBundle(fileNum);
+	Bundle *ent = bun->getEntry(offset);
+
+	if(!ent->initialized){
+		GraphicBundle *gra = new GraphicBundle(fileNum, ent->offset, ent->size);
+		bun->setEntry(offset, gra);
+	}
+
+	return (GraphicBundle*)bun->getEntry(offset);
+}
+
+*/
+Bundle* ResourceManager::getBundle(uint8 fileNum) {
+	// first check if the bundle exists in the cache
+	Bundle* bun = NULL;
+
+	for (uint32 i = 0; i < _bundleCache.size(); i++) {
+		if (_bundleCache[i].id == fileNum ){
+			*bun = _bundleCache[i];
+		}
+	}
+
+	if(!bun) {
+		bun = new Bundle(fileNum);
+	}
+
+	return bun;
+}
+
+} // end of namespace Asylum

engines/asylum/resman.h

@@ -31,21 +31,36 @@
 
 #include "asylum/bundle.h"
 #include "asylum/graphicbundle.h"
+#include "asylum/video.h"
+#include "asylum/screen.h"
+#include "asylum/asylum.h"
 
 namespace Asylum {
 
+// forward declarations
+class AsylumEngine;
+class Video;
+
 class ResourceManager {
 public:
-	ResourceManager() {};
-	~ResourceManager() {};
+	ResourceManager(AsylumEngine *vm);
+	virtual ~ResourceManager();
 
-	GraphicBundle* getGraphic(uint8 fileNum, uint32 offset);
-	void getPalette(uint8 fileNum, uint32 offset, byte *palette);
+	bool loadGraphic(uint8 fileNum, uint32 offset, uint32 index);
+	bool loadCursor(uint8 fileNum, uint32 offset, uint32 index);
+	bool loadPalette(uint8 fileNum, uint32 offset);
+	bool loadSound(uint8 fileNum, uint32 offset);
+	bool loadMusic(uint8 fileNum, uint32 offset);
+	bool loadVideo(uint8 fileNum);
 
 private:
 	Common::Array<Bundle> _bundleCache;
 
 	Bundle* getBundle(uint8 fileNum);
+	GraphicResource* getGraphic(uint8 fileNum, uint32 offset, uint32 index);
+
+	AsylumEngine *_vm;
+	Video		 *_video;
 
 }; // end of class ResourceManager