Changeset 10698 in orxonox.OLD for trunk/src/world_entities/weapons

Timestamp:

Jun 14, 2007, 5:33:43 PM (18 years ago)

Author:

snellen

Message:

merged adm, hud, vs-enhancements : beni's responsible for this commit. blame him!

Location:

trunk/src/world_entities/weapons

Files:

• aiming_system.cc (modified) (2 diffs)
• bsp_weapon.cc (copied) (copied from branches/adm/src/world_entities/weapons/bsp_weapon.cc)
• bsp_weapon.h (copied) (copied from branches/adm/src/world_entities/weapons/bsp_weapon.h)
• disruptor.cc (copied) (copied from branches/vs-enhencements/src/world_entities/weapons/disruptor.cc)
• disruptor.h (copied) (copied from branches/vs-enhencements/src/world_entities/weapons/disruptor.h)
• heavy_blaster.cc (modified) (5 diffs)
• laser_cannon.cc (modified) (2 diffs)
• light_blaster.cc (modified) (4 diffs)
• medium_blaster.cc (modified) (5 diffs)
• medium_blaster.h (modified) (1 diff)
• nadion_laser.cc (copied) (copied from branches/vs-enhencements/src/world_entities/weapons/nadion_laser.cc)
• nadion_laser.h (copied) (copied from branches/vs-enhencements/src/world_entities/weapons/nadion_laser.h)
• rf_cannon.cc (copied) (copied from branches/vs-enhencements/src/world_entities/weapons/rf_cannon.cc)
• rf_cannon.h (copied) (copied from branches/vs-enhencements/src/world_entities/weapons/rf_cannon.h)
• weapon.cc (modified) (2 diffs)
• weapon.h (modified) (3 diffs)
• weapon_manager.cc (modified) (5 diffs)
• weapon_manager.h (modified) (2 diffs)
• weapon_slot.cc (modified) (3 diffs)
• weapon_slot.h (modified) (2 diffs)

trunk/src/world_entities/weapons/aiming_system.cc

@@ -112 +112 @@
 void AimingSystem::hit(float damage, WorldEntity* killer)
 {
-  if( this->owner != killer)
+  if( this->owner != killer && killer != this && !killer->isA( AimingSystem::staticClassID() ) )
   {
     //PRINTF(0)("real hit: %s\n", killer->getClassCName());
@@ -127 +127 @@
 void AimingSystem::tick(float dt)
 {
-
-
 }
 

trunk/src/world_entities/weapons/heavy_blaster.cc

@@ -98 +98 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/frag_cannon.obj", .4);
+  this->loadModel("models/guns/frag_cannon2.obj", .4);
 
 
@@ -131 +131 @@
     this->objComp[i] = new PNode* [this->getSegs()];
     this->emissionPoint[i] = new PNode;
-    this->emissionPoint[i]->setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
+    this->emissionPoint[i]->setParent(this);      //Parenting emissionPoint to Weapons
     this->emissionPoint[i]->setName("EmissionPoint");
     this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
@@ -156 +156 @@
 
 
-//   Animation3D* animB0Shoot = this->getAnimation(WS_SHOOTING0, this->objComp[0][0]);
-//   Animation3D* animB1Shoot = this->getAnimation(WS_SHOOTING1, this->objComp2);
-//   Animation3D* animB2Shoot = this->getAnimation(WS_SHOOTING2, this->objComp3);
-//   Animation3D* animT0Shoot = this->getAnimation(WS_SHOOTING3, this->objComp[0][1]);
-//   Animation3D* animT1Shoot = this->getAnimation(WS_SHOOTING4, this->objComp5);
-//   Animation3D* animT2Shoot = this->getAnimation(WS_SHOOTING5, this->objComp6);
-
-
-//   this->shootAnim[0][0]->setInfinity(ANIM_INF_CONSTANT);
-//   animB1Shoot->setInfinity(ANIM_INF_CONSTANT);
-//   animB2Shoot->setInfinity(ANIM_INF_CONSTANT);
-//   animT0Shoot->setInfinity(ANIM_INF_CONSTANT);
-//   animT1Shoot->setInfinity(ANIM_INF_CONSTANT);
-//   animT2Shoot->setInfinity(ANIM_INF_CONSTANT);
-
   for (int i = 0; i < this->getBarrels(); i++){
-    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.01, ANIM_LINEAR, ANIM_NULL);
     this->shootAnim[i][0]->addKeyFrame(Vector(-0.3, 0.0, 0.0), Quaternion(), 0.9, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.55, ANIM_LINEAR, ANIM_NULL);
-
-    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.05, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.5, ANIM_LINEAR, ANIM_NULL);
+
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_NULL);
     this->shootAnim[i][1]->addKeyFrame(Vector(-0.4, 0.0, 0.0), Quaternion(), 1.2, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.25, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.2, ANIM_LINEAR, ANIM_NULL);
   }
 
