Changeset 9832 in orxonox.OLD for branches/new_class_id/src/world_entities

Timestamp:

Sep 26, 2006, 3:44:38 PM (18 years ago)

Author:

bensch

Message:

orxonox/new_class_id: Loading via the new Interface works, (it seems)

File:

• branches/new_class_id/src/world_entities/world_entity.cc (modified) (14 diffs)

branches/new_class_id/src/world_entities/world_entity.cc

@@ -20 +20 @@
 #include "shell_command.h"
 
-#include "model.h"
+#include "util/loading/new_resource_manager.h"
+#include "resource_obj.h"
 #include "md2/md2Model.h"
 #include "md3/md3_model.h"
@@ -26 +27 @@
 #include "aabb_tree_node.h"
 
-#include "util/loading/resource_manager.h"
 #include "util/loading/load_param.h"
 #include "obb_tree.h"
@@ -83 +83 @@
 
   // registering default reactions:
-/// FIXME  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, /*CL_WORLD_ENTITY*/ CL_PROJECTILE);
+  /// FIXME  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, /*CL_WORLD_ENTITY*/ CL_PROJECTILE);
 
   this->toList(OM_NULL);
@@ -162 +162 @@
   std::string name = fileName;
 
-  if (  name.find( ResourceManager::getInstance()->getDataDir() ) == 0 )
-  {
-    name.erase(ResourceManager::getInstance()->getDataDir().size());
+  if (  name.find( Resources::NewResourceManager::getInstance()->mainGlobalPath().name() ) == 0 )
+  {
+    name.erase(Resources::NewResourceManager::getInstance()->mainGlobalPath().name().size());
   }
 
@@ -180 +180 @@
       {
         lodFile[offset] = 48+(int)i;
-        if (ResourceManager::isInDataDir(lodFile))
+        if (Resources::NewResourceManager::getInstance()->checkFileInMainPath( lodFile))
           this->loadModel(lodFile, scaling, i);
       }
@@ -190 +190 @@
       this->scaling = 1.0;
     }
+    /// LOADING AN OBJ FILE
     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);
+      StaticModel* model = new StaticModel();
+      *model = ResourceOBJ(fileName, this->scaling);
+      if (model->getVertexCount() > 0)
+      {
+        this->setModel(model, modelNumber);
+        if( modelNumber == 0 /* FIXME && !this->isA(CL_WEAPON) */)
+          this->buildObbTree(obbTreeDepth);
+      }
       else
-        PRINTF(1)("OBJ-File %s not found.\n", fileName.c_str());
-
-      if( modelNumber == 0 /* FIXME && !this->isA(CL_WEAPON) */)
-        this->buildObbTree(obbTreeDepth);
-    }
+        delete model;
+    }
+    /// LOADING AN MD2-model
     else if(fileName.find(".md2") != std::string::npos)
     {
@@ -212 +216 @@
         this->buildObbTree(obbTreeDepth);
     }
+    /// LOADING AN MD3-MODEL.
     else if(fileName.find(".md3") != std::string::npos)
     {
@@ -218 +223 @@
       this->setModel(m, 0);
 
-//       if( m != NULL)
-//         this->buildObbTree(obbTreeDepth);
+      //       if( m != NULL)
+      //         this->buildObbTree(obbTreeDepth);
     }
   }
@@ -240 +245 @@
   if (this->models[modelNumber] != NULL)
   {
-    Resource* resource = ResourceManager::getInstance()->locateResourceByPointer(dynamic_cast<BaseObject*>(this->models[modelNumber]));
-    if (resource != NULL)
-      ResourceManager::getInstance()->unload(resource, RP_LEVEL);
-    else
-    {
-      PRINTF(4)("Forcing model deletion\n");
-      delete this->models[modelNumber];
-    }
+    delete this->models[modelNumber];
   }
 
@@ -283 +281 @@
   }
 
-  if( this->models[0] != NULL) {
+  if( this->models[0] != NULL)
+  {
     this->aabbNode = new AABBTreeNode();
     this->aabbNode->spawnBVTree(this->models[0]);
@@ -367 +366 @@
 void WorldEntity::subscribeReaction(CREngine::CRType type)
 {
-  if( this->collisionHandles[type] != NULL)  {
+  if( this->collisionHandles[type] != NULL)
+  {
     PRINTF(2)("Registering for a CollisionReaction already subscribed to! Skipping\n");
     return;
@@ -498 +498 @@
 void removeFromReflectionList()
 {
-/// TODO
-///  State::getObject
+  /// TODO
+  ///  State::getObject
 }
 
@@ -558 +558 @@
   {
 
-  this->setAbsCoor(ray_2 - v);
-
-  }
-    else
+    this->setAbsCoor(ray_2 - v);
+
+  }
+  else
   {
     if(ray_1.x == this->getAbsCoor().x + v.x && ray_1.y == this->getAbsCoor().y + v.y + 0.1 && ray_1.z ==this->getAbsCoor().z + v.z)
@@ -645 +645 @@
     }
 
-//     if( this->aabbNode != NULL)
-//       this->aabbNode->drawBV(0, DRAW_BV_POLYGON, Vector(1, 0.6, 0.2), true);
+    //     if( this->aabbNode != NULL)
+    //       this->aabbNode->drawBV(0, DRAW_BV_POLYGON, Vector(1, 0.6, 0.2), true);
 
     glPopMatrix();