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

Timestamp:

Jun 15, 2006, 9:34:48 PM (18 years ago)

Author:

patrick

Message:

merged the bsp branche back to trunk

File:

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

trunk/src/world_entities/world_entity.cc

@@ -21 +21 @@
 
 #include "model.h"
-#include "md2Model.h"
+#include "md2/md2Model.h"
+#include "md3/md3_model.h"
+
 #include "util/loading/resource_manager.h"
 #include "util/loading/load_param.h"
@@ -77 +79 @@
 
   // registering default reactions:
-  this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
-  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND, CL_TERRAIN);
+//   this->subscribeReaction(CREngine::CR_OBJECT_DAMAGE, CL_WORLD_ENTITY);
 
   this->toList(OM_NULL);
@@ -200 +201 @@
         this->buildObbTree(obbTreeDepth);
     }
+    else if(fileName.find(".md3") != std::string::npos)
+    {
+      PRINTF(4)("fetching MD3 file: %s\n", fileName.c_str());
+      Model* m = new md3::MD3Model(fileName, this->scaling);
+      this->setModel(m, 0);
+
+//       if( m != NULL)
+//         this->buildObbTree(obbTreeDepth);
+    }
   }
   else
@@ -411 +421 @@
  *  @param position it collides on the plane
  */
-bool WorldEntity::registerCollision(WorldEntity* entity, Plane* plane, Vector position)
+bool WorldEntity::registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position)
 {
   // is there any handler listening?
@@ -420 +430 @@
   CollisionEvent* c = CREngine::getInstance()->popCollisionEventObject();
   assert(c != NULL); // if this should fail: we got not enough precached CollisionEvents: alter value in cr_defs.h
-  c->collide(entity, plane, position);
+  c->collide(entity, groundEntity, normal, position);
 
   for( int i = 0; i < CREngine::CR_NUMBER; ++i)
@@ -501 +511 @@
 
   Vector v = this->getAbsDirX();
-  v.x *= 10;
-  v.y *= 10;
-  v.z *= 10;
-  Vector u = this->getAbsDirY();
-
-  if(feet.x == (u.x+this->getAbsCoor().x) &&  feet.y == u.y +this->getAbsCoor().y && feet.z == this->getAbsCoor().z)
+  v.x *= 10.1;
+  v.y *= 10.1;
+  v.z *= 10.1;
+  Vector u = Vector(0.0,-20.0,0.0);
+
+
+  if(!(this->getAbsCoor().x == ray_2.x && this->getAbsCoor().y == ray_2.y && this->getAbsCoor().z == ray_2.z) )
   {
 
   this->setAbsCoor(ray_2 - v);
-  }
-  else
+
+  }
+    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)
@@ -521 +533 @@
 
   }
+
+
 }