Changeset 9656 in orxonox.OLD for trunk/src/world_entities/space_ships

Timestamp:

Aug 4, 2006, 11:01:28 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the proxy bache back with no conflicts

Location:

trunk/src/world_entities/space_ships

Files:

• hover.cc (modified) (1 diff)
• space_ship.cc (modified) (1 diff)
• turbine_hover.cc (modified) (5 diffs)
• turbine_hover.h (modified) (3 diffs)

trunk/src/world_entities/space_ships/hover.cc

@@ -330 +330 @@
   this->shiftCoor (this->velocity * dt);
 
-    // limit the maximum rotation speed.
+  // limit the maximum rotation speed.
   if (this->rotation != 0.0f)
   {

trunk/src/world_entities/space_ships/space_ship.cc

@@ -234 +234 @@
   this->burstSystem->setColor(1.0, .8,.8,.8,.0);
 
-  registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity" ) );
+  registerVar( new SynchronizeableVector( &velocity, &velocity, "velocity", PERMISSION_MASTER_SERVER ) );
   registerVar( new SynchronizeableQuaternion( &mouseDir, &mouseDir, "mousedir", PERMISSION_OWNER ) );
 

trunk/src/world_entities/space_ships/turbine_hover.cc

@@ -91 +91 @@
 
   this->loadModel("models/ships/hoverglider_mainbody.obj");
+
 }
 
@@ -222 +223 @@
   registerVar( new SynchronizeableFloat( &cameraLook, &cameraLook, "cameraLook", PERMISSION_OWNER ) );
   registerVar( new SynchronizeableFloat( &rotation, &rotation, "rotation", PERMISSION_OWNER ) );
+
+  if( State::isOnline())
+    toList( OM_PLAYERS );
 }
 
@@ -231 +235 @@
 {
   Playable::loadParams(root);
+}
+
+
+void TurbineHover::setBoostColor(const Color& color)
+{
+  this->burstSystem->setColor(0.0, color);
+  this->burstSystem->setColor(0.2, color * 0.6);
+  this->burstSystem->setColor(0.5, color * .3 + Color(0.5, 0.5, 0.8, 0.3));
+  this->burstSystem->setColor(1.0, 0.8, 0.8, 0.8, 0.0);
+
+  printf(":::::::::::::::::::::::\n");
+  this->burstSystem->debug();
 }
 
@@ -256 +272 @@
 
 }
+
+void TurbineHover::setTeam(int teamID)
+{
+  printf("::::::::::::::::: TEAM ::: %d\n", teamID);
+  if (teamID == 0)
+  {
+    this->setBoostColor(Color::blue);
+  }
+  else if (teamID == 1)
+  {
+    this->setBoostColor(Color::red);
+  }
+
+  ///HACK this is very much hard coded.set the owner of the weapons
+  this->getWeaponManager().getWeapon(0)->setOwner(this->getOwner());
+  this->getWeaponManager().getWeapon(1)->setOwner(this->getOwner());
+
+  //choose collision list
+  if( State::isOnline())
+  {
+    if( teamID == 0)
+      toList( OM_GROUP_00 );
+    else if(teamID == 1)
+      toList( OM_GROUP_01);
+  }
+
+
+  // set the local team id, very important
+  this->setTeamId(teamID);
+}
+
 
 
@@ -527 +574 @@
   }
 }
+
+
+/**
+ *  respawning function called by the GameRules
+ */
+void TurbineHover::respawn( )
+{
+
+  Playable::respawn();
+}

trunk/src/world_entities/space_ships/turbine_hover.h

@@ -9 +9 @@
 
 #include "playable.h"
+
+#include "color.h"
 
 // Forward Declaration
@@ -21 +23 @@
     virtual ~TurbineHover();
 
+    void setBoostColor(const Color& color);
+
     virtual void loadParams(const TiXmlElement* root);
     virtual void setPlayDirection(const Quaternion& rot, float speed = 0.0f);
@@ -26 +30 @@
     virtual void leave();
 
+    virtual void setTeam(int teamID);
+
     virtual void postSpawn();
     virtual void leftWorld();
+    virtual void respawn();
 
     virtual void collidesWith(WorldEntity* entity, const Vector& location);