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

Timestamp:

Jan 28, 2006, 11:14:40 AM (19 years ago)

Author:

bensch

Message:

trunk: WeaponManager fix

Location:

trunk/src/world_entities/weapons

Files:

• cannon.cc (modified) (2 diffs)
• weapon.h (modified) (1 diff)
• weapon_manager.cc (modified) (1 diff)
• weapon_manager.h (modified) (1 diff)

trunk/src/world_entities/weapons/cannon.cc

@@ -74 +74 @@
 //  this->model = (Model*)ResourceManager::getInstance()->load("models/guns/test_gun.obj", OBJ, RP_CAMPAIGN);
 
-  this->loadModel("models/guns/plasmadriver_#.obj");
+  this->loadModel("models/guns/plasmadriver_#.obj", 2.0);
 
   this->setStateDuration(WS_SHOOTING, 2.0);
@@ -88 +88 @@
   this->setActionSound(WA_ACTIVATE, "sound/voices/cannon.wav");
 
-  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
+  this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL | WTYPE_HEAVY);
   this->setProjectileType(CL_BOMB);
   this->prepareProjectiles(5);

trunk/src/world_entities/weapons/weapon.h

@@ -60 +60 @@
   WTYPE_DIRECTIONAL   = 0x00000001,           //!< Weapon is directional/Slot is able to carry directional weapons
   WTYPE_TURRET        = 0x00000002,           //!< Weapon is a turret/slot is able to carry turrets
+  WTYPE_LIGHT         = 0x00000004,           //!< For light Armament.
+  WTYPE_HEAVY         = 0x00000008,           //!< The heavy Armament (Cannons).
   WTYPE_ALLKINDS      = 0x0000000f,           //!< Weapon is all types/Slot is able to carry all kinds of weapons
 

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -185 +185 @@
  * @param position the position of the given slot
  */
-void WeaponManager::setSlotPosition(int slot, const Vector& position)
+void WeaponManager::setSlotPosition(int slot, const Vector& position, PNode* parent)
 {
   if (slot < this->slotCount)
+  {
     this->currentSlotConfig[slot].position.setRelCoor(position);
+
+    if (parent != NULL)
+      this->currentSlotConfig[slot].position.setParent(parent);
+  }
 }
 

trunk/src/world_entities/weapons/weapon_manager.h

@@ -62 +62 @@
     unsigned int getSlotCount() const { return this->slotCount; };
     // setting up the WeaponManager with the following functions
-    void setSlotPosition(int slot, const Vector& position);
+    void setSlotPosition(int slot, const Vector& position, PNode* parent = NULL);
     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 */