Changeset 10618 in orxonox.OLD for trunk/src/world_entities/spectator.cc

Timestamp:

Apr 4, 2007, 12:13:53 PM (17 years ago)

Author:

bknecht

Message:

merged cleanup into trunk (only improvements)

Location:

trunk

Files:

• . (modified) (1 prop)
• src/world_entities/spectator.cc (modified) (4 diffs)

trunk

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs

trunk/src/world_entities/spectator.cc

@@ -25 +25 @@
 #include "src/world_entities/npcs/generic_npc.h"
 
+#include "src/lib/util/loading/load_param.h"
+
+#include "player.h"
+
 
 ObjectListDefinition(Spectator);
 CREATE_FACTORY(Spectator);
 
-
+Spectator* Spectator::ghost = NULL;
+Playable* Spectator::regularPlayable = NULL;
 
 #include "state.h"
+#include "shell_command.h"
+             
+SHELL_COMMAND( enableGhost, Spectator, enableGhost )
+             ->describe("fly around")
+             ->setAlias("ghost");
 
 
@@ -109 +119 @@
 /**
  * loads the Settings of a Spectator from an XML-element.
- * @param root the XML-element to load the Spaceship's properties from
+ * @param root the XML-element to load the Spectator's properties from
  */
 void Spectator::loadParams(const TiXmlElement* root)
 {
   Playable::loadParams(root);
+  
+  LoadParam(root, "allowGhost", this, Spectator, allowGhost)
+    .describe("Allows the Player to fly around");
+}
+
+
+
+void Spectator::allowGhost( bool flag )
+{
+  PRINTF(0)( "SPECTATOR ALLOWGHOST: %d\n", flag );
+  if ( flag )
+  {
+    assert( ghost == NULL && "only one flySpectator allowed" );
+    
+    ghost = this;
+  }
+  else
+  {
+    ghost = NULL;
+  }
+}
+
+
+void Spectator::enableGhost( )
+{
+  if ( !ghost )
+  {
+    Spectator* spec = new Spectator();
+    spec->allowGhost( true );
+  }
+  
+  if ( !regularPlayable )
+  {
+    if ( !State::getPlayer() || !State::getPlayer()->getPlayable() )
+      return;
+    
+    regularPlayable = State::getPlayer()->getPlayable();
+    
+    ghost->setAbsCoor( regularPlayable->getAbsCoor() );
+    ghost->setAbsDir( regularPlayable->getAbsDir() );
+    
+    State::getPlayer()->setPlayable( ghost );
+  }
+  else
+  {
+    if ( !State::getPlayer() || !State::getPlayer()->getPlayable() )
+      return;
+    
+    State::getPlayer()->setPlayable( regularPlayable );
+    regularPlayable = NULL;
+  }
 }
 
@@ -242 +303 @@
     this->yMouse += event.yRel;
   }
-  else if( event.type == KeyMapper::PEV_JUMP)
-  {
+  else if( event.type == KeyMapper::PEV_FIRE1 )
+  {
+    PRINTF(0)( "CURRENT POS: (%f, %f, %f) ROT (%f, (%f, %f, %f))\n", this->getAbsCoorX(), this->getAbsCoorY(), this->getAbsCoorZ(), this->getAbsDir().w, this->getAbsDir().v.x, this->getAbsDir().v.y, this->getAbsDir().v.z );
 //     FPSPlayer * fps = new FPSPlayer();
 //     //GenericNPC* fps = new GenericNPC();
@@ -263 +325 @@
 
 
+

@@ -16 +16 @@
 OrxonoxPlayability.kdevses
 OrxonoxPlayability.kdevelop.pcs
+orxonox.backtrace
+orxonox.kdevses
+orxonox.kdevelop.pcs