Changeset 4139 in orxonox.OLD for orxonox/branches/md2_loader/src/util

Timestamp:

May 10, 2005, 10:39:01 AM (19 years ago)

Author:

patrick

Message:

orxonox/branches/md2_loader: merged trunk into branche using: svn merge ../trunk/ md2_loader -r 4063:HEAD

Location:

orxonox/branches/md2_loader/src/util

Files:

• object_manager.h (modified) (2 diffs)
• resource_manager.cc (modified) (4 diffs)
• resource_manager.h (modified) (1 diff)

orxonox/branches/md2_loader/src/util/object_manager.h

@@ -16 +16 @@
 #include "base_object.h"
 
+#define OM_
+
+class WorldEntity;
+
+
+template<class T> class tList; 
 
 //! the object manager itself
@@ -24 +30 @@
   virtual ~ObjectManager(void);
 
+  void preLoad();
+
  private:
   ObjectManager(void);
   static ObjectManager* singletonRef;
+
+  tList<WorldEntity>* projectileBuffer;            //!< a list of projectiles that is generated at the beginning to make orx faster
+
+
 };
 

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

@@ -100 +100 @@
       return false;
     }
+}
+
+/**
+   \brief checks for the DataDirectory, by looking if 
+   \param fileInside is inisde??
+*/
+bool ResourceManager::checkDataDir(const char* fileInside)
+{
+  bool retVal;
+  if (!isDir(this->dataDir))
+    {
+      PRINTF(1)("%s is not a directory\n", this->dataDir);
+      return false;
+    }
+  
+  char* testFile = new char[strlen(this->dataDir)+strlen(fileInside)+1];
+  sprintf(testFile, "%s%s", this->dataDir, fileInside);
+  retVal = isFile(testFile);
+  delete testFile;
+  return retVal;
 }
 
@@ -183 +203 @@
   // 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);
@@ -202 +222 @@
 
       // 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);
       // Checking for the type of resource \see ResourceType
       switch(type)
@@ -214 +233 @@
             tmpResource->modelSize = 1.0;
 
-          if(isFile(fullName))
+          if(ResourceManager::isFile(fullName))
             tmpResource->pointer = new OBJModel(fullName, tmpResource->modelSize);
           else

orxonox/branches/md2_loader/src/util/resource_manager.h

@@ -65 +65 @@
 
   bool setDataDir(const char* dataDir);
+  /** \returns the Name of the data directory */
+  inline const char*  getDataDir(void) {return this->dataDir;}
+  bool checkDataDir(const char* fileInside);
   bool addImageDir(char* imageDir);
   void* load(const char* fileName, ResourcePriority prio = RP_NO,