Changeset 1929 in orxonox.OLD

Timestamp:

Jun 8, 2004, 11:02:09 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: inhibitor added, so it shoots in impulses

Location:

orxonox/trunk/core

Files:

• player.cc (modified) (1 diff)
• shoot_laser.cc (modified) (1 diff)
• shoot_laser.h (modified) (1 diff)
• shoot_rocket.cc (modified) (3 diffs)

orxonox/trunk/core/player.cc

@@ -75 +75 @@
 void Player::shoot(int n) 
 {
-  shootLaser->addShoot(xCor, yCor, zCor);
-  shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
-  shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
-  shootRocket->addBackParable(xCor, yCor, zCor);
-  shootRocket->addSideAcc(xCor, yCor, zCor, RIGHT);
-  shootRocket->addSideAcc(xCor, yCor, zCor, LEFT);
-  shootRocket->addRotater(xCor, yCor, zCor);
+  if (shootLaser->inhibitor++ >=100)
+    {
+      if (shootLaser->inhibitor++ <= 150)
+        shootLaser->addShoot(xCor, yCor, zCor);
+      else if (shootLaser->inhibitor++ >= 250 && shootLaser->inhibitor <= 300)
+        shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
+      else if (shootLaser->inhibitor++ >= 350)
+        shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
+      if (shootLaser->inhibitor >=400)
+        shootLaser->inhibitor =0;
+    }
+  if (shootRocket->inhibitor++ >=80)
+    {
+      shootRocket->addBackParable(xCor, yCor, zCor);
+      shootRocket->addSideAcc(xCor, yCor, zCor, RIGHT);
+      shootRocket->addSideAcc(xCor, yCor, zCor, LEFT);
+      shootRocket->addRotater(xCor, yCor, zCor);
+      if (shootRocket->inhibitor >=90)
+        shootRocket->inhibitor =0;
+    }
   //cout << "Player::shoot" << endl;
 }

orxonox/trunk/core/shoot_laser.cc

@@ -30 +30 @@
   lastShoot = null;
   step = 1.0;
+  inhibitor = 0;
 }
 

orxonox/trunk/core/shoot_laser.h

@@ -30 +30 @@
   ~ShootLaser ();
 
+  int inhibitor;
+
   void drawShoot(void);
   void addShoot(shoot* sh);

orxonox/trunk/core/shoot_rocket.cc

@@ -153 +153 @@
   sh->next = lastShoot;
   lastShoot = sh;
-  inhibitor =0;
-}
+  }
 void ShootRocket::addSideAcc(float x, float y, float z, enum RocketDirection direction)
 {
@@ -173 +172 @@
   sh->next = lastShoot;
   lastShoot = sh;
-  inhibitor =0;
-
-}
+}
+
 void ShootRocket::addRotater(float x, float y, float z)
 {
@@ -191 +189 @@
   sh->next = lastShoot;
   lastShoot = sh;
-  inhibitor =0;
 }