Changeset 8939 in orxonox.OLD

Timestamp:

Jun 30, 2006, 2:35:50 AM (18 years ago)

Author:

patrick

Message:

world entity on ground function

Location:

branches/single_player_map/src/world_entities

Files:

• creatures/fps_player.cc (modified) (2 diffs)
• creatures/fps_player.h (modified) (1 diff)
• world_entity.h (modified) (3 diffs)

branches/single_player_map/src/world_entities/creatures/fps_player.cc

@@ -90 +90 @@
   this->setHealth(80);
 
+  this->fallVelocity = 0.0f;
 
   this->cameraNode.setParent(this);
@@ -251 +252 @@
   }
 
+  // physical falling of the player
+
+
+//   this->fallVelocity += 10.0f * time + this->fallVelocity;
+
+
   velocity *= 100;
 
   this->shiftCoor( velocity*time );
+
+
+
 
 

branches/single_player_map/src/world_entities/creatures/fps_player.h

@@ -51 +51 @@
 
     PNode                 cameraNode;
+
+    float                 fallVelocity;        //!< velocity for falling down
 };
 

branches/single_player_map/src/world_entities/world_entity.h

@@ -94 +94 @@
   CollisionHandle* getCollisionHandle(CREngine::CRType type) const { return this->collisionHandles[type]; }
 
+  /** @returns true if this entity is standing on ground (BSP model) */
+  bool isOnGround() const { return this->isOnGround(); }
+  /** @param flag: marks if this entity is standing on ground */
+  void setOnGround(bool flag) { this->bOnGround = flag; }
+
   virtual void hit(float damage);
   virtual void destroy();
@@ -117 +122 @@
 
   void hide() { if( this->objectListNumber != OM_DEAD) this->lastObjectListNumber = this->objectListNumber; this->toList(OM_DEAD); }
-  void unhide() { this->toList(this->lastObjectListNumber); }
+  void unhide() { if( this->objectListNumber != this->lastObjectListNumber) this->toList(this->lastObjectListNumber); }
 
 
@@ -194 +199 @@
 
   PhysicsInterface        physicsInterface;                //!< the physics object of the WorldEntity
-
+  bool                    bOnGround;                       //!< true if this entity is standing on the ground
 
   protected: