Changeset 6153 for code/branches/presentation2

Timestamp:

Nov 25, 2009, 6:04:10 PM (15 years ago)

Author:

scheusso

Message:

some fixes in weapon system / weapons
fabian: projectiles also spawn on wrong position in standalone mode

Location:

code/branches/presentation2

Files:

• data/gui/scripts/InitialiseGUI.lua (modified) (1 diff)
• src/modules/weapons/weaponmodes/LightningGun.cc (modified) (1 diff)
• src/modules/weapons/weaponmodes/RocketFire.cc (modified) (2 diffs)
• src/orxonox/weaponsystem/WeaponMode.cc (modified) (1 diff)

code/branches/presentation2/data/gui/scripts/InitialiseGUI.lua

@@ -187 +187 @@
         local child
         while root:getChildCount()~=0 do
-            debug(root:getChildCount())
             child = root:getChildAtIdx(0)
             root:removeChildWindow(child)

code/branches/presentation2/src/modules/weapons/weaponmodes/LightningGun.cc

@@ -59 +59 @@
         projectile->setMaterial("Flares/LightningBall_");
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         projectile->setOrientation(this->getMuzzleOrientation());
         projectile->setPosition(this->getMuzzlePosition());

code/branches/presentation2/src/modules/weapons/weaponmodes/RocketFire.cc

@@ -36 +36 @@
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
+#include "worldentities/pawns/Pawn.h"
 
 namespace orxonox
@@ -57 +58 @@
         Rocket* rocket = new Rocket(this);
 
+        this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
         rocket->setOrientation(this->getMuzzleOrientation());
         rocket->setPosition(this->getMuzzlePosition());

code/branches/presentation2/src/orxonox/weaponsystem/WeaponMode.cc

@@ -205 +205 @@
             this->muzzlePosition_ = this->weapon_->getWorldPosition() + this->weapon_->getWorldOrientation() * this->muzzleOffset_;
 
-            Pawn* pawn = this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn();
             Vector3 muzzleDirection;
             muzzleDirection = target - this->muzzlePosition_;