Changeset 8724 in orxonox.OLD for trunk/src/lib/collision_reaction

Timestamp:

Jun 22, 2006, 3:14:58 PM (19 years ago)

Author:

bensch

Message:

merged the bsp-model-stuff back here

Location:

trunk/src/lib/collision_reaction

Files:

• collision_handle.cc (modified) (4 diffs)
• cr_object_damage.cc (modified) (2 diffs)
• cr_physics_ground_walk.cc (modified) (6 diffs)
• cr_physics_ground_walk.h (modified) (1 diff)

trunk/src/lib/collision_reaction/collision_handle.cc

@@ -101 +101 @@
       return;
 
-   // add element
-   //PRINTF(0)("addTarget: %i \n", target);
+  // add element
+   PRINTF(5)("addTarget: %i \n", target);
 
    this->targetList.push_back(target);
@@ -177 +177 @@
 
  c->registerCollisionEvent(collisionEvent);
- PRINTF(0)("Registering Collision Event: %s, %s\n", collisionEvent->getEntityA()->getClassName(), collisionEvent->getEntityB()->getClassName());
+ PRINTF(5)("Registering Collision Event: %s, %s\n", collisionEvent->getEntityA()->getClassName(), collisionEvent->getEntityB()->getClassName());
 }
 
@@ -231 +231 @@
     if( collisionEvent->getEntityA() == this->owner) {
       if( collisionEvent->getEntityB()->isA((ClassID)(*it))) {
-        PRINTF(0)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+        PRINTF(5)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
                   collisionEvent->getEntityB()->getClassName(), *it);
         return true; }
@@ -237 +237 @@
     else {
       if( collisionEvent->getEntityA()->isA((ClassID)(*it))) {
-        PRINTF(0)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
+        PRINTF(5)("I am: %s colliding with: %s is a %i filter ok\n", owner->getClassName(),
                   collisionEvent->getEntityA()->getClassName(), *it);
       return true; }

trunk/src/lib/collision_reaction/cr_object_damage.cc

@@ -63 +63 @@
   if( collision->isEntityACollide()) {
     damage = collision->getEntityB()->getDamage();
-    collision->getEntityA()->decreaseHealth(damage);
+    collision->getEntityA()->hit(damage);
   }
   PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityA()->getClassName());
@@ -69 +69 @@
   if( collision->isEntityBCollide()) {
     damage = collision->getEntityA()->getDamage();
-    collision->getEntityB()->decreaseHealth(damage);
+    collision->getEntityB()->hit(damage);
   }
   PRINTF(4)("Dealing damage - %f damage to %s \n", damage, collision->getEntityB()->getClassName());

trunk/src/lib/collision_reaction/cr_physics_ground_walk.cc

@@ -1 +1 @@
 /*
    orxonox - the future of 3D-vertical-scrollers
-
+ 
    Copyright (C) 2004 orx
-
+ 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation; either version 2, or (at your option)
    any later version.
-
+ 
    ### File Specific:
    main-programmer: Patrick Boenzli
@@ -24 +24 @@
 #include "cr_physics_ground_walk.h"
 
-#include "debug.h"
-
 #include <vector>
 
@@ -35 +33 @@
  */
 CRPhysicsGroundWalk::CRPhysicsGroundWalk ()
-  : CollisionReaction()
+    : CollisionReaction()
 {
   this->setClassID(CL_CR_PHYSICS_GROUND_WALK, "CRPhysicsGroundWalk");
@@ -45 +43 @@
  */
 CRPhysicsGroundWalk::~CRPhysicsGroundWalk ()
-{
-}
+{}
 
 
@@ -57 +54 @@
   CollisionEvent* ce = collision->getCollisionEvents().front();
   Vector normal = ce->getGroundNormal();
-  normal.normalize();
+  // normal.normalize();
 
   // put it back
-//   PRINTF(0)("putting it back to lastPos: \n");
-//   this->lastPositions[0].debug();
-//   PRINTF(0)("current pos:\n");
-//   collision->getEntityB()->getAbsCoor().debug();
+  //   PRINTF(0)("putting it back to lastPos: \n");
+  //   this->lastPositions[0].debug();
+  //   PRINTF(0)("current pos:\n");
+  //   collision->getEntityB()->getAbsCoor().debug();
 
+
+  Vector height = ce->getCollisionPosition() - collision->getEntityB()->getAbsCoor();
+
+  if(ce->getCollisionPosition().x <= 0.9 && ce->getGroundNormal().len() <= 1.4f) {
+    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
+    return;
+  }
+  if(ce->getGroundNormal().len() <= 0.1f) {
+    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getLastAbsCoor());
+    return;
+  }
+  if(ce->getGroundNormal().len() >= 1.4f) {
+    downspeed++;
+    collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.08*downspeed,0.0));
+    return;
+  }
+
+
+  if(height.y < -3.510001 + 10.0) // Above ground
+  {
+    if(height.y > -15.6) // Snap in
+    {
+      downspeed = 0;
+      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,height.y+3.500005 + 10.0,0.0));
+    } else
+    {
+      downspeed++;
+      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0,-0.08*downspeed,0.0));
+    }
+
+  }
+  else {
+    if(height.y > -3.50000 + 10.0  && height.y <    9.9+ 10.0) // below ground
+    {
+      //if(downspeed <= 0) downspeed =1;
+      collision->getEntityB()->setAbsCoor(collision->getEntityB()->getAbsCoor() + Vector(0.0, 0.00001 /*height.y+3.500005 + 10.0*/,0.0));
+      //collision->getEntityB()->setVelocity(Vector(0.0,0.0,0.0));
+      downspeed = 0;
+    }
+
+  }
+
+
+  /*
   PRINTF(0)("Collision with Ground: \n");
   collision->getEntityB()->getAbsCoor().debug();
+  collision->getEntityB()->setVelocity(Vector());
+  collision->getEntityB()->setAbsCoor(this->lastPositions[1]);
 
-  //collision->getEntityB()->setVelocity(Vector());
-  //collision->getEntityB()->setAbsCoor(this->lastPositions[5]);
+  */
 }
+
 
 
@@ -81 +124 @@
   for( int i = 9; i > 0; i--) {
     this->lastPositions[i] = this->lastPositions[i-1];
-//     PRINTF(0)("lastPosition[%i]: %f, %f, %f\n", i, lastPositions[i].x, lastPositions[i].y, lastPositions[i].z);
+    //     PRINTF(0)("lastPosition[%i]: %f, %f, %f\n", i, lastPositions[i].x, lastPositions[i].y, lastPositions[i].z);
   }
   this->lastPositions[0] = owner->getAbsCoor();

trunk/src/lib/collision_reaction/cr_physics_ground_walk.h

@@ -29 +29 @@
 
     Vector       lastPositions[10];           //!< last 10 positions
+    float        downspeed;
 };