@@ -186 +171 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
   animation3->setInfinity(ANIM_INF_CONSTANT);
-
-//   this->setEmissionPoint(3.8, 1.2, 0, 0);
 
   animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);
@@ -207 +190 @@
   pj->setParent(PNode::getNullParent());
 
-//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*250 + VECTOR_RAND(5));
-//   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
   pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*130 + VECTOR_RAND(1));
 
   pj->setAbsCoor(this->emissionPoint[this->activeBarrel]->getAbsCoor());
-//   pj->setAbsCoor(this->getEmissionPoint(0));
   pj->setAbsDir(this->getAbsDir());
-//   pj->toList(OM_GROUP_01_PROJ);
   pj->activate();
 

trunk/src/world_entities/weapons/laser_cannon.cc

@@ -55 +55 @@
   this->registerObject(this, LaserCannon::_objectList);
 
-//  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/laser_cannon.obj", OBJ, RP_CAMPAIGN);
+  this->setScaling (5);
 
-  this->loadModel("models/guns/lasercannon.obj", 5.0f);
+  this->loadModel("models/guns/lasercannon.obj", this->getScaling());
 
   this->setStateDuration(WS_SHOOTING, .1);
@@ -75 +75 @@
   this->setProjectileTypeC("RailProjectile");
   this->prepareProjectiles(100);
-  this->setEmissionPoint(Vector(2.8,0,0) * 5.0);
+  this->setEmissionPoint(Vector(2.8,0,0) * this->getScaling());
 }
 

trunk/src/world_entities/weapons/light_blaster.cc

@@ -90 +90 @@
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
   this->setProjectileTypeC("LBolt");
-  this->prepareProjectiles(100);
+  this->prepareProjectiles(25);
 
   this->setBarrels(3);
@@ -106 +106 @@
     this->emissionPoint[i]->setName("EmissionPoint");
     this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-//     this->shootAnim[i] = new Animation3D* [this->getSegs()];
     for(int j = 0; j < this->getSegs(); j++)
     {
@@ -114 +113 @@
     }
   }
-/*
-  this->emissionPoint[0]->setRelCoor(Vector(1.19, 0.0, 0.1));
-  this->emissionPoint[1]->setRelCoor(Vector(1.19, -0.07, -0.05));
-  this->emissionPoint[2]->setRelCoor(Vector(1.19, 0.07, -0.05));*/
 
   this->emissionPoint[0]->setRelCoor(Vector(2.2, 0.0, 0.1));
@@ -130 +125 @@
   animation2->setInfinity(ANIM_INF_CONSTANT);
   animation3->setInfinity(ANIM_INF_CONSTANT);
-
-//   this->setEmissionPoint(3.8, 1.2, 0);
-
-//   for (int i = 0; i < this->getBarrels(); i++){
-//     this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion(i * 120, Vector(1.0, 0.0, 0.0)), 0.049, ANIM_NULL, ANIM_LINEAR);
-//     this->shootAnim[i][0]->addKeyFrame(Vector(), Quaternion((i+1)*120, Vector(1.0, 0.0, 0.0)), 0.001, ANIM_NULL, ANIM_LINEAR);
-//   }
 
 

trunk/src/world_entities/weapons/medium_blaster.cc

