Changeset 645 for code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.cc

Timestamp:

Dec 19, 2007, 3:05:56 AM (16 years ago)

Author:

rgrieder

Message:

• weapon system up and running

File:

• code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.cc (modified) (5 diffs)

code/branches/FICN/src/orxonox/objects/weapon_system/barrel_gun.cc

@@ -52 +52 @@
     primaryFirePower_ = 100;
     secondaryFirePower_ = 500;
-    primaryFiringRate_ = 10;
-    secondaryFiringRate_ = 2;
-    primaryBulletSpeed_ = 1000;
-    secondaryBulletSpeed_ = 500;
+    primaryFiringRate_ = 1.0/7.0;
+    secondaryFiringRate_ = 1.0/2.0;
+    primaryBulletSpeed_ = 800;
+    secondaryBulletSpeed_ = 300;
     magazineSize_ = 25;
   }
@@ -80 +80 @@
           + StringConverter::toString(bulletCounter_++), "Barrel.mesh");
 
-    Vector3 speed = (temp->getOrientation() * Vector3(0, 0, -1))
+    Vector3 speed = (temp->getOrientation() * Vector3(1, 0, 0))
           .normalisedCopy() * primaryBulletSpeed_;
     speed += getVelocity();
 
-          temp->setScale(Vector3(1, 1, 1) * 4);
+          temp->setScale(Vector3(1, 1, 1) * 2);
           temp->yaw(Degree(-90));
 
@@ -97 +97 @@
 
 
-  void BarrelGun::primaryFiring(unsigned int time)
+  void BarrelGun::primaryFiring(float time)
   {
-    if (time > (unsigned int)1000/primaryFiringRate_)
+    if (time > primaryFiringRate_)
     {
       currentState_ = IDLE;
@@ -122 +122 @@
           + StringConverter::toString(bulletCounter_++), "Barrel.mesh");
 
-    Vector3 speed = (temp->getOrientation() * Vector3(0, 0, -1))
+    Vector3 speed = (temp->getOrientation() * Vector3(1, 0, 0))
           .normalisedCopy() * secondaryBulletSpeed_*0.5;
     speed += getVelocity();
 
-          temp->setScale(Vector3(1, 1, 1) * 10);
+          temp->setScale(Vector3(1, 1, 1) * 4);
           temp->yaw(Degree(-90));
 
@@ -140 +140 @@
 
 
-  void BarrelGun::secondaryFiring(unsigned int time)
+  void BarrelGun::secondaryFiring(float time)
   {
-    if (time > (unsigned int)1000/secondaryFiringRate_)
+    if (time > secondaryFiringRate_)
       currentState_ = IDLE;
   }