Changeset 9797 in orxonox.OLD

Timestamp:

Sep 24, 2006, 11:34:19 AM (18 years ago)

Author:

bensch

Message:

cleaner deletion of NewResourceManager

Location:

branches/new_class_id/src

Files:

• lib/util/loading/new_resource_manager.cc (modified) (1 diff)
• lib/util/loading/new_resource_manager.h (modified) (3 diffs)
• orxonox.cc (modified) (4 diffs)

branches/new_class_id/src/lib/util/loading/new_resource_manager.cc

@@ -20 +20 @@
 
 #include <algorithm>
-#include <assert.h>
+#include <cassert>
 
 ObjectListDefinition(NewResourceManager);

branches/new_class_id/src/lib/util/loading/new_resource_manager.h

@@ -14 +14 @@
   ObjectListDeclaration(NewResourceManager);
 public:
-  virtual ~NewResourceManager();
   /** @returns a Pointer to the only object of this Class */
   inline static NewResourceManager* getInstance() { if (!_singletonRef) _singletonRef = new NewResourceManager();  return _singletonRef; };
+  inline static void deleteInstance() { if (_singletonRef) delete _singletonRef; };
 
 
@@ -26 +26 @@
   void registerType(Resources::Type* type);
 
+  void addKeepLevel(unsigned int i, const std::string& keepLevel);
 
   const std::vector<Resources::Type*> resourceTypes() const { return _resourceTypes; };
@@ -44 +45 @@
 private:
   NewResourceManager();
+  virtual ~NewResourceManager();
 
 private:
-  static NewResourceManager*       _singletonRef;       //!< singleton Reference
+  static NewResourceManager*         _singletonRef;       //!< singleton Reference
 
-  std::vector<Resources::Type*>    _resourceTypes;
+  std::vector<Resources::Type*>      _resourceTypes;
   //! GLOBALS
-  Directory                        _mainGlobalPath;
-  std::vector<Directory>           _globalPaths;
+  Directory                          _mainGlobalPath;
+  std::vector<Directory>             _globalPaths;
 
-
+  std::vector<Resources::KeepLevel>  _keepLevels;
 };
 

branches/new_class_id/src/orxonox.cc

@@ -41 +41 @@
 #include "sound_engine.h"
 #include "util/loading/resource_manager.h"
+#include "util/loading/new_resource_manager.h"
+
 #include "cd_engine.h"
-#include "text_engine.h"
 #include "event_handler.h"
 
@@ -128 +129 @@
 
   // handlers
-  delete ResourceManager::getInstance(); // deletes the Resource Manager
+  NewResourceManager::deleteInstance(); // deletes the Resource Manager
 
   // engines
@@ -327 +328 @@
 
 //#include "util/loading/dynamic_loader.h"
-#include "loading/new_resource_manager.h"
 /**
  * initializes and loads resource files
@@ -352 +352 @@
     PRINTF(1)("The DataDirectory %s could not be verified\n\nh" \
               "!!!  Please Change in File %s Section %s Entry %s to a suitable value !!!\n",
-              NewResourceManager::getInstance()->mainGlobalPath().c_str(),
+              NewResourceManager::getInstance()->mainGlobalPath().name().c_str(),
               this->configFileName.c_str(),
               CONFIG_SECTION_GENERAL,