Changeset 10704 in orxonox.OLD for branches/presentation/src/world_entities/weapons

Timestamp:

Jun 15, 2007, 11:12:29 AM (17 years ago)

Author:

rennerc

Message:

FPSSniperRifle uses BspWeapon now

Location:

branches/presentation/src/world_entities/weapons

Files:

• bsp_weapon.cc (modified) (9 diffs)
• bsp_weapon.h (modified) (2 diffs)
• fps_sniper_rifle.cc (modified) (7 diffs)
• fps_sniper_rifle.h (modified) (4 diffs)

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

@@ -31 +31 @@
 *  Standard constructor
 */
-BspWeapon::BspWeapon ()
-{
-        this->init();
+BspWeapon::BspWeapon ( OM_LIST list )
+{
+        this->init( list );
 }
 
@@ -49 +49 @@
 BspWeapon::BspWeapon (const  TiXmlElement* root)
 {
-        this->init();
+        this->init( OM_GROUP_00 );
         if (root != NULL)
         {
@@ -94 +94 @@
 void BspWeapon::tick( float dt )
 {
+  PRINTF(0)("BSPWEAPON TICK: %d %f %f\n", bFire, bRate, dt );
         if (bFire) {
-                if (bRate < 0) {
+                if (bRate <= 0) {
                         bRate += fireRate;
+                        PRINTF(0)("BSPWEAPON SHOOT\n");
                         this->shoot();
                 }
@@ -111 +113 @@
 }
 
-void BspWeapon::init()
-{
-        bRate = 0;
+void BspWeapon::init( OM_LIST list )
+{
+        bRate = 0.0;
         bFire = false;
         range = 1000;
@@ -123 +125 @@
         this->aimingSystem = new AimingSystem( this );
         this->aimingSystem->setParent( this );
-        this->aimingSystem->toList(OM_GROUP_00);
+        this->aimingSystem->toList(list);
         
 }
@@ -157 +159 @@
 
         bool hit = false;
+        
+        PRINTF(0)("groups: %d %d %d %d\n", this->getOMListNumber(), this->aimingSystem->getOMListNumber(), OM_GROUP_01, OM_GROUP_00);
 
         if ( target == NULL )
@@ -170 +174 @@
                                 hit = true;
                                 printf( "HIT %s\n", target->getClassName().c_str() );
+                                target->hit( this->damage, this );
                         }
                         else
@@ -178 +183 @@
         }
 
-        if ( !hit )
-        {
-                //Vector explosionPos = this->getAbsCoor() + this->getAbsDir().apply( Vector( 1, 0, 0 ) )*shortestDist;
-
-                //TODO create explosion at explosionPos
-        }
+        
         
         
@@ -196 +196 @@
     (*it)->draw();
   }
-#if 0
+#if 1
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();

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

@@ -51 +51 @@
                 ObjectListDeclaration(BspWeapon);
         public:
-                BspWeapon ();
+                BspWeapon ( OM_LIST list );
                 BspWeapon (const  TiXmlElement* root);
                 virtual ~BspWeapon();
 
-                void init();
+                void init( OM_LIST list );
                 void loadParams(const TiXmlElement* root);
-                void fire(bool fire){ bFire = fire; }
+                void fire(bool fire){ this->bFire = fire; }
                 virtual void tick(float dt);
                 virtual void draw() const;
 
-
+                void setAlwaysHits( bool r ){ this->alwaysHits = r; }
+                void setDamage( float d ){ this->damage = d; }
         private:
 
@@ -68 +69 @@
                 void setRange( float r ){ this->range = r; }
                 float damage;
-                void setDamage( float d ){ this->damage = d; }
                 float fireRate;
                 void setFireRate( float r ){ this->fireRate = r; }
                 bool alwaysHits;
-                void setAlwaysHits( bool r ){ this->alwaysHits = r; }
                 void addPoint(float x, float y, float z);
                 

branches/presentation/src/world_entities/weapons/fps_sniper_rifle.cc

@@ -27 +27 @@
 #include "weapon_manager.h"
 #include "util/loading/factory.h"
+#include "debug.h"
 
 
@@ -48 +49 @@
    creates a new weapon
 */
-FPSSniperRifle::FPSSniperRifle ( int leftRight)
+FPSSniperRifle::FPSSniperRifle ( int leftRight, OM_LIST list)
   : Weapon()
 {
-  this->init();
+  this->init(list);
 
   this->leftRight = leftRight;
@@ -59 +60 @@
 FPSSniperRifle::FPSSniperRifle(const TiXmlElement* root)
 {
-  this->init();
+  this->init( OM_GROUP_01 );
 
   if (root != NULL)
@@ -76 +77 @@
 
 
-void FPSSniperRifle::init()
+void FPSSniperRifle::init(OM_LIST list)
 {
   this->registerObject(this, FPSSniperRifle::_objectList);
@@ -95 +96 @@
   //this->minCharge = 2;
 
-  this->setActionSound(WA_SHOOT, "sounds/laser.wav");
-  this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
+  //this->setActionSound(WA_SHOOT, "sounds/laser.wav");
+  //this->setActionSound(WA_ACTIVATE, "sounds/voices/lasers.wav");
 
 
   this->setCapability(WTYPE_ALLDIRS | WTYPE_DIRECTIONAL);
-  this->setProjectileTypeC("Laser");
-  this->prepareProjectiles(20);
-
+  //this->setProjectileTypeC("Laser");
+  //this->prepareProjectiles(20);
+  this->toList( list );
+  this->weapon = new BspWeapon( this->getOMListNumber() );
+  this->weapon->setAlwaysHits( true );
+  this->weapon->setDamage( 35 );
+  this->weapon->setParent( this );
+  this->weapon->toList( list );
+    
+  this->bFire = false;
 }
 
@@ -145 +153 @@
 void FPSSniperRifle::fire()
 {
-  Projectile* pj =  this->getProjectile();
-  if (pj == NULL)
-    return;
-
-//   Explosion::explode(this, Vector(0.1,0.1,0.1));
-
-  pj->setParent(this);
-  pj->setParentMode(PNODE_ROTATE_AND_MOVE);
-
-  pj->setVelocity(this->getAbsDir().apply(Vector(1,0,0))*550 + VECTOR_RAND(5) );
-
-  pj->setAbsCoor(this->getEmissionPoint() + this->getAbsDirX() * 25.0f);
-  pj->setAbsDir(this->getAbsDir());
-  pj->activate();
+  PRINTF(0)("sniper fire\n");
+  this->bFire = true;
 }
 
@@ -190 +186 @@
 }
 
-
-
+void FPSSniperRifle::tick( float dt )
+{
+  Weapon::tick( dt );
+  this->weapon->fire( bFire );
+  
+  if ( bFire ){
+      PRINTF(0)("REAL FIRE\n");
+  }
+  bFire = false;
+}
+
+
+

branches/presentation/src/world_entities/weapons/fps_sniper_rifle.h

@@ -25 +25 @@
 
 #include "weapon.h"
+#include "bsp_weapon.h"
 
 
@@ -42 +43 @@
 
   public:
-    FPSSniperRifle (int leftRight);
+    FPSSniperRifle (int leftRight, OM_LIST list);
     FPSSniperRifle (const TiXmlElement* root);
     virtual ~FPSSniperRifle ();
 
-    void init();
+    void init(OM_LIST list);
     virtual void loadParams(const TiXmlElement* root);
 
@@ -55 +56 @@
 
     virtual void draw() const;
+    virtual void tick( float dt );
 
 
@@ -61 +63 @@
     int              leftRight;   //!< this will become an enum
     Material*        material;    //!< material
+    
+    BspWeapon*       weapon;
+    bool             bFire;
 
   };