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

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.h (modified) (4 diffs)

trunk/src/world_entities/world_entity.h

@@ -29 +29 @@
 class CollisionHandle;
 class Collision;
-class Plane;
 
 
@@ -86 +85 @@
 
   bool registerCollision(WorldEntity* entityA, WorldEntity* entityB, BoundingVolume* bvA, BoundingVolume* bvB);
-  bool registerCollision(WorldEntity* entity, Plane* plane, Vector position);
+  bool registerCollision(WorldEntity* entity, WorldEntity* groundEntity, Vector normal, Vector position);
   /** @return true if there is at least on collision reaction subscribed */
   inline bool isReactive() const { return this->bReactive; }
@@ -138 +137 @@
   inline float getMass() const { return this->physicsInterface.getMass(); }
   inline float getTotalMass() const { return this->physicsInterface.getTotalMass(); }
+  inline void setVelocity(const Vector& vel) { this->velocity = vel; }
 
 
@@ -187 +187 @@
   PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
 
+
+  protected:
+  Vector                  velocity;                        //!< speed of the entity
+
 };