Changeset 4295 in orxonox.OLD

Timestamp:

May 26, 2005, 11:05:01 AM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: a better check for the data-directory

Location:

orxonox/branches/physics/src

Files:

• subprojects/particles/framework.cc (modified) (2 diffs)
• subprojects/particles/framework.h (modified) (1 diff)
• util/resource_manager.cc (modified) (2 diffs)

orxonox/branches/physics/src/subprojects/particles/framework.cc

@@ -24 +24 @@
 #include "debug.h"
 #include "graphics_engine.h"
+#include "resource_manager.h"
 
 
@@ -259 +260 @@
   mouse1Down = false;
 
+  ResourceManager::getInstance()->setDataDir(DATA_DIRECTORY);
  
     // Creating a Test Particle System

orxonox/branches/physics/src/subprojects/particles/framework.h

@@ -4 +4 @@
 #include "vector.h"
 #include "glincl.h"
+
+#define DATA_DIRECTORY "~/svn/data/"
 
 float rotatorP;

orxonox/branches/physics/src/util/resource_manager.cc

@@ -87 +87 @@
 bool ResourceManager::setDataDir(const char* dataDir)
 {
-  if (isDir(dataDir))
+  char* checkDir = ResourceManager::homeDirCheck(dataDir);
+  if (isDir(checkDir))
     {
       delete this->dataDir;
-      this->dataDir = new char[strlen(dataDir)+1];
-      strcpy(this->dataDir, dataDir);
+      this->dataDir = new char[strlen(checkDir)+1];
+      strcpy(this->dataDir, checkDir);
+      delete checkDir;
       return true;
     }
@@ -97 +99 @@
     {
       PRINTF(1)("%s is not a Directory, and can not be the Data Directory, leaving as %s \n", dataDir, this->dataDir);
+      delete checkDir;
       return false;
     }