Changeset 8686 in orxonox.OLD for branches

Timestamp:

Jun 21, 2006, 8:57:39 PM (18 years ago)

Author:

patrick

Message:

bsp: fps player extension

Location:

branches/bsp_model/src/world_entities

Files:

• creatures/fps_player.cc (modified) (4 diffs)
• creatures/fps_player.h (modified) (1 diff)
• playable.cc (modified) (1 diff)

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

@@ -93 +93 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
 
-
+  // network registration
   registerVar( new SynchronizeableBool( &bLeft, &bLeft, "bLeft", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableBool( &bRight, &bRight, "bRight", PERMISSION_OWNER ) );
@@ -99 +99 @@
   registerVar( new SynchronizeableBool( &bBackward, &bBackward, "bBackward", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mouseDir", PERMISSION_OWNER ) );
+
+  // collision reaction registration
+  this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 }
 
@@ -142 +145 @@
   dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
   this->detachCamera();
-}
-
-
-/**
- *  this function is called, when two entities collide
- * @param entity: the world entity with whom it collides
- *
- * Implement behaviour like damage application or other miscellaneous collision stuff in this function
- * @todo dont let FPSPlayer fly through walls
- */
-void FPSPlayer::collidesWith(WorldEntity* entity, const Vector& location)
-{
 }
 
@@ -246 +237 @@
 
 
-
-
-
-/**
- *
+/**
+ *  draws the MD2Creature after transforming it.
+ */
+void FPSPlayer::draw () const
+{
+  // only draw if this entity is not the player since the player nevers sees himself
+  if( this->getCurrentPlayer() == NULL)
+    WorldEntity::draw();
+}
+
+
+
+/**
+ * process
  */
 void FPSPlayer::process(const Event &event)

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

@@ -27 +27 @@
     virtual void reset();
 
-    virtual void collidesWith(WorldEntity* entity, const Vector& location);
+
     virtual void tick(float time);
+    virtual void draw() const;
+
 
     virtual void process(const Event &event);

branches/bsp_model/src/world_entities/playable.cc

@@ -65 +65 @@
 
   this->bDead = false;
-
-//   this->subscribeReaction(CREngine::CR_PHYSICS_GROUND_WALK, CL_BSP_ENTITY);
 
   registerVar( new SynchronizeableInt( &score, &score, "score" ) );