Changeset 4462 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 2, 2005, 12:50:37 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: md2Data loadable over the resourceManager

Location:

orxonox/trunk

Files:

• scripts/orxodox.checkFiles.pl (modified) (1 diff)
• src/lib/graphics/importer/md2Model.cc (modified) (2 diffs)
• src/util/resource_manager.cc (modified) (14 diffs)
• src/util/resource_manager.h (modified) (3 diffs)
• src/world_entities/test_entity.cc (modified) (2 diffs)

orxonox/trunk/scripts/orxodox.checkFiles.pl

@@ -74 +74 @@
 # Project related configuration options \
 #--------------------------------------------------------------------------- \
-PROJECT_NAME           = Orxonox \
+PROJECT_NAME           = orxonox \
 PROJECT_NUMBER         = 1 \
 OUTPUT_DIRECTORY       = doxygen/ \

orxonox/trunk/src/lib/graphics/importer/md2Model.cc

@@ -81 +81 @@
 {
   /* this creates the data container via ressource manager */
-  this->data = new MD2Data(modelFileName, skinFileName);
+  this->data = (MD2Data*)ResourceManager::getInstance()->load(modelFileName, MD2, RP_GAME, (void*)skinFileName);
   this->scaleFactor = this->data->scaleFactor;
 
@@ -94 +94 @@
 MD2Model::~MD2Model()
 {
-
+  ResourceManager::getInstance()->unload(this->data);
 }
 

orxonox/trunk/src/util/resource_manager.cc

@@ -21 +21 @@
 #include "objModel.h"
 #include "primitive_model.h"
+#include "md2Model.h"
 #include "texture.h"
 #include "text_engine.h"
@@ -173 +174 @@
 {
   ResourceType tmpType;
+
   if (!strncmp(fileName+(strlen(fileName)-4), ".obj", 4))
     tmpType = OBJ;
+  if (!strncmp(fileName+(strlen(fileName)-4), ".md2", 4))
+    tmpType = MD2;
   else if (!strncmp(fileName+(strlen(fileName)-4), ".wav", 4))
     tmpType = WAV;
@@ -226 +230 @@
 
       // creating the full name. (directoryName + FileName)
-      char* fullName = new char[strlen(this->getDataDir())+strlen(fileName)+1];
-      sprintf(fullName, "%s%s", this->getDataDir(), fileName);
+      char* fullName = ResourceManager::getFullName(fileName);
       // Checking for the type of resource \see ResourceType
       switch(type)
@@ -262 +265 @@
             tmpResource->pointer = new PrimitiveModel(CONE, tmpResource->modelSize);
           break;
+        case MD2:
+          if(ResourceManager::isFile(fullName))
+            {
+              if (param1)
+                {
+                  tmpResource->skinFileName = new char[strlen((const char*)param1)+1];
+                  strcpy(tmpResource->skinFileName, (const char*) fileName);
+                }
+              else
+                tmpResource->skinFileName = NULL;
+              char* skinFileName = ResourceManager::getFullName(tmpResource->skinFileName);
+              tmpResource->pointer = new MD2Data(fullName, skinFileName);
+              delete []skinFileName;
+            }
+              break;
         case TTF:
             if (param1)
@@ -373 +391 @@
               delete (Model*)resource->pointer;
               break;
+            case MD2:
+              delete (MD2Data*)resource->pointer;
+              break;
             case IMAGE:
               delete (Texture*)resource->pointer;
@@ -425 +446 @@
    \returns a Pointer to the Resource if found, NULL otherwise.
 */
-Resource* ResourceManager::locateResourceByInfo(const char* fileName, ResourceType type, void* param1, void* param2, void* param3)
+Resource* ResourceManager::locateResourceByInfo(const char* fileName, ResourceType type,
+                                                void* param1, void* param2, void* param3)
 {
   //  Resource* enumRes = resourceList->enumerate();
@@ -436 +458 @@
           bool match = false;
           bool subMatch = false;
+
           switch (type)
             {
@@ -446 +469 @@
                 }
               else if (enumRes->modelSize == *(float*)param1)
+                match = true;
+              break;
+            case MD2:
+              if (!param1)
+                {
+                  if (enumRes->skinFileName == NULL)
+                    match = true;
+                }
+              else if (!strcmp(enumRes->skinFileName, (const char*) param1))
                 match = true;
               break;
@@ -519 +551 @@
 bool ResourceManager::isDir(const char* directoryName)
 {
+  if (directoryName == NULL)
+    return false;
+
   char* tmpDirName = NULL;
   struct stat status;
@@ -563 +598 @@
 bool ResourceManager::isFile(const char* fileName)
 {
+  if (fileName == NULL)
+    return false;
   char* tmpFileName = ResourceManager::homeDirCheck(fileName);
   // actually checks the File
@@ -597 +634 @@
 {
   char* tmpName = ResourceManager::homeDirCheck(fileName);
-
+  if (tmpName == NULL)
+    return false;
   FILE* stream;
   if( (stream = fopen (tmpName, "w")) == NULL)
@@ -615 +653 @@
 bool ResourceManager::deleteFile(const char* fileName)
 {
+  if (fileName == NULL)
+    return false;
   char* tmpName = ResourceManager::homeDirCheck(fileName);
   unlink(tmpName);
@@ -627 +667 @@
 char* ResourceManager::homeDirCheck(const char* name)
 {
+  if (name == NULL)
+    return NULL;
   char* retName;
   if (!strncmp(name, "~/", 2))
@@ -654 +696 @@
 char* ResourceManager::getFullName(const char* fileName)
 {
+  if (fileName == NULL)
+    return NULL;
+
   char* retName = new char[strlen(ResourceManager::getInstance()->getDataDir())
                            + strlen(fileName) + 1];
   sprintf(retName, "%s%s", ResourceManager::getInstance()->getDataDir(), fileName);
-  if (ResourceManager::isFile(retName))
+  if (ResourceManager::isFile(retName) || ResourceManager::isDir(retName))
     return retName;
   else

orxonox/trunk/src/util/resource_manager.h

@@ -19 +19 @@
 template<class T> class tList;
 
-//! An eumerator for different fileTypes the resourceManager supports \todo WAV, MP3, OGG support
-enum ResourceType {OBJ,
-                   PRIM,
-                   WAV,
-                   MP3,
-                   OGG,
-                   TTF,
-                   IMAGE};
+//! An eumerator for different fileTypes the resourceManager supports
+typedef enum ResourceType { OBJ,
+                            PRIM,
+                            MD2,
+                            WAV,
+                            MP3,
+                            OGG,
+                            TTF,
+                            IMAGE };
+
 //! An enumerator for different UNLOAD-types. 
 /**
-   RP_NO: will be unloaded on request
-   RP_LEVEL: will be unloaded at the end of a Level
-   RP_CAMPAIGN: will be unloaded at the end of a Campaign
-   RP_GAME: will be unloaded at the end of the whole Game (when closing orxonox)
+   RP_NO:        will be unloaded on request
+   RP_LEVEL:     will be unloaded at the end of a Level
+   RP_CAMPAIGN:  will be unloaded at the end of a Campaign
+   RP_GAME:      will be unloaded at the end of the whole Game (when closing orxonox)
 */
-enum ResourcePriority {RP_NO = 0,
-                       RP_LEVEL = 1,
-                       RP_CAMPAIGN = 2,
-                       RP_GAME = 3};
+typedef enum ResourcePriority { RP_NO        =   0,
+                                RP_LEVEL     =   1,
+                                RP_CAMPAIGN  =   2,
+                                RP_GAME      =   4 };
 
 //! A Struct that keeps track about A resource its name its Type, and so on
@@ -55 +57 @@
   unsigned char ttfColorG;
   unsigned char ttfColorB;
+  char* skinFileName;
 };
 
@@ -66 +69 @@
 
    It does it by looking, if a desired file has already been loaded.
-
-   \todo loading also dependant by parameters.
 */
 class ResourceManager : public BaseObject 

orxonox/trunk/src/world_entities/test_entity.cc

@@ -30 +30 @@
   this->setClassID(CL_TEST_ENTITY, "TestEntity");
 
-  this->md2Model = new MD2Model("../data/models/tris.md2", "../data/models/tris.pcx");
+  this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
   this->md2Model->debug();
 }
@@ -36 +36 @@
 
 TestEntity::~TestEntity () 
-{}
+{
+  delete this->md2Model;
+}