@@ -69 +69 @@
 void MediumBlaster::init()
 {
-  this->loadModel("models/guns/blaster.obj", .33);
+  this->setScaling(.3333);
+
+  this->loadModel("models/guns/blaster.obj", this->getScaling());
 
   this->setStateDuration(WS_SHOOTING, 0.2);   // 5 Schuss pro Sekunde
@@ -82 +84 @@
 
   this->setActionSound(WA_SHOOT, "sounds/guns/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+//   this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
   this->setActionSound(WA_RELOAD, "sounds/spawn/alien_generator.wav");
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_LIGHT);
-  this->setProjectileTypeC("MBolt");   // FIXME temp project type until the blaste class exist
-  this->prepareProjectiles(100);
+  this->setProjectileTypeC("MBolt");
+  this->prepareProjectiles(10);
 
 
@@ -95 +97 @@
 
   this->objComp = new PNode**[this->getBarrels()];
+  this->emissionPoint = new PNode*[this->getBarrels()];
   this->shootAnim = new Animation3D**[this->getBarrels()];
   for (int i = 0; i < this->getBarrels(); i++)
   {
     this->objComp[i] = new PNode* [this->getSegs()];
+    this->emissionPoint[i] = new PNode;
+    this->emissionPoint[i]->setParent(this);  //Parenting emissionPoint to Weapon
+    this->emissionPoint[i]->setName("EmissionPoint");
+    this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
     this->shootAnim[i] = new Animation3D* [this->getSegs()];
     for(int j = 0; j < this->getSegs(); j++)
@@ -109 +116 @@
 
   for (int i = 0; i < this->getBarrels(); i++){
-    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.04, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][0]->addKeyFrame(Vector(-0.333, 0.0, 0.0), Quaternion(), 0.15, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.01, ANIM_LINEAR, ANIM_NULL);
-
-    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.04, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][1]->addKeyFrame(Vector(.166, 0.0, 0.0), Quaternion(), 0.15, ANIM_LINEAR, ANIM_NULL);
-    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0), Quaternion(), 0.01, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.04, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(-1.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.15, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][0]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.01, ANIM_LINEAR, ANIM_NULL);
+
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.04, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][1]->addKeyFrame(Vector(.5, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.15, ANIM_LINEAR, ANIM_NULL);
+    this->shootAnim[i][1]->addKeyFrame(Vector(0.0, 0.0, 0.0) * this->getScaling(), Quaternion(), 0.01, ANIM_LINEAR, ANIM_NULL);
   }
 
@@ -124 +131 @@
   animation3->setInfinity(ANIM_INF_CONSTANT);
 
-
-  this->setEmissionPoint(1.3, 0, 0);
+  this->emissionPoint[0]->setRelCoor(Vector(3.9, 0.0, 0.0) * this->getScaling());
 
   animation2->addKeyFrame(Vector(0.0, -1.0, 0.0), Quaternion(), 0.3, ANIM_LINEAR, ANIM_NULL);

trunk/src/world_entities/weapons/medium_blaster.h

@@ -33 +33 @@
     PNode*** objComp;
     Animation3D*** shootAnim;
+    PNode** emissionPoint;
 
     int activeBarrel;

trunk/src/world_entities/weapons/weapon.cc

@@ -134 +134 @@
   for(int i = 0; i < this->barrels; i++){
     this->emissionPoint[i] = new PNode;
-    this->emissionPoint[i]->setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
+    this->emissionPoint[i]->setParent(this);  //Parenting emissionPoint to Weapons
     this->emissionPoint[i]->setName("EmissionPoint");
     this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
@@ -158 +158 @@
   // set this object to be synchronized over network
   //this->setSynchronized(true);
-}
-
-/**
- * needed, if there are more than one barrel or segments
- */
-void Weapon::init2()
-{
-  if (this->barrels == 1 && this->segs == 1)
-    return;
-
-  delete this->emissionPoint[0];
-  delete this->emissionPoint;
-  delete this->shootAnim[0];
-  delete this->shootAnim;
-
-  this->shootAnim = new Animation3D**[this->barrels];
-  this->emissionPoint = new PNode*[this->barrels];
-  for(int i = 0; i < this->barrels; i++){
-    this->emissionPoint[i] = new PNode;
-    this->emissionPoint[i]->setParent(this);             //< One EmissionPoint, that is a PNode connected to the weapon. You can set this to the exitting point of the Projectiles
-    this->emissionPoint[i]->setName("EmissionPoint");
-    this->emissionPoint[i]->addNodeFlags(PNODE_PROHIBIT_DELETE_WITH_PARENT);
-    this->shootAnim[i] = new Animation3D* [this->segs];
-  }
-}
-
-/**
- * deconstructor for init2
- */
-void Weapon::deconstr()
-{
-  for(int i = 0; i < this->barrels; i++) {
-    delete this->emissionPoint[i];
-    for (int j = 0; j < this->segs; j++)
-      delete this->shootAnim[i][j];
-    delete this->shootAnim[i];
-  }
-
-  delete this->emissionPoint;
-  delete this->shootAnim;
 }
 

