Changeset 7196 in orxonox.OLD for trunk

Timestamp:

Mar 7, 2006, 11:25:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: spliced a nice patch from the dylib branche back here with:
svn diff -r 7168 resource_manager.* > ../../../../../trunk/fancy.resource.manager.patch

Location:

trunk/src/lib/util/loading

Files:

• resource_manager.cc (modified) (4 diffs)
• resource_manager.h (modified) (2 diffs)

trunk/src/lib/util/loading/resource_manager.cc

@@ -62 +62 @@
   strcpy(this->dataDir, "./");
   this->tryDataDir("./data");
+
+  this->_cwd = NULL;
 }
 
@@ -86 +88 @@
 
   delete[] this->dataDir;
-
+  if (this->_cwd)
+    delete[] this->_cwd;
   ResourceManager::singletonRef = NULL;
 }
@@ -945 +948 @@
 
 /**
+ * @param name the relative name of the File/Directory.
+ * @returns a new char* with the name in abs-dir-format
+ */
+char* ResourceManager::getAbsDir(const char* name)
+{
+  if (name == NULL)
+    return NULL;
+  char* retName;
+  if (strncmp(name, "/", 1))
+  {
+    if (*name == '.' && *(name+1) != '.')
+      name++;
+    const char* absDir = ResourceManager::cwd();
+    retName = new char[strlen(absDir)+strlen(name)+1];
+    sprintf(retName, "%s%s", absDir, name);
+  }
+  else
+  {
+    retName = new char[strlen(name)+1];
+    strcpy(retName, name);
+  }
+  return retName;
+}
+
+
+/**
  * @param fileName the Name of the File to check
  * @returns The full name of the file, including the DataDir, and NULL if the file does not exist
@@ -964 +993 @@
     return NULL;
   }
+}
+
+#ifdef __unix__
+  #include <unistd.h>
+#elif __WIN32__ || _MS_DOS_
+  #include <dir.h>
+#else
+  #include <direct.h> /* Visual C++ */
+#endif
+/**
+ * @returns the Current Woring Directory
+ */
+const char* ResourceManager::cwd()
+{
+  if (ResourceManager::getInstance()->_cwd == NULL)
+  {
+    char cwd[1024];
+    char* errorCode = getcwd(cwd, 1024);
+    if (errorCode == 0)
+      return NULL;
+
+    ResourceManager::getInstance()->_cwd = new char[strlen(cwd)+1];
+    strcpy(ResourceManager::getInstance()->_cwd, cwd);
+  }
+  return ResourceManager::getInstance()->_cwd;
 }
 

trunk/src/lib/util/loading/resource_manager.h

@@ -137 +137 @@
   static char* getFullName(const char* fileName);
   static bool isInDataDir(const char* fileName);
+  static char* getAbsDir(const char* fileName);
+  static const char* cwd();
 
   static const char* ResourceTypeToChar(ResourceType type);
@@ -149 +151 @@
   static ResourceManager*  singletonRef;       //!< singleton Reference
 
+  char*                    _cwd;               //!< The currend Working directory.
   char*                    dataDir;            //!< The Data Directory, where all relevant Data is stored.
   std::vector<char*>       imageDirs;          //!< A list of directories in which images are stored.