Changeset 10690 in orxonox.OLD for branches/adm/src/world_entities

Timestamp:

Jun 13, 2007, 7:54:24 PM (18 years ago)

Author:

retolu

Message:

implementing gunFire and its Nodes(XML)

Location:

branches/adm/src/world_entities

Files:

• npcs/adm_turret.cc (modified) (1 diff)
• weapons/bsp_weapon.cc (modified) (3 diffs)
• weapons/bsp_weapon.h (modified) (2 diffs)

branches/adm/src/world_entities/npcs/adm_turret.cc

@@ -243 +243 @@
 
         this->weapon = new BspWeapon();
+        this->weapon->loadParams(root);
         this->weapon->setParent( this->cannons );
         this->weapon->toList( getOMListNumber() );

branches/adm/src/world_entities/weapons/bsp_weapon.cc

@@ -67 +67 @@
                         .describe("Damage that the weapon inflicts"); 
                 LoadParam(root, "FireRate", this, BspWeapon, setFireRate)
-                        .describe("how fast it shoots");
+                        .describe("how fast it shoots");
                 LoadParam(root, "AlwaysHits", this, BspWeapon, setAlwaysHits)
-                        .describe("No, if the weapon should hit with a probability");
-        }
-}
-
-        
+                        .describe("No, if the weapon should hit with a probability");
+
+                LOAD_PARAM_START_CYCLE(root, element);
+                {
+                        LoadParam_CYCLE(element, "addPoint", this, BspWeapon, addPoint)
+                        .describe("Adds a new Point for Gunfire");
+                }
+                LOAD_PARAM_END_CYCLE(element);
+        }
+}
+
+void BspWeapon::addPoint(float x, float y, float z)
+{
+        if (element == 1 ){
+                gunFire1->setRelCoor(Vector(x,y,z));
+                element++;
+        }
+        if (element == 2 ){
+                gunFire2->setRelCoor(Vector(x,y,z));
+        }
+}
 
 void BspWeapon::tick( float dt )
@@ -101 +117 @@
         fireRate = 0.5;
         alwaysHits = true;
+        element=1;
 
         this->registerObject(this, BspWeapon::_objectList);
@@ -110 +127 @@
 void BspWeapon::shoot()
 {
+        gunFire.explode(gunFire1,Vector(2,2,2));
+        gunFire.explode(gunFire2,Vector(2,2,2));
         std::list<WorldEntity*>::iterator entityIterator;
         // for all bsp managers check all entities

branches/adm/src/world_entities/weapons/bsp_weapon.h

@@ -9 +9 @@
 #include "world_entity.h"
 #include "aiming_system.h"
+#include "effects/explosion.h"
 
 class BspWeapon : public WorldEntity
@@ -36 +37 @@
                 bool alwaysHits;
                 void setAlwaysHits( bool r ){ this->alwaysHits = r; }
+                void addPoint(float x, float y, float z);
+                PNode* gunFire1;
+                PNode* gunFire2;
 
                 float bRate;
                 bool bFire;
+                int element;
+
+                Explosion gunFire;
 
                 AimingSystem* aimingSystem;