trunk/src/world_entities/weapons/weapon.h

@@ -124 +124 @@
     Projectile* getProjectile();
 
+    inline void setScaling(float scaling) { this->scaling = scaling; };
+    inline float getScaling() { return this->scaling; };
 
     // EMISSION
@@ -181 +183 @@
     inline void setSegs(int segs) { this->segs = segs; };
 
-    inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
-    inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
-
-    void init2();
+//     inline Animation3D* getShootAnim(int barrel, int seg) { return this->shootAnim[barrel][seg]; };
+//     inline void setShootAnim(int barrel, int seg, PNode* component) { this->shootAnim[barrel][seg] = this->getAnimation(barrel, seg, component); };
+
+//     void init2();
     void deconstr();
 
@@ -248 +250 @@
     PNode*               defaultTarget;                    //!< A target for targeting Weapons.
 
+    float                scaling;                          //!< Local scaling factor. any scaling will be done through this vector.
+
     ////////////
     // PHASES //

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -1 @@
-
 /*
    orxonox - the future of 3D-vertical-scrollers
@@ -36 +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)
@@ -146 +145 @@
   BaseObject::loadParams(root);
 
-  LoadParam(root, "slot-count", this, WeaponManager, setSlotCount)
+  LoadParam(root, "slotCount", this, WeaponManager, setSlotCount)
   .describe("how many slots(cannons) the WeaponManager can handle");
+
 
   LOAD_PARAM_START_CYCLE(root, element);
@@ -156 +156 @@
   }
   LOAD_PARAM_END_CYCLE(element);
+
+
 }
 
@@ -357 +359 @@
  * @param slotCapability the capability @see WeaponSlotCapability
  */
-void WeaponManager::setSlotCapability(int slot, long slotCapability)
+void WeaponManager::setSlotCapability(int slot, unsigned long slotCapability)
 {
   if (slot > slotCount)

trunk/src/world_entities/weapons/weapon_manager.h

@@ -60 +60 @@
     // setting up the WeaponManager with the following functions
     void setSlotPosition(int slot, const Vector& position, PNode* parent = NULL);
+//     inline void setSlotPosition(float slot, float x, float y,float z) {setSlotPosition((int)slot, Vector(x,y,z));};
     void setSlotDirection(int slot, const Quaternion& rotation);
     /** @param slot the slot to get the relative position from @returns the relative position of the Carrier to the Slot */
     const Vector& getSlotPosition(int slot) const;
-    void setSlotCapability(int slot, long slotCapability);
+    void setSlotCapability(int slot, unsigned long slotCapability);
     /** @param slot the slot to get the capabilities from @returns the capabilies */
     long getSlotCapability(int slot) const;
@@ -76 +77 @@
     bool addWeapon(Weapon* weapon, int configID = -1, int slotID = -1);
     void removeWeapon(Weapon* weapon, int configID = -1);
+
+    inline void createWeaponSlot(int slot, float x, float y, float z, long capability) {
+        this->setSlotPosition(slot, Vector( x, y, z));
+        this->setSlotCapability(slot, capability); };
+
+    inline void addWeaponToSlot(int config, int slot, const std::string& weaponName){
+      this->addWeapon( Weapon::createWeapon( weaponName ), config, slot); };
+
 
     Weapon* getWeapon(int slotID) const;

trunk/src/world_entities/weapons/weapon_slot.cc

@@ -42 +42 @@
 
 WeaponSlot::~WeaponSlot()
-{}
+{
+}
 
 
@@ -55 +56 @@
 
   LoadParam(root, "slot", this, WeaponSlot, setWeaponConfig)
-      .describe("sets the weapon slot");
+  .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");
 }
 
@@ -63 +70 @@
 void WeaponSlot::setWeaponClass()
 {
-
 }
 

trunk/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; }