Changeset 8862 in orxonox.OLD

Timestamp:

Jun 28, 2006, 3:28:08 PM (18 years ago)

Author:

patrick

Message:

safer hiding and anhiding function

Location:

branches/single_player_map/src

Files:

• lib/collision_reaction/collision_event.h (modified) (1 diff)
• lib/collision_reaction/cr_physics_ground_walk.cc (modified) (2 diffs)
• world_entities/world_entity.h (modified) (1 diff)

branches/single_player_map/src/lib/collision_reaction/collision_event.h

@@ -44 +44 @@
   inline Vector getCollisionPosition() { return this->position; }
 
+  /** @return true if the entity is in the wall */
+  inline bool isInWall() { return this->bInWall; }
+
 
  private:

branches/single_player_map/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -71 +71 @@
 
   float CR_MAX_WALK_HEIGHT = 2.0f;
+  float CR_THRESHOLD = 0.2f;
 
   if( box != NULL)
@@ -82 +83 @@
 
     // object is beneath the plane (ground)
-    if( height < 0.0f)
+    if( height < 0.0f )
     {
-      entity->shiftCoor(Vector(0,-height,0));
+      entity->shiftCoor(Vector(0, -height, 0));
     }
+    // object is already in the wall
+    else if( ce->isInWall())
+    {
+
+    }
+
 
 

branches/single_player_map/src/world_entities/world_entity.h

@@ -116 +116 @@
   ObjectManager::EntityList::iterator& getEntityIterator() { return this->objectListIterator; }
 
-  void hide() { this->lastObjectListNumber = this->objectListNumber; this->toList(OM_DEAD); }
+  void hide() { if( this->objectListNumber != OM_DEAD) this->lastObjectListNumber = this->objectListNumber; this->toList(OM_DEAD); }
   void unhide() { this->toList(this->lastObjectListNumber); }