Changeset 9526 for code/trunk/src/modules/weapons

Timestamp:

Feb 19, 2013, 10:25:42 AM (12 years ago)

Author:

jo

Message:

Merging presentationHS12 back to the trunk.

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/modules/weapons/weaponmodes/HsW01.cc (modified) (3 diffs)
• src/modules/weapons/weaponmodes/HsW01.h (modified) (2 diffs)

code/trunk/src/modules/weapons/weaponmodes/HsW01.cc

@@ -61 +61 @@
         this->delay_ = 0.0f;
         this->setMunitionName("LaserMunition");
+        this->mesh_ = "laserbeam.mesh";
+        this->sound_ = "sounds/Weapon_HsW01.ogg";
+
 
         this->delayTimer_.setTimer(1.0f, false, createExecutor(createFunctor(&HsW01::shot, this)));
         this->delayTimer_.stopTimer();
 
-        this->setDefaultSound("sounds/Weapon_HsW01.ogg");
+        this->setDefaultSound(this->sound_);
     }
 
@@ -78 +81 @@
         XMLPortParam(HsW01, "delay", setDelay, getDelay, xmlelement, mode);
         XMLPortParam(HsW01, "material", setMaterial, getMaterial, xmlelement, mode);
+        XMLPortParam(HsW01, "projectileMesh", setMesh, getMesh, xmlelement, mode);
+        XMLPortParam(HsW01, "sound", setSound, getSound, xmlelement, mode);
     }
 
@@ -108 +113 @@
         Projectile* projectile = new Projectile(this);
         Model* model = new Model(projectile);
-        model->setMeshSource("laserbeam.mesh");
+        model->setMeshSource(mesh_);
         model->setCastShadows(false);
         projectile->attach(model);

code/trunk/src/modules/weapons/weaponmodes/HsW01.h

@@ -61 +61 @@
         private:
             /**
+            @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 mesh 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.
@@ -85 +113 @@
 
             std::string material_; //!< The material.
+            std::string mesh_; //!< The mesh.
+            std::string sound_; //!< The sound.
+
+
+
             float speed_; //!< The speed of the fired projectile.
             float delay_; //!< The firing delay.