Changeset 12281 for code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGun.cc

Timestamp:

Apr 4, 2019, 4:37:19 PM (6 years ago)

Author:

pomselj

Message:

weapon stuff

File:

• code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGun.cc (modified) (5 diffs)

code/branches/OrxoBlox_FS19/src/modules/OrxoBlox/BallGun/BallGun.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Fabien Vultier
+ *      Hagen Seifert
  *   Co-authors:
- *      ...
+ *      simonmie
  *
  */
 
 /**
-    @file IceGun.cc
-    @brief Implementation of the IceGun class.
+    @file HsW01.h
+    @brief Implementation of the HsW01 class.
 */
 
@@ -35 +35 @@
 
 #include "core/CoreIncludes.h"
-#include "core/XMLPort.h"    
+#include "core/XMLPort.h"
+#include "core/command/Executor.h"
+
+#include "graphics/Model.h"
 #include "weaponsystem/Weapon.h"
 #include "weaponsystem/WeaponPack.h"
 #include "weaponsystem/WeaponSystem.h"
+#include "worldentities/WorldEntity.h"
 #include "worldentities/pawns/Pawn.h"
 
-#include "BallProjectile.h"
+#include "weapons/projectiles/Projectile.h"
+#include "weapons/MuzzleFlash.h"
 
 namespace orxonox
@@ -51 +56 @@
         RegisterObject(BallGun);
 
-        // Default values
-        this->reloadTime_ = 1.0f;
-        this->damage_ = 0.0f;
-        this->speed_ = 1200.0f;
+        this->reloadTime_ = 0.25f;
+        this->damage_ = 0.0f; //default 15
+        this->speed_ = 750.0f;
+        this->delay_ = 0.0f;
+        this->setMunitionName("BallMunition");
+        this->mesh_ = "laserbeam.mesh";
 
 
-        this->setMunitionName("BallMunition");
-        this->setFireSound("sounds/Weapon_LightningGun.ogg");
-        this->setReloadSound("sounds/Reload_IceGun.ogg", 0.4);
+        this->delayTimer_.setTimer(this->delay_, false, createExecutor(createFunctor(&BallGun::shot, this)));
+        this->delayTimer_.stopTimer();
 
-        hudImageString_ = "Orxonox/WSHUD_WM_IceGun";
+        this->setFireSound("sounds/Weapon_HsW01.ogg");
+        this->setReloadSound("sounds/Reload_HsW01.ogg", 0.5);
+
+        hudImageString_ = "Orxonox/WSHUD_WM_HsW01";
     }
 
@@ -68 +77 @@
     }
 
+    void BallGun::XMLPort(Element& xmlelement, XMLPort::Mode mode)
+    {
+        SUPER(BallGun, XMLPort, xmlelement, mode);
+
+        XMLPortParam(BallGun, "delay", setDelay, getDelay, xmlelement, mode);
+        XMLPortParam(BallGun, "material", setMaterial, getMaterial, xmlelement, mode);
+        XMLPortParam(BallGun, "projectileMesh", setMesh, getMesh, xmlelement, mode);
+        XMLPortParam(BallGun, "sound", setSound, getSound, xmlelement, mode);
+    }
+
+    /**
+    @brief
+        Set the firing delay.
+    @param delay
+        The firing delay in seconds.
+    */
+    void BallGun::setDelay(float delay)
+    {
+        orxout() << "delay" << endl;
+        this->delay_ = delay;
+        this->delayTimer_.setInterval(this->delay_);
+    }
+
+    void BallGun::fire()
+    {
+        orxout() << "fire" << endl;
+        this->delayTimer_.startTimer();
+    }
+
     /**
     @brief
         Fires the weapon. Creates a projectile and fires it.
     */
-    void BallGun::fire()
+    void BallGun::shot()
     {
-        BallProjectile* projectile = new BallProjectile(this->getContext());
+        assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
+        orxout() << "sajkfg" << endl;
+        // Create the projectile.
+        Projectile* projectile = new Projectile(this->getContext());
+        Model* model = new Model(projectile->getContext());
+        model->setMeshSource(mesh_);
+        model->setCastShadows(false);
+        projectile->attach(model);
+        model->setScale(5);
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
@@ -85 +131 @@
         projectile->setShieldDamage(this->getShieldDamage());
         projectile->setHealthDamage(this->getHealthDamage());
+
+        // Display the muzzle flash.
+        this->BallGun::muzzleflash();
+    }
+
+    /**
+    @brief
+        Displays the muzzle flash.
+    */
+    void BallGun::muzzleflash()
+    {
+        MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext());
+        this->getWeapon()->attach(muzzleFlash);
+        muzzleFlash->setPosition(this->getMuzzleOffset());
+        muzzleFlash->setMaterial(this->material_);
     }
 }