Changeset 7221 in orxonox.OLD for trunk/src/world_entities/world_entity.cc

Timestamp:

Mar 15, 2006, 3:10:45 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the std-branche back, it runs on windows and Linux

svn merge ​https://svn.orxonox.net/orxonox/branches/std . -r7202:HEAD

File:

• trunk/src/world_entities/world_entity.cc (modified) (4 diffs)

trunk/src/world_entities/world_entity.cc

@@ -61 +61 @@
   this->bCollide = true;
 
-  this->md2TextureFileName = NULL;
-
   this->objectListNumber = OM_INIT;
   this->objectListIterator = NULL;
@@ -120 +118 @@
  * @param fileName the name of the model to load
  * @param scaling the Scaling of the model
- *
- * @todo fix this, so it only has one loadModel-Function.
-*/
-void WorldEntity::loadModel(const char* fileName, float scaling, unsigned int modelNumber)
+ */
+void WorldEntity::loadModel(const std::string& fileName, float scaling, unsigned int modelNumber)
 {
   this->modelLODName = fileName;
   this->scaling = scaling;
-  if ( fileName != NULL && strcmp(fileName, "") )
+  if (!fileName.empty())
   {
     // search for the special character # in the LoadParam
-    if (strchr(fileName, '#') != NULL)
-    {
-      PRINTF(4)("Found # in %s... searching for LOD's\n", fileName);
-      char* lodFile = new char[strlen(fileName)+1];
-      strcpy(lodFile, fileName);
-      char* depth = strchr(lodFile, '#');
+    if (fileName.find('#') != std::string::npos)
+    {
+      PRINTF(4)("Found # in %s... searching for LOD's\n", fileName.c_str());
+      std::string lodFile = fileName;
+      unsigned int offset = lodFile.find('#');
       for (unsigned int i = 0; i < 3; i++)
       {
-        *depth = 48+(int)i;
+        lodFile[offset] = 48+(int)i;
         if (ResourceManager::isInDataDir(lodFile))
           this->loadModel(lodFile, scaling, i);
@@ -149 +144 @@
       this->scaling = 1.0;
     }
-    if(strstr(fileName, ".obj"))
-    {
-      PRINTF(4)("fetching OBJ file: %s\n", fileName);
+    if(fileName.find(".obj") != std::string::npos)
+    {
+      PRINTF(4)("fetching OBJ file: %s\n", fileName.c_str());
       BaseObject* loadedModel = ResourceManager::getInstance()->load(fileName, OBJ, RP_CAMPAIGN, this->scaling);
       if (loadedModel != NULL)
         this->setModel(dynamic_cast<Model*>(loadedModel), modelNumber);
+      else
+        PRINTF(1)("OBJ-File %s not found.\n", fileName.c_str());
 
       if( modelNumber == 0)
         this->buildObbTree(4);
     }
-    else if(strstr(fileName, ".md2"))
-    {
-      PRINTF(4)("fetching MD2 file: %s\n", fileName);
+    else if(fileName.find(".md2") != std::string::npos)
+    {
+      PRINTF(4)("fetching MD2 file: %s\n", fileName.c_str());
       Model* m = new MD2Model(fileName, this->md2TextureFileName, this->scaling);
       //this->setModel((Model*)ResourceManager::getInstance()->load(fileName, MD2, RP_CAMPAIGN), 0);
@@ -575 +572 @@
     char* name = (char*)(getModel( 0 )->getName());
 
-    if ( strstr(name, ResourceManager::getInstance()->getDataDir()) )
-    {
-      name += strlen(ResourceManager::getInstance()->getDataDir());
+    if (  ResourceManager::getInstance()->getDataDir() == name ) /// FIXME (do not know what to do here.)
+    {
+      name += ResourceManager::getInstance()->getDataDir().size();
     }