Changeset 4115 in orxonox.OLD for orxonox

Timestamp:

May 7, 2005, 10:13:19 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: windows-test

Location:

orxonox/trunk/src

Files:

• util/resource_manager.cc (modified) (3 diffs)
• util/resource_manager.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

orxonox/trunk/src/util/resource_manager.cc

@@ -202 +202 @@
   // searching if the resource was loaded before.
   Resource* tmpResource = this->locateResourceByInfo(fileName, type, param1, param2,param3);
-  if (tmpResource) // if the resource was not loaded before.
+  if (tmpResource) // if the resource was loaded before.
     {
       PRINTF(4)("not loading cached resource %s\n", tmpResource->name);
@@ -221 +221 @@
 
       // creating the full name. (directoryName + FileName)
-      char* fullName = new char[strlen(dataDir)+strlen(fileName)+1];
-      sprintf(fullName, "%s%s", this->dataDir, fileName);
-      
+      char* fullName = new char[strlen(this->getDataDir())+strlen(fileName)+1];
+      sprintf(fullName, "%s%s", this->getDataDir(), fileName);
+      printf("FULLNAME: %s\n", fullName);
       // Checking for the type of resource \see ResourceType
       switch(type)
@@ -233 +233 @@
             tmpResource->modelSize = 1.0;
 
-          if(isFile(fullName))
+          if(ResourceManager::isFile(fullName))
             tmpResource->pointer = new OBJModel(fullName, tmpResource->modelSize);
           else

orxonox/trunk/src/util/resource_manager.h

@@ -66 +66 @@
   bool setDataDir(const char* dataDir);
   /** \returns the Name of the data directory */
-  const char*  getDataDir(void) {return this->dataDir;}
+  inline const char*  getDataDir(void) {return this->dataDir;}
   bool checkDataDir(const char* fileInside);
   bool addImageDir(char* imageDir);

orxonox/trunk/src/world_entities/world_entity.cc

@@ -65 +65 @@
   this->model = NULL;
   string = grabParameter( root, "model");
-  printf("::::::::::::::::::::::string is %s\n", string);
   if( string != NULL)
     this->model = (Model*)ResourceManager::getInstance()->load(string, OBJ, RP_CAMPAIGN);