Changeset 12273 for code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes

Timestamp:

Apr 4, 2019, 3:51:04 PM (6 years ago)

Author:

cwaupoti

Message:

comment

Location:

code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes

Files:

• CMakeLists.txt (modified) (1 diff)
• HoverGun.cc (modified) (7 diffs)
• HoverGun.h (modified) (4 diffs)

code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/CMakeLists.txt

@@ -5 +5 @@
   HsW01.cc
   LightningGun.cc
+  HoverGun.cc
   SplitGun.cc
   IceGun.cc

code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/HoverGun.cc

@@ -21 +21 @@
  *
  *   Author:
- *      Hagen Seifert
+ *      Joel Smely
  *   Co-authors:
  *      simonmie
@@ -28 +28 @@
 
 /**
-    @file HsW01.h
-    @brief Implementation of the HsW01 class.
+    @file HoverGun.h
+    @brief Implementation of the HoverGun class.
 */
 
@@ -35 +35 @@
 
 #include "core/CoreIncludes.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 "weapons/projectiles/HoverGunProjectile.h"
-#include "weapons/MuzzleFlash.h"
 
 namespace orxonox
@@ -56 +50 @@
         RegisterObject(HoverGun);
 
-        this->reloadTime_ = 0.25f;
-        this->damage_ = 0.0f; //default 15
+        this->reloadTime_ = 1.0f;
+        this->damage_ = 0.0f;
         this->speed_ = 750.0f;
-        this->delay_ = 0.0f;
-        this->setMunitionName("LaserMunition");
-        this->mesh_ = "laserbeam.mesh";
 
+        this->setMunitionName("HoverMunition");
+        this->setFireSound("sounds/Weapon_HoverGun.ogg");
 
-        this->delayTimer_.setTimer(this->delay_, false, createExecutor(createFunctor(&HoverGun::shot, this)));
-        this->delayTimer_.stopTimer();
-
-        this->setFireSound("sounds/Weapon_HsW01.ogg");
-        this->setReloadSound("sounds/Reload_HsW01.ogg", 0.5);
-
-        hudImageString_ = "Orxonox/WSHUD_WM_HsW01";
+        hudImageString_ = "Orxonox/WSHUD_WM_HoverGun";
     }
 
@@ -76 +63 @@
     {
     }
-
-    void HoverGun::XMLPort(Element& xmlelement, XMLPort::Mode mode)
-    {
-        SUPER(HoverGun, XMLPort, xmlelement, mode);
-
-        XMLPortParam(HoverGun, "delay", setDelay, getDelay, xmlelement, mode);
-        XMLPortParam(HoverGun, "material", setMaterial, getMaterial, xmlelement, mode);
-        XMLPortParam(HoverGun, "projectileMesh", setMesh, getMesh, xmlelement, mode);
-        XMLPortParam(HoverGun, "sound", setSound, getSound, xmlelement, mode);
-    }
-
-    /**
-    @brief
-        Set the firing delay.
-    @param delay
-        The firing delay in seconds.
-    */
-    void HoverGun::setDelay(float delay)
-    {
-        this->delay_ = delay;
-        this->delayTimer_.setInterval(this->delay_);
-    }
-
-    // void HoverGun::fire()
-    // {
-    //     this->delayTimer_.startTimer();
-    // }
 
     /**
@@ -110 +70 @@
     void HoverGun::fire()
     {
-        assert( this->getWeapon() && this->getWeapon()->getWeaponPack() && this->getWeapon()->getWeaponPack()->getWeaponSystem() && this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn() );
-
-        // Create the projectile.
         HoverGunProjectile* projectile = new HoverGunProjectile(this->getContext());
-        Model* model = new Model(HoverGunprojectile->getContext());
-        model->setMeshSource(mesh_);
-        model->setCastShadows(false);
-        projectile->attach(model);
-        model->setScale(5);
+        projectile->setMaterial("Flares/HoverBall_");
 
         this->computeMuzzleParameters(this->getWeapon()->getWeaponPack()->getWeaponSystem()->getPawn()->getAimPosition());
@@ -129 +82 @@
         projectile->setShieldDamage(this->getShieldDamage());
         projectile->setHealthDamage(this->getHealthDamage());
-
-        // Display the muzzle flash.
-        // this->HoverGun::muzzleflash();
     }
-
-    /**
-    @brief
-        Displays the muzzle flash.
-    */
-    // void HoverGun::muzzleflash()
-    // {
-    //     MuzzleFlash *muzzleFlash = new MuzzleFlash(this->getContext());
-    //     this->getWeapon()->attach(muzzleFlash);
-    //     muzzleFlash->setPosition(this->getMuzzleOffset());
-    //     muzzleFlash->setMaterial(this->material_);
-    // }
 }

code/branches/Boxhead_FS19/src/modules/weapons/weaponmodes/HoverGun.h

@@ -21 +21 @@
  *
  *   Author:
- *      Hagen Seifert
+ *      Joel Smely
  *   Co-authors:
  *      ...
@@ -36 +36 @@
 
 #include "weapons/WeaponsPrereqs.h"
-
-#include "tools/Timer.h"
 #include "weaponsystem/WeaponMode.h"
 
@@ -45 +43 @@
     /**
     @brief
-        Shoots laser beams.
+        A slow ball of lightning.
     @author
-        Hagen Seifert
+        Joel Smely
     @ingroup WeaponsWeaponModes
     */
@@ -57 +55 @@
 
             virtual void fire() override;
-            virtual void XMLPort(Element& xmlelement, XMLPort::Mode mode) override;
 
-        protected:
-            /**
-            @brief Set the mesh.
-            @param mesh The mesh name.
-            */
-            void setMesh(const std::string& mesh)
-                { this->mesh_ = mesh; }
-
-            /**
-            @brief Get the mesh.
-            @return Returns the mesh name.
-            */
-            const std::string& getMesh() const
-                { return this->mesh_; }
-
-            /**
-            @brief Set the sound.
-            @param sound The Sound name.
-            */
-            void setSound(const std::string& sound)
-                { this->sound_ = sound; }
-
-            /**
-            @brief Get the sound.
-            @return Returns the sound name.
-            */
-            const std::string& getSound() const
-                { return this->sound_; }
-
-            /**
-            @brief Set the material.
-            @param material The material name.
-            */
-            void setMaterial(const std::string& material)
-                { this->material_ = material; }
-            /**
-            @brief Get the material.
-            @return Returns the material name.
-            */
-            const std::string& getMaterial() const
-                { return this->material_; }
-
-            void setDelay(float delay);
-            /**
-            @brief Get the firing delay.
-            @return Returns the firing delay in seconds.
-            */
-            float getDelay() const
-                { return this->delay_; }
-
-            virtual void shot();
-            void muzzleflash();
-
-            std::string material_; //!< The material.
-            std::string mesh_; //!< The mesh.
-            std::string sound_; //!< The sound.
-
-
-
+       private:
             float speed_; //!< The speed of the fired projectile.
-            float delay_; //!< The firing delay.
-            Timer delayTimer_; //!< A timer to delay the firing.
     };
 }
 
-#endif /* HoverGun */
+#endif /* _HoverGun_H__ */