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

Timestamp:

Sep 25, 2005, 7:04:28 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: bouncy effect with physically based animations… or something like it at least.

Location:

trunk/src/world_entities

Files:

• npc.cc (modified) (2 diffs)
• npc.h (modified) (1 diff)
• player.h (modified) (1 diff)
• weapons/test_bullet.cc (modified) (3 diffs)
• weapons/test_bullet.h (modified) (1 diff)
• world_entity.cc (modified) (1 diff)

trunk/src/world_entities/npc.cc

@@ -43 +43 @@
   if (entity->isA(CL_PROJECTILE))
     PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getName(), entity->getName(), location.x, location.y, location.z);
-  this->setVisibiliy(false);
-  State::getWorldEntityList()->remove(this);
+  this->applyForce(Vector(0,0,0)-location*1000);
+//  this->setVisibiliy(false);
+//  State::getWorldEntityList()->remove(this);
 }
 
@@ -50 +51 @@
 void NPC::tick(float dt)
 {
-  Vector direction = (State::getCameraTarget()->getAbsCoor() - this->getAbsCoor());
+//  Vector direction = (State::getCameraTarget()->getAbsCoor() - this->getAbsCoor());
 
   //if (directin.len() < 100)
-  this->shiftCoor(direction *dt * 5 * exp(-direction.len() / 30.0));
+//  this->shiftCoor(direction *dt * 5 * exp(-direction.len() / 30.0));
   this->shiftDir(Quaternion(dt, this->randomRotAxis));
 

trunk/src/world_entities/npc.h

@@ -4 +4 @@
 
 #include "world_entity.h"
+#include "physics_interface.h"
 
 class AI;
 
-class NPC : public WorldEntity {
+class NPC : public WorldEntity, public PhysicsInterface {
 
  public:

trunk/src/world_entities/player.h

@@ -23 +23 @@
      the player.cc for debug also
 */
-class Player : public WorldEntity, public PhysicsInterface, public EventListener
+class Player : public WorldEntity, public EventListener
 {
   friend class World;

trunk/src/world_entities/weapons/test_bullet.cc

@@ -59 +59 @@
 }
 
-
+void TestBullet::collidesWith(WorldEntity* entity, const Vector& location)
+{
+  this->destroy();
+}
 
 /**
@@ -79 +82 @@
 //      this->finalize();
       GarbageCollector::getInstance()->collect(this);
-      this->lifeCycle = 0.0;
-
+      this->lifeCycle = 0.0; //! @todo should not be here
     }
 }
@@ -88 +90 @@
 */
 void TestBullet::destroy ()
-{}
+{
+
+
+}
 
 

trunk/src/world_entities/weapons/test_bullet.h

@@ -18 +18 @@
   virtual ~TestBullet ();
 
+  virtual void collidesWith(WorldEntity* entity, const Vector& location);
   virtual void destroy ();
 

trunk/src/world_entities/world_entity.cc

@@ -143 +143 @@
 void WorldEntity::collidesWith(WorldEntity* entity, const Vector& location)
 {
-  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
+//  PRINTF(3)("collision %s vs %s @ (%f,%f,%f)\n", this->getClassName(), entity->getClassName(), location.x, location.y, location.z);
 }