Changeset 4166 in orxonox.OLD

Timestamp:

May 11, 2005, 3:07:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: resourceManager has some new functions

Location:

orxonox/trunk/src

Files:

• subprojects/benchmark.cc (modified) (1 diff)
• track_manager.cc (modified) (2 diffs)
• track_manager.h (modified) (1 diff)
• util/resource_manager.cc (modified) (4 diffs)
• util/resource_manager.h (modified) (4 diffs)

orxonox/trunk/src/subprojects/benchmark.cc

@@ -463 +463 @@
 #else
 
+#include "debug.h"
+
 int startBenchmarks()
 {

orxonox/trunk/src/track_manager.cc

@@ -29 +29 @@
 
 using namespace std;
-
-CREATE_FACTORY(TrackManager);
 
 /**
@@ -405 +403 @@
 
 */
-TrackManager::TrackManager( TiXmlElement* root)
+bool TrackManager::load( TiXmlElement* root)
 {
 

orxonox/trunk/src/track_manager.h

@@ -153 +153 @@
   static TrackManager* getInstance(void);
 
-  TrackManager(TiXmlElement* root);
+  bool load(TiXmlElement* root);
 
   // Methods to change the Path (initialisation)

orxonox/trunk/src/util/resource_manager.cc

@@ -584 +584 @@
 }
 
+/**
+   \brief touches a File on the disk (thereby creating it)
+   \param fileName The file to touch
+*/
 bool ResourceManager::touchFile(const char* fileName)
 {
@@ -599 +603 @@
 }
 
+/**
+   \brief deletes a File from disk
+   \param fileName the File to delete
+*/
 bool ResourceManager::deleteFile(const char* fileName)
 {
@@ -606 +614 @@
 }
 
+/** 
+    \param fileName the Name of the file to check
+    \returns The name of the file, including the HomeDir
+    IMPORTANT: this has to be deleted from the outside
+*/
 char* ResourceManager::homeDirCheck(const char* name)
 {
@@ -628 +641 @@
 }
 
+/** 
+    \param fileName the Name of the File to check
+    \returns The full name of the file, including the DataDir
+    IMPORTANT: this has to be deleted from the outside
+*/
+char* ResourceManager::getFullName(const char* fileName)
+{
+  char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir()) + strlen(fileName)+1];
+  sprintf(retName, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName);
+  return retName;
+}
 
 

orxonox/trunk/src/util/resource_manager.h

@@ -18 +18 @@
 
 //! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support
-enum ResourceType {OBJ, PRIM, WAV, MP3, OGG, TTF, IMAGE};
+enum ResourceType {OBJ,
+                   PRIM,
+                   WAV,
+                   MP3,
+                   OGG,
+                   TTF,
+                   IMAGE};
 //! An enumerator for different UNLOAD-types. 
 /**
@@ -26 +32 @@
    RP_GAME: will be unloaded at the end of the whole Game (when closing orxonox)
 */
-enum ResourcePriority {RP_NO = 0, RP_LEVEL = 1, RP_CAMPAIGN = 2, RP_GAME = 3};
+enum ResourcePriority {RP_NO = 0,
+                       RP_LEVEL = 1,
+                       RP_CAMPAIGN = 2,
+                       RP_GAME = 3};
 
 //! A Struct that keeps track about A resource its name its Type, and so on
@@ -66 +75 @@
   bool setDataDir(const char* dataDir);
   /** \returns the Name of the data directory */
-  inline const char*  getDataDir(void) {return this->dataDir;}
+  inline const char* getDataDir(void) const {return this->dataDir;}
+
   bool checkDataDir(const char* fileInside);
   bool addImageDir(char* imageDir);
@@ -84 +94 @@
   static bool touchFile(const char* fileName);
   static bool deleteFile(const char* fileName);
-  static char* homeDirCheck(const char* name);
+  static char* homeDirCheck(const char* fileName);
+  static char* getFullName(const char* fileName);
 
  private: