Changeset 4885 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/test_gun.cc

Timestamp:

Jul 18, 2005, 3:36:18 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the weaponSystem back to the trunk, because it seems safe
merged with command:
svn merge -r 4847:HEAD branches/weaponSystem/ trunk/
conflict in file src/world-entities/weapons/weapon.h resolved in favor of the weaponSystem

File:

• orxonox/trunk/src/world_entities/weapons/test_gun.cc (modified) (5 diffs)

orxonox/trunk/src/world_entities/weapons/test_gun.cc

@@ -50 +50 @@
 
   this->model = (Model*)ResourceManager::getInstance()->load("models/test_gun.obj", OBJ, RP_CAMPAIGN);
-  this->idleTime = 0.2f;
   this->leftRight = leftRight;
 
@@ -92 +91 @@
       this->animation3->addKeyFrame(Vector(-2.6, 0.1, -2.0), Quaternion(), 0.1, ANIM_LINEAR, ANIM_CONSTANT);
     }
-
+/*
   this->fireSound = (SoundBuffer*)ResourceManager::getInstance()->load("sound/shot1.wav", WAV);
   this->weaponSource = new SoundSource(this->fireSound, this);
-  this->weaponSource->setRolloffFactor(.1);
+  this->weaponSource->setRolloffFactor(.1);*/
   Projectile* p = new TestBullet(this);
-//  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
+
+  //  ObjectManager::getInstance()->cache(CL_TEST_BULLET, 100, p);
   //ObjectManager::getInstance()->debug();
+
+  this->setStateDuration(WS_SHOOTING, .2);
+
+  this->energy = 100;
+  this->minCharge = 2;
+
+  this->setActionSound(WA_SHOOT, "sound/shot1.wav");
 }
 
@@ -145 +152 @@
 void TestGun::fire()
 {
-  if( !this->hasWeaponIdleTimeElapsed())
-    {
-      this->weaponIdle();
-      return;
-    }
-
-    Projectile* pj =  new TestBullet(this);//dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
-  weaponSource->play();
+  this->energyLoaded -= this->minCharge;
+  Projectile* pj =  new TestBullet(this);//dynamic_cast<Projectile*>(ObjectManager::getInstance()->getFromDeadList(CL_TEST_BULLET & CL_MASK_LOWLEVEL_CLASS));
+//  weaponSource->play();
 
   pj->setAbsCoor(this->getAbsCoor() + this->projectileOffset);
@@ -158 +160 @@
   pj->setVelocity(this->getVelocity());
   State::getWorldEntityList()->add(pj);
-  this->localTime = 0;
 
   this->animation1->replay();
@@ -184 +185 @@
 void TestGun::destroy ()
 {}
-
-
-/**
- *  tick signal for time dependent/driven stuff
-*/
-void TestGun::tick (float time)
-{
-  this->localTime += time;
-}