Cleanup of OpenSpaceEngine by factoring out ConfigurationManager class

include/openspace/engine/configurationmanager.h

@@ -0,0 +1,43 @@
+/*****************************************************************************************
+ *                                                                                       *
+ * OpenSpace                                                                             *
+ *                                                                                       *
+ * Copyright (c) 2014                                                                    *
+ *                                                                                       *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this  *
+ * software and associated documentation files (the "Software"), to deal in the Software *
+ * without restriction, including without limitation the rights to use, copy, modify,    *
+ * merge, publish, distribute, sublicense, and/or sell copies of the Software, and to    *
+ * permit persons to whom the Software is furnished to do so, subject to the following   *
+ * conditions:                                                                           *
+ *                                                                                       *
+ * The above copyright notice and this permission notice shall be included in all copies *
+ * or substantial portions of the Software.                                              *
+ *                                                                                       *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,   *
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A         *
+ * PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT    *
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF  *
+ * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE  *
+ * OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                                         *
+ ****************************************************************************************/
+
+#ifndef __CONFIGURATIONMANAGER_H__
+#define __CONFIGURATIONMANAGER_H__
+
+#include <ghoul/misc/dictionary.h>
+
+namespace openspace {
+
+class ConfigurationManager : public ghoul::Dictionary {
+public:
+	bool loadFromFile(const std::string& filename);
+
+private:
+	bool registerPaths();
+	bool registerBasePathFromConfigurationFile(const std::string& filename);
+};
+
+} // namespace openspace
+
+#endif  // __CONFIGURATIONMANAGER_H__

include/openspace/engine/openspaceengine.h

@@ -33,7 +33,8 @@
 
 #include <openspace/interaction/interactionhandler.h>
 #include <openspace/rendering/renderengine.h>
-#include <ghoul/misc/dictionary.h>
+#include <openspace/engine/configurationmanager.h>
+//#include <ghoul/misc/dictionary.h>
 
 #include <ghoul/opencl/clcontext.h>
 #include <ghoul/opencl/clcommandqueue.h>
@@ -74,11 +75,9 @@ public:
     static bool isInitialized();
     bool initialize();
 
-    static void registerPathsFromDictionary(const ghoul::Dictionary& dictionary);
-    static bool registerBasePathFromConfigurationFile(const std::string& filename);
     static bool findConfiguration(std::string& filename);
 
-    ghoul::Dictionary& configurationManager();
+    ConfigurationManager& configurationManager();
     ghoul::opencl::CLContext& clContext();
     InteractionHandler& interactionHandler();
     RenderEngine& renderEngine();
@@ -108,7 +107,7 @@ private:
 
     static OpenSpaceEngine* _engine;
 
-    ghoul::Dictionary* _configurationManager;
+    ConfigurationManager* _configurationManager;
     InteractionHandler* _interactionHandler;
     RenderEngine* _renderEngine;
 	scripting::ScriptEngine* _scriptEngine;

include/openspace/util/constants.h

@@ -29,13 +29,17 @@
 
 namespace openspace {
 namespace constants {
-namespace openspaceengine {
+
+namespace configurationmanager {
     const std::string keyPaths = "Paths";
     const std::string keyConfigSgct = "SGCTConfig";
     const std::string keyConfigScene = "Scene";
     const std::string keyStartupScript = "StartupScripts";
 	const std::string keyConfigTimekernel = "SpiceTimeKernel";
-} // namespace openspaceengine
+	namespace paths {
+		const std::string keyBasePath = "BASE_PATH";
+	} // namespace paths
+} // namespace configurationmanager
 
 namespace scenegraph {
     const std::string keyPathScene = "ScenePath";