Changeset 10672 in orxonox.OLD

Timestamp:

Jun 5, 2007, 11:01:09 PM (17 years ago)

Author:

nicolasc

Message:

version bump

Location:

branches/vs-enhencements/src/world_entities

Files:

• space_ships/space_ship.cc (modified) (8 diffs)
• space_ships/space_ship.h (modified) (2 diffs)
• weapons/weapon_manager.cc (modified) (1 diff)
• weapons/weapon_slot.cc (modified) (1 diff)
• weapons/weapon_slot.h (modified) (2 diffs)

branches/vs-enhencements/src/world_entities/space_ships/space_ship.cc

@@ -167 +167 @@
 //   this->weaponMan.createWeaponSlot(0, 3.270, 1.028, .155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
 //   this->weaponMan.createWeaponSlot(1, 3.270, 1.028, -.155, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-
-
-//   this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
-//   this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
-//   this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
-//   this->weaponMan.addWeaponToSlot(0, 3, "RFCannon");
-//   this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
-//   this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
-//   this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
-//   this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
+//   this->weaponMan.createWeaponSlot(2, 4.385, .063, .876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(3, 4.385, -.063, -.876, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(4, 1.635, -.612, 2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(5, 1.536, -.612, -2.691, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(6, 1.536, -.612, 3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+//   this->weaponMan.createWeaponSlot(7, 1.536, -.612, -3.254, WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+
+
+  this->weaponMan.addWeaponToSlot(0, 0, "RFCannon");
+  this->weaponMan.addWeaponToSlot(0, 1, "RFCannon");
+  this->weaponMan.addWeaponToSlot(0, 2, "RFCannon");
+  this->weaponMan.addWeaponToSlot(0, 3, "RFCannon");
+  this->weaponMan.addWeaponToSlot(1, 0, "RFCannon");
+  this->weaponMan.addWeaponToSlot(1, 1, "RFCannon");
+  this->weaponMan.addWeaponToSlot(1, 2, "RFCannon");
+  this->weaponMan.addWeaponToSlot(1, 3, "RFCannon");
 
   this->weaponMan.addWeaponToSlot(0, 4, "NadionLaser");
@@ -211 +211 @@
   Playable::weaponConfigChanged();
 
-  setReactor(10);
-  setWeapon(10);
-  setEngine(15);
-
   this->bInit = false;
 
@@ -221 +217 @@
 //   loadHealth(100, 100, 0);
 //   loadElectronic(40, 50, .7, 3.0);
+  loadReactor(10);
+  loadWeapon(10);
+  loadEngine(15);
 
 //   this->loadModel("models/spaceships/fighter_redesign9.obj");
@@ -321 +320 @@
   State::getCamera()->setParent(this);
 
-  LoadParam(root, "setReactor", this, SpaceShip, setReactor)
+  LoadParam(root, "loadReactor", this, SpaceShip, loadReactor)
   .describe("set reactor output");
   LoadParam(root, "loadShield", this, WorldEntity, loadShield)
@@ -329 +328 @@
   LoadParam(root, "loadElectronic", this, WorldEntity, loadElectronic)
   .describe("set electronics parameters: current strenght , max strenght, threshhold value (0..1), regeneration rate");
-  LoadParam(root, "setEngine", this, SpaceShip, setEngine)
+  LoadParam(root, "loadEngine", this, SpaceShip, loadEngine)
   .describe("set base speed");
   LoadParam(root, "loadEnergyShare", this, SpaceShip, loadEnergyShare)
   .describe("set energy partitioning: shield, weapons, engine (sum should be 1)");
-  LoadParam(root, "setWeapon", this, SpaceShip, setWeapon)
+  LoadParam(root, "loadWeapon", this, SpaceShip, loadWeapon)
   .describe("set weapon regeneration");
 
@@ -444 +443 @@
 void SpaceShip::tick (float time)
 {
-/*
+
   if( !this->bInit)
   {
@@ -455 +454 @@
       {
         int slot = ws->getWeaponSlot();
-        int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
+//         int side = ws->getWeaponSide(); //FIXME / REMOVE: is not used// HACK needed for some weapons (left/right)
         this->getWeaponManager().setSlotPosition(slot, (*it).second->getCenter());
         this->getWeaponManager().setSlotDirection(slot, ws->getRelDir());
@@ -463 +462 @@
     }
   this->bInit = true;
-  }*/
+  }
 
   // Playable::tick(time);

branches/vs-enhencements/src/world_entities/space_ships/space_ship.h

@@ -65 +65 @@
 
     //!< functions for XML loading
-    void setReactor(float output) {this->reactorOutput = output; };
-    void setEngine( float speedBase) {this->engineSpeedBase = speedBase; };
+    void loadReactor(float output) {this->reactorOutput = output; };
+    void loadEngine( float speedBase) {this->engineSpeedBase = speedBase; };
     void loadEnergyShare(float shield, float weapon, float engine)
         { float tmp = shield + weapon + engine; if (unlikely (tmp > 1)) { tmp = 1/tmp; }
@@ -73 +73 @@
           this->weaponEnergyShare = weapon * tmp;
           this->engineEnergyShare = engine * tmp; };
-    inline void setWeapon(float regen) { this->weaponEnergyRegen = regen; };
+    inline void loadWeapon(float regen) { this->weaponEnergyRegen = regen; };
 
     void addWeaponToSlot(int wm, int config, int slot, const std::string& weaponName);

branches/vs-enhencements/src/world_entities/weapons/weapon_manager.cc

@@ -35 +35 @@
 /**
  * @brief this initializes the weaponManager for a given nnumber of weapon slots
- * @param number of weapon slots of the model/ship <= 8 (limitied)
+ * @param number of weapon slots of the model/ship <= 10 (limitied)
  */
 WeaponManager::WeaponManager(WorldEntity* parent)

branches/vs-enhencements/src/world_entities/weapons/weapon_slot.cc

@@ -57 +57 @@
   LoadParam(root, "slot", this, WeaponSlot, setWeaponConfig)
   .describe("sets the weapon slot");
+
+  LoadParam(root, "currentWeapon", this, WeaponSlot, setCurrentWeapon)
+  .describe("creates and set next weapon");
+
+  LoadParam(root, "nextWeapon", this, WeaponSlot, setNextWeapon)
+  .describe("creates and set next weapon");
 }
 

branches/vs-enhencements/src/world_entities/weapons/weapon_slot.h

@@ -8 +8 @@
 
 #include "p_node.h"
-
+#include "weapon.h"
 
 class Weapon;
@@ -36 +36 @@
   inline void setNextWeapon(Weapon* weapon) { this->nextWeapon = weapon; }
 
+  inline void setNextWeapon(const std::string& weaponName){this->nextWeapon = Weapon::createWeapon(weaponName); };
+  inline void setCurrentWeapon(const std::string& weaponName){ this->currentWeapon = Weapon::createWeapon(weaponName); };
+
 
   inline void setWeaponConfig(int slot, int side) { this->weaponSlot = slot; this->weaponSide = side; }