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

Timestamp:

Jun 8, 2006, 11:19:08 AM (18 years ago)

Author:

patrick

Message:

trunk: merged the network branche back to trunk with command: svn merge branches/network trunk -r8150:HEAD

Location:

trunk/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (1 diff)
• spectator.cc (modified) (6 diffs)
• spectator.h (modified) (2 diffs)

trunk/src/world_entities/space_ships/space_ship.cc

@@ -305 +305 @@
     }
   }
-//  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);
 }
 

trunk/src/world_entities/spectator.cc

@@ -24 +24 @@
 
 
-/**
- * constructor
- */
-Spectator::Spectator( const TiXmlElement * root )
-{
+using namespace std;
+
+
+/**
+ *  destructs the Spectator, deletes alocated memory
+ */
+Spectator::~Spectator ()
+{
+  this->setPlayer(NULL);
+}
+
+
+/**
+ *  creates a new Spectator from Xml Data
+ * @param root the xml element containing Spectator data
+
+   @todo add more parameters to load
+ */
+Spectator::Spectator(const TiXmlElement* root)
+{
+  this->init();
+  if (root != NULL)
+    this->loadParams(root);
+
+}
+
+
+/**
+ * initializes a Spectator
+ */
+void Spectator::init()
+{
+//  this->setRelDir(Quaternion(M_PI, Vector(1,0,0)));
   this->setClassID(CL_SPECTATOR, "Spectator");
-  
-  bool                  bLeft;
-  bool                  bRight;
-  bool                  bForward;
-  bool                  bBackward;
-    
-  float                 xMouse;             //!< mouse moved in x-Direction
-  float                 yMouse;             //!< mouse moved in y-Direction
+
+  this->getWeaponManager().changeWeaponConfig(1);
 
   this->bLeft = false;
@@ -45 +67 @@
   this->xMouse = 0.0f;
   this->yMouse = 0.0f;
-    
+
+  this->setHealthMax(100);
+  this->setHealth(80);
+
+  this->mouseDir = this->getAbsDir();
+
+  //add events to the eventlist
   registerEvent(KeyMapper::PEV_FORWARD);
   registerEvent(KeyMapper::PEV_BACKWARD);
@@ -52 +80 @@
   registerEvent(KeyMapper::PEV_FIRE1);
   registerEvent(EV_MOUSE_MOTION);
-  
+
+  this->getWeaponManager().setSlotCount(0);
+
+  this->getWeaponManager().getFixedTarget()->setParent(this);
+  this->getWeaponManager().getFixedTarget()->setRelCoor(100000,0,0);
+
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
+
+ 
   registerVar( new SynchronizeableBool( &bLeft, &bLeft, "bLeft", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableBool( &bRight, &bRight, "bRight", PERMISSION_OWNER ) );
@@ -60 +96 @@
 }
 
-/**
- * destructor
- */
-Spectator::~Spectator( )
-{
-  this->setPlayer(NULL);
-}
-
-void Spectator::setPlayDirection( const Quaternion & rot, float speed )
-{
-  this->mouseDir =  rot;
-  this->angleY = rot.getHeading();
-  this->angleX = rot.getAttitude();
-}
-
-void Spectator::enter( )
-{
+
+/**
+ * loads the Settings of a Spectator from an XML-element.
+ * @param root the XML-element to load the Spaceship's properties from
+ */
+void Spectator::loadParams(const TiXmlElement* root)
+{
+  Playable::loadParams(root);
+}
+
+void Spectator::setPlayDirection(const Quaternion& quat, float speed)
+{
+  this->mouseDir = quat;
+  this->angleY = quat.getHeading();
+  this->angleX = quat.getAttitude();
+}
+
+
+void Spectator::reset()
+{
+  this->bLeft = false;
+  this->bRight = false;
+  this->bForward = false;
+  this->bBackward = false;
+  this->xMouse = 0.0f;
+  this->yMouse = 0.0f;
+
+  this->setHealth(80);
+}
+
+
+void Spectator::enter()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false );
   this->attachCamera();
 }
 
-void Spectator::leave( )
-{
+void Spectator::leave()
+{
+  dynamic_cast<Element2D*>(this->getWeaponManager().getFixedTarget())->setVisibility( false);
   this->detachCamera();
 }
 
-/**
- * collision handling
- * @param entity other entity
- * @param location 
- * @todo dont allow spectator to go through walls
- */
-void Spectator::collidesWith( WorldEntity * entity, const Vector & location )
-{
-}
-
-void Spectator::tick( float time )
+
+/**
+ *  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 Spectator fly through walls
+ */
+void Spectator::collidesWith(WorldEntity* entity, const Vector& location)
+{
+}
+
+
+
+/**
+ *  the function called for each passing timeSnap
+ * @param time The timespan passed since last update
+ */
+void Spectator::tick (float time)
 {
   Playable::tick( time );
@@ -147 +209 @@
 }
 
-void Spectator::process( const Event & event )
+/**
+ * @todo switch statement ??
+ */
+void Spectator::process(const Event &event)
 {
   Playable::process(event);
@@ -165 +230 @@
   }
 }
+
+
+
+

trunk/src/world_entities/spectator.h

@@ -11 +11 @@
 class Spectator : public Playable
 {
+
   public:
-    Spectator( const TiXmlElement* root = NULL );
+    Spectator(const TiXmlElement* root = NULL);
     virtual ~Spectator();
-    
+
+    virtual void loadParams(const TiXmlElement* root);
+
     virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f);
 
     virtual void enter();
     virtual void leave();
-    
+
+    virtual void reset();
+
     virtual void collidesWith(WorldEntity* entity, const Vector& location);
     virtual void tick(float time);
 
     virtual void process(const Event &event);
-    
+
   private:
+    void init();
+
     bool                  bLeft;
     bool                  bRight;
@@ -35 +42 @@
     Quaternion            mouseDir;           //!< the direction where the player wants to fly
 
-    //Quaternion            rotY;
-    //Quaternion            rotAxis;
     float                 angleX;
     float                 angleY;
+
 };