Changeset 10113 in orxonox.OLD for branches/playability/src/world_entities/space_ships

Timestamp:

Dec 19, 2006, 11:39:59 PM (18 years ago)

Author:

marcscha

Message:

Collision fixes, further additions

Location:

branches/playability/src/world_entities/space_ships

Files:

• space_ship.cc (modified) (12 diffs)
• space_ship.h (modified) (1 diff)

branches/playability/src/world_entities/space_ships/space_ship.cc

@@ -34 +34 @@
 #include "particles/emitter_node.h"
 #include "particles/sprite_particles.h"
-#include "effects/explosion.h"
 #include "effects/trail.h"
 
@@ -52 +51 @@
 #include "state.h"
 #include "player.h"
+
 
 #include "util/loading/load_param.h"
@@ -173 +173 @@
   this->weaponMan.addWeapon( wpLeft1, 0, 0);
   this->weaponMan.addWeapon( wpRight1, 0, 1);
-  this->weaponMan.addWeapon( wpLeft2, 0, 2);
-  this->weaponMan.addWeapon( wpRight2, 0, 3);
-  this->weaponMan.addWeapon( wpLeft3, 0, 4);
-  this->weaponMan.addWeapon( wpRight3, 0, 5);
-
-  this->secWeaponMan.addWeapon( cannon, 1, 0);
-
-  this->weaponMan.changeWeaponConfig(0);
-  this->secWeaponMan.changeWeaponConfig(1);
+  this->weaponMan.addWeapon( wpLeft2, 1, 0);
+  this->weaponMan.addWeapon( wpRight2, 1, 1);
+  this->weaponMan.addWeapon( wpLeft3, 2, 0);
+  this->weaponMan.addWeapon( wpRight3, 2, 1);
+
+  this->secWeaponMan.addWeapon( cannon, 0, 0);
+
 
   wpRight1->requestAction(WA_ACTIVATE);
   wpLeft1->requestAction(WA_ACTIVATE);
+
   wpRight2->requestAction(WA_ACTIVATE);
   wpLeft2->requestAction(WA_ACTIVATE);
@@ -192 +191 @@
   cannon->requestAction(WA_ACTIVATE);
 
-  curWeaponPrimary    = 0;
+  
+  this->weaponMan.changeWeaponConfig(1);
+  this->secWeaponMan.changeWeaponConfig(0);
+
+  curWeaponPrimary    = 1;
   curWeaponSecondary  = 0;
 
@@ -339 +342 @@
   this->trailR->setTexture( "maps/engine.png");
 
-  
+
   this->toList(OM_GROUP_00);
 }
@@ -376 +379 @@
   this->secWeaponMan.showCrosshair();
   this->toList( OM_GROUP_01 );
-  
-  for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
-  {
-    if( likely( dynamic_cast<Weapon*>(*it) != NULL))
-      dynamic_cast<WorldEntity*>(*it)->toList( OM_GROUP_01);
-  }
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( true);
   //this->attachCamera();
@@ -391 +388 @@
   this->secWeaponMan.hideCrosshair();
   this->toList( OM_GROUP_00);
-  
-  for(ObjectList<PNode>::const_iterator it = this->getNodesChildren().begin(); it != this->getNodesChildren().end(); it++)
-  {
-    if( likely( dynamic_cast<Weapon*>(*it) != NULL))
-      dynamic_cast<WorldEntity*>(*it)->toList( OM_GROUP_00);
-  }
   //dynamic_cast<Element2D*>(this->secWeaponMan.getFixedTarget())->setVisibility( false);
   //this->detachCamera();
@@ -516 +507 @@
   this->trailR->tick(time);
 
+  this->weaponMan.setParentEntity( this);
+  this->secWeaponMan.setParentEntity( this);
+
   //orient the spaceship in direction of the mouse
   /*
@@ -558 +552 @@
 {
   //Playable::process(event);
-
+  
   if( event.type == KeyMapper::PEV_LEFT)
     this->bLeft = event.bPressed;
@@ -571 +565 @@
   else if( event.type == KeyMapper::PEV_FIRE1)
     this->bFire = event.bPressed;
+  else if( event.type == KeyMapper::PEV_NEXT_WEAPON && event.bPressed)
+  {
+    this->nextWeaponConfig();
+  }
+  else if ( event.type == KeyMapper::PEV_PREVIOUS_WEAPON && event.bPressed)
+    this->previousWeaponConfig();
 
 
@@ -632 +632 @@
   else
   {
-    this->setAbsCoor( this->getAbsCoor() + Vector(150,0,0) + Vector(1,0,0) * VECTOR_RAND(50).dot(Vector(1,0,0)));
+    this->setAbsCoor( this->getAbsCoor() + Vector(100,0,0) + Vector(1,0,0) * VECTOR_RAND(150).dot(Vector(1,0,0)));
   }
 
@@ -963 +963 @@
 }
 
+/**
+ * @brief jumps to the next WeaponConfiguration
+ */
+void SpaceShip::nextWeaponConfig()
+{
+  
+  this->curWeaponPrimary    = (curWeaponPrimary + 1) % 3;
+  this->weaponMan.changeWeaponConfig(this->curWeaponPrimary);
+  Playable::weaponConfigChanged();
+}
+
+/**
+ * @brief moves to the last WeaponConfiguration
+ */
+void SpaceShip::previousWeaponConfig()
+{
+  this->curWeaponPrimary    = (curWeaponPrimary + 1) % 3;
+  this->weaponMan.changeWeaponConfig(this->curWeaponPrimary);
+  Playable::weaponConfigChanged();
+}

branches/playability/src/world_entities/space_ships/space_ship.h

@@ -78 +78 @@
     void setPlaymodeXML(const std::string& playmode);
     virtual void movement (float dt);
+
+    void nextWeaponConfig();
+    void previousWeaponConfig();
+
+    inline void hit(float damage, WorldEntity* killer) { this->collidesWith(killer, this->getAbsCoor()); killer->collidesWith(this, this->getAbsCoor()); } ;
 
   private: