aboutsummaryrefslogtreecommitdiff
path: root/engines/sword25/kernel/kernel.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sword25/kernel/kernel.cpp')
-rw-r--r--engines/sword25/kernel/kernel.cpp403
1 files changed, 80 insertions, 323 deletions
diff --git a/engines/sword25/kernel/kernel.cpp b/engines/sword25/kernel/kernel.cpp
index 3e7e7f125f..9bd8ac5ff7 100644
--- a/engines/sword25/kernel/kernel.cpp
+++ b/engines/sword25/kernel/kernel.cpp
@@ -38,417 +38,174 @@
#include "sword25/input/inputengine.h"
#include "sword25/kernel/kernel.h"
#include "sword25/kernel/persistenceservice.h"
-#include "sword25/kernel/service_ids.h"
+#include "sword25/math/geometry.h"
#include "sword25/package/packagemanager.h"
-#include "sword25/script/script.h"
+#include "sword25/script/luascript.h"
#include "sword25/sfx/soundengine.h"
namespace Sword25 {
#define BS_LOG_PREFIX "KERNEL"
-Kernel *Kernel::_Instance = 0;
+Kernel *Kernel::_instance = 0;
Kernel::Kernel() :
- _pWindow(NULL),
- _Running(false),
- _pResourceManager(NULL),
- _InitSuccess(false) {
+ _resourceManager(NULL),
+ _initSuccess(false),
+ _gfx(0),
+ _sfx(0),
+ _input(0),
+ _package(0),
+ _script(0),
+ _fmv(0)
+ {
// Log that the kernel is beign created
BS_LOGLN("created.");
-
- // Read the BS_SERVICE_TABLE and prepare kernel structures
- for (uint i = 0; i < BS_SERVICE_COUNT; i++) {
- // Is the superclass already registered?
- Superclass *pCurSuperclass = NULL;
- Common::Array<Superclass *>::iterator Iter;
- for (Iter = _SuperclassList.begin(); Iter != _SuperclassList.end(); ++Iter)
- if ((*Iter)->GetIdentifier() == BS_SERVICE_TABLE[i].SuperclassIdentifier) {
- pCurSuperclass = *Iter;
- break;
- }
-
- // If the superclass isn't already registered, then add it in
- if (!pCurSuperclass)
- _SuperclassList.push_back(new Superclass(this, BS_SERVICE_TABLE[i].SuperclassIdentifier));
- }
-
- // Create window object
- _pWindow = Window::CreateBSWindow(0, 0, 0, 0, false);
- if (!_pWindow) {
- BS_LOG_ERRORLN("Failed to create the window.");
- } else
- BS_LOGLN("Window created.");
+ _instance = this;
// Create the resource manager
- _pResourceManager = new ResourceManager(this);
+ _resourceManager = new ResourceManager(this);
// Initialise the script engine
- ScriptEngine *pScript = static_cast<ScriptEngine *>(NewService("script", "lua"));
- if (!pScript || !pScript->init()) {
- _InitSuccess = false;
+ _script = new LuaScriptEngine(this);
+ if (!_script || !_script->init()) {
+ _initSuccess = false;
return;
}
// Register kernel script bindings
- if (!_RegisterScriptBindings()) {
+ if (!registerScriptBindings()) {
BS_LOG_ERRORLN("Script bindings could not be registered.");
- _InitSuccess = false;
+ _initSuccess = false;
return;
}
BS_LOGLN("Script bindings registered.");
- _InitSuccess = true;
-}
-
-Kernel::~Kernel() {
- // Services are de-registered in reverse order of creation
- while (!_ServiceCreationOrder.empty()) {
- Superclass *superclass = GetSuperclassByIdentifier(_ServiceCreationOrder.top());
- if (superclass) superclass->DisconnectService();
- _ServiceCreationOrder.pop();
- }
-
- // Empty the Superclass list
- while (_SuperclassList.size()) {
- delete _SuperclassList.back();
- _SuperclassList.pop_back();
- }
-
- // Release the window object
- delete _pWindow;
- BS_LOGLN("Window destroyed.");
-
- // Resource-Manager freigeben
- delete _pResourceManager;
-
- BS_LOGLN("destroyed.");
-}
-
-// Service Methoden
-// ----------------
-
-Kernel::Superclass::Superclass(Kernel *pKernel, const Common::String &Identifier) :
- _pKernel(pKernel),
- _Identifier(Identifier),
- _ServiceCount(0),
- _ActiveService(NULL) {
- for (uint i = 0; i < BS_SERVICE_COUNT; i++)
- if (BS_SERVICE_TABLE[i].SuperclassIdentifier == _Identifier)
- _ServiceCount++;
-}
-
-Kernel::Superclass::~Superclass() {
- DisconnectService();
-}
-
-/**
- * Gets the identifier of a service with a given superclass.
- * The number of services in a superclass can be learned with GetServiceCount().
- * @param SuperclassIdentifier The name of the superclass
- * z.B: "sfx", "gfx", "package" ...
- * @param Number die Nummer des Services, dessen Bezeichner man erfahren will.<br>
- * Hierbei ist zu beachten, dass der erste Service die Nummer 0 erhält. Number muss also eine Zahl zwischen
- * 0 und GetServiceCount() - 1 sein.
- */
-Common::String Kernel::Superclass::GetServiceIdentifier(uint Number) {
- if (Number > _ServiceCount) return NULL;
-
- uint CurServiceOrd = 0;
- for (uint i = 0; i < BS_SERVICE_COUNT; i++) {
- if (BS_SERVICE_TABLE[i].SuperclassIdentifier == _Identifier) {
- if (Number == CurServiceOrd)
- return BS_SERVICE_TABLE[i].ServiceIdentifier;
- else
- CurServiceOrd++;
- }
- }
-
- return Common::String("");
-}
-
-/**
- * Creates a new service with the given identifier. Returns a pointer to the service, or null if the
- * service could not be created
- * Note: All services must be registered in service_ids.h, otherwise they cannot be created here
- * @param SuperclassIdentifier The name of the superclass of the service
- * z.B: "sfx", "gfx", "package" ...
- * @param ServiceIdentifier The name of the service
- * For the superclass "sfx" an example could be "Fmod" or "directsound"
- */
-Service *Kernel::Superclass::NewService(const Common::String &ServiceIdentifier) {
- for (uint i = 0; i < BS_SERVICE_COUNT; i++)
- if (BS_SERVICE_TABLE[i].SuperclassIdentifier == _Identifier &&
- BS_SERVICE_TABLE[i].ServiceIdentifier == ServiceIdentifier) {
- Service *NewService_ = BS_SERVICE_TABLE[i].CreateMethod(_pKernel);
-
- if (NewService_) {
- DisconnectService();
- BS_LOGLN("Service '%s' created from superclass '%s'.", ServiceIdentifier.c_str(), _Identifier.c_str());
- _ActiveService = NewService_;
- _ActiveServiceName = BS_SERVICE_TABLE[i].ServiceIdentifier;
- return _ActiveService;
- } else {
- BS_LOG_ERRORLN("Failed to create service '%s' from superclass '%s'.", ServiceIdentifier.c_str(), _Identifier.c_str());
- return NULL;
- }
- }
-
- BS_LOG_ERRORLN("Service '%s' is not avaliable from superclass '%s'.", ServiceIdentifier.c_str(), _Identifier.c_str());
- return NULL;
-}
-
-/**
- * Ends the current service of a superclass. Returns true on success, and false if the superclass
- * does not exist or if not service was active
- * @param SuperclassIdentfier The name of the superclass which is to be disconnected
- * z.B: "sfx", "gfx", "package" ...
- */
-bool Kernel::Superclass::DisconnectService() {
- if (_ActiveService) {
- delete _ActiveService;
- _ActiveService = 0;
- BS_LOGLN("Active service '%s' disconnected from superclass '%s'.", _ActiveServiceName.c_str(), _Identifier.c_str());
- return true;
- }
-
- return false;
-}
-
-Kernel::Superclass *Kernel::GetSuperclassByIdentifier(const Common::String &Identifier) {
- Common::Array<Superclass *>::iterator Iter;
- for (Iter = _SuperclassList.begin(); Iter != _SuperclassList.end(); ++Iter) {
- if ((*Iter)->GetIdentifier() == Identifier)
- return *Iter;
- }
-
- // BS_LOG_ERRORLN("Superclass '%s' does not exist.", Identifier.c_str());
- return NULL;
-}
-
-/**
- * Returns the number of register superclasses
- */
-uint Kernel::GetSuperclassCount() {
- return _SuperclassList.size();
-}
-
-/**
- * Returns the name of a superclass with the specified index.
- * Note: The number of superclasses can be retrieved using GetSuperclassCount
- * @param Number The number of the superclass to return the identifier for.
- * It should be noted that the number should be between 0 und GetSuperclassCount() - 1.
- */
-Common::String Kernel::GetSuperclassIdentifier(uint Number) {
- if (Number > _SuperclassList.size()) return NULL;
+ _input = new InputEngine(this);
+ assert(_input);
- uint CurSuperclassOrd = 0;
- Common::Array<Superclass *>::iterator Iter;
- for (Iter = _SuperclassList.begin(); Iter != _SuperclassList.end(); ++Iter) {
- if (CurSuperclassOrd == Number)
- return ((*Iter)->GetIdentifier());
+ _gfx = new GraphicEngine(this);
+ assert(_gfx);
- CurSuperclassOrd++;
- }
+ _sfx = new SoundEngine(this);
+ assert(_sfx);
- return Common::String("");
-}
+ _package = new PackageManager(this);
+ assert(_package);
-/**
- * Returns the number of services registered with a given superclass
- * @param SuperclassIdentifier The name of the superclass
- * z.B: "sfx", "gfx", "package" ...
- */
-uint Kernel::GetServiceCount(const Common::String &SuperclassIdentifier) {
- Superclass *pSuperclass;
- if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier)))
- return 0;
+ _geometry = new Geometry(this);
+ assert(_geometry);
- return pSuperclass->GetServiceCount();
+#ifdef USE_THEORADEC
+ _fmv = new MoviePlayer(this);
+ assert(_fmv);
+#endif
+ _initSuccess = true;
}
-/**
- * Gets the identifier of a service with a given superclass.
- * The number of services in a superclass can be learned with GetServiceCount().
- * @param SuperclassIdentifier The name of the superclass
- * z.B: "sfx", "gfx", "package" ...
- * @param Number die Nummer des Services, dessen Bezeichner man erfahren will.<br>
- * Hierbei ist zu beachten, dass der erste Service die Nummer 0 erhält. Number muss also eine Zahl zwischen
- * 0 und GetServiceCount() - 1 sein.
- */
-Common::String Kernel::GetServiceIdentifier(const Common::String &SuperclassIdentifier, uint Number) {
- Superclass *pSuperclass;
- if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier))) return NULL;
-
- return (pSuperclass->GetServiceIdentifier(Number));
-}
+Kernel::~Kernel() {
+ // Services are de-registered in reverse order of creation
-/**
- * Creates a new service with the given identifier. Returns a pointer to the service, or null if the
- * service could not be created
- * Note: All services must be registered in service_ids.h, otherwise they cannot be created here
- * @param SuperclassIdentifier The name of the superclass of the service
- * z.B: "sfx", "gfx", "package" ...
- * @param ServiceIdentifier The name of the service
- * For the superclass "sfx" an example could be "Fmod" or "directsound"
- */
-Service *Kernel::NewService(const Common::String &SuperclassIdentifier, const Common::String &ServiceIdentifier) {
- Superclass *pSuperclass;
- if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier))) return NULL;
+ delete _input;
+ _input = 0;
- // Die Reihenfolge merken, in der Services erstellt werden, damit sie später in umgekehrter Reihenfolge entladen werden können.
- _ServiceCreationOrder.push(SuperclassIdentifier);
+ delete _gfx;
+ _gfx = 0;
- return pSuperclass->NewService(ServiceIdentifier);
-}
+ delete _sfx;
+ _sfx = 0;
-/**
- * Ends the current service of a superclass. Returns true on success, and false if the superclass
- * does not exist or if not service was active
- * @param SuperclassIdentfier The name of the superclass which is to be disconnected
- * z.B: "sfx", "gfx", "package" ...
- */
-bool Kernel::DisconnectService(const Common::String &SuperclassIdentifier) {
- Superclass *pSuperclass;
- if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier))) return false;
+ delete _package;
+ _package = 0;
- return pSuperclass->DisconnectService();
-}
+ delete _geometry;
+ _geometry = 0;
-/**
- * Returns a pointer to the currently active service object of a superclass
- * @param SuperclassIdentfier The name of the superclass
- * z.B: "sfx", "gfx", "package" ...
- */
-Service *Kernel::GetService(const Common::String &SuperclassIdentifier) {
- Superclass *pSuperclass;
- if (!(pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier))) return NULL;
+#ifdef USE_THEORADEC
+ delete _fmv;
+ _fmv = 0;
+#endif
- return (pSuperclass->GetActiveService());
-}
+ delete _script;
+ _script = 0;
-/**
- * Returns the name of the currentl active service object of a superclass.
- * If an error occurs, then an empty string is returned
- * @param SuperclassIdentfier The name of the superclass
- * z.B: "sfx", "gfx", "package" ...
- */
-Common::String Kernel::GetActiveServiceIdentifier(const Common::String &SuperclassIdentifier) {
- Superclass *pSuperclass = GetSuperclassByIdentifier(SuperclassIdentifier);
- if (!pSuperclass) return Common::String("");
+ // Resource-Manager freigeben
+ delete _resourceManager;
- return (pSuperclass->GetActiveServiceName());
+ BS_LOGLN("destroyed.");
}
-// -----------------------------------------------------------------------------
-
/**
* Returns a random number
* @param Min The minimum allowed value
* @param Max The maximum allowed value
*/
-int Kernel::GetRandomNumber(int Min, int Max) {
- BS_ASSERT(Min <= Max);
+int Kernel::getRandomNumber(int min, int max) {
+ BS_ASSERT(min <= max);
- return Min + _rnd.getRandomNumber(Max - Min + 1);
+ return min + _rnd.getRandomNumber(max - min + 1);
}
/**
* Returns the elapsed time since startup in milliseconds
*/
-uint Kernel::GetMilliTicks() {
+uint Kernel::getMilliTicks() {
return g_system->getMillis();
}
/**
- * Returns the elapsed time since the system start in microseconds.
- * This method should be used only if GetMilliTick() for the desired application is inaccurate.
- */
-uint64 Kernel::GetMicroTicks() {
- return g_system->getMillis() * 1000;
-}
-
-// Other methods
-// -----------------
-
-/**
* Returns how much memory is being used
*/
-size_t Kernel::GetUsedMemory() {
+size_t Kernel::getUsedMemory() {
return 0;
-
-#ifdef SCUMMVM_DISABLED_CODE
- PROCESS_MEMORY_COUNTERS pmc;
- pmc.cb = sizeof(pmc);
- if (GetProcessMemoryInfo(GetCurrentProcess(), &pmc, sizeof(pmc))) {
- return pmc.WorkingSetSize;
- } else {
- BS_LOG_ERRORLN("Call to GetProcessMemoryInfo() failed. Error code: %d", GetLastError());
- return 0;
- }
-#endif
}
-// -----------------------------------------------------------------------------
-
/**
- * Returns a pointer to the active Gfx Service, or NULL if no Gfx service is active
+ * Returns a pointer to the active Gfx Service, or NULL if no Gfx service is active.
*/
-GraphicEngine *Kernel::GetGfx() {
- return static_cast<GraphicEngine *>(GetService("gfx"));
+GraphicEngine *Kernel::getGfx() {
+ return _gfx;
}
-// -----------------------------------------------------------------------------
-
/**
- * Returns a pointer to the active Sfx Service, or NULL if no Sfx service is active
+ * Returns a pointer to the active Sfx Service, or NULL if no Sfx service is active.
*/
-SoundEngine *Kernel::GetSfx() {
- return static_cast<SoundEngine *>(GetService("sfx"));
+SoundEngine *Kernel::getSfx() {
+ return _sfx;
}
-// -----------------------------------------------------------------------------
-
/**
- * Returns a pointer to the active input service, or NULL if no input service is active
+ * Returns a pointer to the active input service, or NULL if no input service is active.
*/
-InputEngine *Kernel::GetInput() {
- return static_cast<InputEngine *>(GetService("input"));
+InputEngine *Kernel::getInput() {
+ return _input;
}
-// -----------------------------------------------------------------------------
-
/**
- * Returns a pointer to the active package manager, or NULL if no manager is active
+ * Returns a pointer to the active package manager, or NULL if no manager is active.
*/
-PackageManager *Kernel::GetPackage() {
- return static_cast<PackageManager *>(GetService("package"));
+PackageManager *Kernel::getPackage() {
+ return _package;
}
-// -----------------------------------------------------------------------------
-
/**
- * Returns a pointer to the script engine, or NULL if it is not active
+ * Returns a pointer to the script engine, or NULL if it is not active.
*/
-ScriptEngine *Kernel::GetScript() {
- return static_cast<ScriptEngine *>(GetService("script"));
+ScriptEngine *Kernel::getScript() {
+ return _script;
}
-// -----------------------------------------------------------------------------
-
/**
- * Returns a pointer to the movie player, or NULL if it is not active
+ * Returns a pointer to the movie player, or NULL if it is not active.
*/
-MoviePlayer *Kernel::GetFMV() {
- return static_cast<MoviePlayer *>(GetService("fmv"));
+MoviePlayer *Kernel::getFMV() {
+ return _fmv;
}
-// -----------------------------------------------------------------------------
-
-void Kernel::Sleep(uint Msecs) const {
- g_system->delayMillis(Msecs);
+void Kernel::sleep(uint msecs) const {
+ g_system->delayMillis(msecs);
}
} // End of namespace Sword25