Changeset 8186 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Jun 7, 2006, 2:40:46 PM (18 years ago)

Author:

bensch

Message:

trunk: merged the branche bsp_model back here

Location:

trunk/src/world_entities

Files:

• WorldEntities.am (modified) (2 diffs)
• bsp_entity.cc (copied) (copied from branches/bsp_model/src/world_entities/bsp_entity.cc)
• bsp_entity.h (copied) (copied from branches/bsp_model/src/world_entities/bsp_entity.h)
• world_entity.cc (modified) (1 diff)
• world_entity.h (modified) (1 diff)

trunk/src/world_entities/WorldEntities.am

@@ -15 +15 @@
                 world_entities/test_entity.cc \
                 world_entities/planet.cc \
+                world_entities/bsp_entity.cc \
                 \
                 world_entities/weapons/test_gun.cc \
@@ -67 +68 @@
                 test_entity.h \
                 planet.h \
+                bsp_entity.h \
                 \
                 weapons/test_gun.h \

trunk/src/world_entities/world_entity.cc

@@ -312 +312 @@
 
 /**
+ *  this function is called, when two entities collide
+ * @param entity: the world entity with whom it collides
+ *
+ * Implement behaviour like damage application or other miscellaneous collision stuff in this function
+ */
+void WorldEntity::collidesWithGround(const Vector& location)
+{
+  PRINTF(0)("BSP_GROUND: %s collides \n", this->getClassName() );
+}
+
+void WorldEntity::collidesWithGround(const Vector& feet, const Vector& ray_1, const Vector& ray_2)
+{
+  
+  // PRINTF(0)("BSP_GROUND: Player collides \n", this->getClassName() );
+  
+  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)
+  {
+    
+  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)
+    {
+      this->setAbsCoor(feet -u );  
+    }
+      
+    this->setAbsCoor(ray_2 - v);  
+   
+  }
+}
+
+/**
  *  this is called immediately after the Entity has been constructed, initialized and then Spawned into the World
  *

trunk/src/world_entities/world_entity.h

@@ -63 +63 @@
   bool buildObbTree(int depth);
   virtual void collidesWith (WorldEntity* entity, const Vector& location);
-  /** @returns a reference to the obb tree of this worldentity */
+  virtual void collidesWithGround(const Vector& location);
+  virtual void collidesWithGround(const Vector& feet, const Vector& ray_1, const Vector& ray_2);
+
+
+/** @returns a reference to the obb tree of this worldentity */
   inline BVTree* getOBBTree() const { return this->obbTree; };
   void drawBVTree(int depth, int drawMode) const;