Changeset 5335 in orxonox.OLD for trunk

Timestamp:

Oct 9, 2005, 1:27:58 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more fool-proov loading of important paths (data and image)

Location:

trunk/src

Files:

• lib/graphics/shader.cc (modified) (1 diff)
• lib/shell/shell.cc (modified) (5 diffs)
• orxonox.cc (modified) (1 diff)
• util/resource_manager.cc (modified) (8 diffs)
• util/resource_manager.h (modified) (2 diffs)
• util/track/track_manager.cc (modified) (1 diff)

trunk/src/lib/graphics/shader.cc

@@ -234 +234 @@
 void Shader::deleteProgram(SHADER_TYPE type)
 {
-  GLint status;
+  GLint status = 0;
   if (type == SHADER_VERTEX && this->vertexShader != 0)
   {

trunk/src/lib/shell/shell.cc

@@ -56 +56 @@
   this->setName("Shell");
 
-  // register the shell at the ShellBuffer
-  ShellBuffer::getInstance()->registerShell(this);
   // EVENT-Handler subscription of '`' to all States.
   EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
@@ -82 +80 @@
 
   this->rebuildText();
+
+  // register the shell at the ShellBuffer
+  ShellBuffer::getInstance()->registerShell(this);
 }
 
@@ -89 +90 @@
 Shell::~Shell ()
 {
+  ShellBuffer::getInstance()->unregisterShell(this);
+
   // delete the displayable Buffers
   for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
@@ -97 +100 @@
   // delete the inputLine
   delete this->shellInput;
-
-  ShellBuffer::getInstance()->unregisterShell(this);
 }
 
@@ -158 +159 @@
 void Shell::setFont(const char* fontFile)
 {
+//   if (!ResourceManager::isInDataDir(fontFile))
+//     return false;
+
   if (this->fontFile != NULL)
     delete[] this->fontFile;

trunk/src/orxonox.cc

@@ -282 +282 @@
   }
    //! @todo this is a hack and should be loadable
-  char* imageDir = ResourceManager::getInstance()->getFullName("maps/");
+  char* imageDir = ResourceManager::getInstance()->getFullName("maps");
   ResourceManager::getInstance()->addImageDir(imageDir);
   delete[] imageDir;

trunk/src/util/resource_manager.cc

@@ -60 +60 @@
   this->dataDir = NULL;
   this->setDataDir("./");
-  this->imageDirs = new tList<char>();
-  this->resourceList = new tList<Resource>();
+  this->imageDirs = new tList<char>;
+  this->resourceList = new tList<Resource>;
 }
 
@@ -105 +105 @@
     {
       delete[] this->dataDir;
-      this->dataDir = new char[strlen(realDir)+1];
-      strcpy(this->dataDir, realDir);
+      if (dataDir[strlen(dataDir)-1] == '/' || dataDir[strlen(dataDir)-1] == '\\')
+      {
+        this->dataDir = new char[strlen(realDir)+1];
+        strcpy(this->dataDir, realDir);
+      }
+      else
+      {
+        this->dataDir = new char[strlen(realDir)+2];
+        strcpy(this->dataDir, realDir);
+        this->dataDir[strlen(realDir)] = '/';
+        this->dataDir[strlen(realDir)+1] = '\0';
+      }
       delete[] realDir;
       return true;
@@ -147 +157 @@
 bool ResourceManager::addImageDir(const char* imageDir)
 {
+  if (imageDir == NULL)
+    return false;
+
+  char* newDir;
+  if (imageDir[strlen(imageDir)-1] == '/' || imageDir[strlen(imageDir)-1] == '\\')
+  {
+    newDir = new char[strlen(imageDir)+1];
+    strcpy(newDir, imageDir);
+  }
+  else
+  {
+    newDir = new char[strlen(imageDir)+2];
+    strcpy(newDir, imageDir);
+    newDir[strlen(imageDir)] = '/';
+    newDir[strlen(imageDir)+1] = '\0';
+  }
   // check if the param is a Directory
-  if (isDir(imageDir))
+  if (isDir(newDir))
     {
       // check if the Directory has been added before
@@ -155 +181 @@
       while(tmpDir)
         {
-          if (!strcmp(tmpDir, imageDir))
+          if (!strcmp(tmpDir, newDir))
             {
-              PRINTF(4)("Path %s already loaded\n", imageDir);
+              PRINTF(3)("Path %s already loaded\n", newDir);
+              delete[] newDir;
               delete tmpImageDirs;
               return true;
@@ -166 +193 @@
 
       // adding the directory to the List
-      tmpDir  = new char[strlen(imageDir)+1];
-      strcpy(tmpDir, imageDir);
-      this->imageDirs->add(tmpDir);
+      this->imageDirs->add(newDir);
       return true;
     }
   else
     {
-      PRINTF(1)("%s is not a Directory, and can not be added to the Paths of Images\n", dataDir);
+      PRINTF(1)("%s is not a Directory, and can not be added to the Paths of Images\n", newDir);
+      delete[] newDir;
       return false;
     }
@@ -660 +686 @@
       directoryName[strlen(directoryName)-1] == '\\')
     {
-      tmpDirName = new char[strlen(directoryName)+1];
+      tmpDirName = new char[strlen(directoryName)];
       strncpy(tmpDirName, directoryName, strlen(directoryName)-1);
       tmpDirName[strlen(directoryName)-1] = '\0';
@@ -800 +826 @@
 char* ResourceManager::getFullName(const char* fileName)
 {
-  if (fileName == NULL)
+  if (fileName == NULL || ResourceManager::getInstance()->getDataDir() == NULL)
     return NULL;
 
@@ -813 +839 @@
       return NULL;
     }
+}
+
+
+/**
+ * checks wether a file is in the DataDir.
+ * @param fileName the File to check if it is in the Data-Dir structure.
+ * @returns true if the file exists, false otherwise
+ */
+bool ResourceManager::isInDataDir(const char* fileName)
+{
+  if (fileName == NULL || ResourceManager::getInstance()->getDataDir() == NULL)
+    return false;
+
+  bool retVal = false;
+  char* checkFile = new char[strlen(ResourceManager::getInstance()->getDataDir())
+      + strlen(fileName) + 1];
+  sprintf(checkFile, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName);
+
+  if (ResourceManager::isFile(checkFile) || ResourceManager::isDir(checkFile))
+    retVal = true;
+  else
+    retVal = false;
+  delete[] checkFile;
+  return retVal;
 }
 

trunk/src/util/resource_manager.h

@@ -108 +108 @@
 
   bool checkDataDir(const char* fileInside);
-  bool addImageDir(const char* imageDir);
+ bool addImageDir(const char* imageDir);
   BaseObject* load(const char* fileName, ResourcePriority prio = RP_NO,
                void* param1 = NULL, void* param2 = NULL, void* param3 = NULL);
@@ -127 +127 @@
   static char* homeDirCheck(const char* fileName);
   static char* getFullName(const char* fileName);
+  static bool isInDataDir(const char* fileName);
 
   static const char* ResourceTypeToChar(ResourceType type);

trunk/src/util/track/track_manager.cc

@@ -900 +900 @@
  * @param count The count of Paths to join.
  * @param trackIDs an Array with the trackID's to join
-
-   \see void TrackManager::join(unsigned int count, ...)
+ *
+ * @see void TrackManager::join(unsigned int count, ...)
 */
 void TrackManager::joinV(unsigned int count, int* trackIDs)