Changeset 1957 in orxonox.OLD for orxonox/trunk

Timestamp:

Jun 16, 2004, 9:43:10 AM (20 years ago)

Author:

bensch

Message:

orxonox/truk: now the rockets are frame-rate-driven

Location:

orxonox/trunk/src

Files:

• orxonox.cc (modified) (1 diff)
• player.cc (modified) (2 diffs)
• shoot_rocket.cc (modified) (5 diffs)
• shoot_rocket.h (modified) (1 diff)

orxonox/trunk/src/orxonox.cc

@@ -138 +138 @@
   io->setPlayerStep(19.2/fps); /* set player to propper speed */
   localPlayer->shootLaser->setShootStep(20.0/fps); /* set shoot speed */
+  localPlayer->shootRocket->setShootStep(20.0/fps); /* set shoot speed */
   world->setWorldStep(7.0/fps); /* set the speed of the terrain moving away */
   fps = 0;

orxonox/trunk/src/player.cc

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

orxonox/trunk/src/shoot_rocket.cc

@@ -49 +49 @@
       glPushMatrix(); 
       glTranslatef(tmpShoot->xCor, tmpShoot->yCor, tmpShoot->zCor);
+      tmpShoot->age+=step;
       switch (tmpShoot->type)
         {
@@ -89 +90 @@
       /* fix2: conditions, that a struct tree can be cut off */
       /* fix3: more efficent and nicer please */
-      if (tmpShoot->yCor - DataTank::yOffset > 20) 
+      if (tmpShoot->age > tmpShoot->lifetime) 
         {
           /* normal case: delete one element, link the others */
@@ -151 +152 @@
   sh->zVel = (1-(float)rand() / 1000000000/step)/5;
   sh->xAcc = 0; sh->yAcc = .01/step; sh->zAcc = 0;
+  sh->age=0;
+  sh->lifetime=5; 
   sh->next = lastShoot;
   lastShoot = sh;
@@ -170 +173 @@
     }
   sh->xAcc = .9; sh->yAcc = .02; sh->zAcc = 0;
+  sh->age=0;
+  sh->lifetime=10; 
   sh->next = lastShoot;
   lastShoot = sh;
@@ -183 +188 @@
   sh->type = ROTATER;
   sh->xCor = x+radius*sin(rotateAngle); sh->yCor = y; sh->zCor = z+radius*cos(rotateAngle);
-  sh->xVel = .1*cos(rotateAngle)/step;
-  sh->yVel = 0.4/step;
-  sh->zVel = .1*sin(rotateAngle)/step;
-  sh->xAcc = 1.01; sh->yAcc = 1.01/step; sh->zAcc = 1.01;
+  sh->xVel = 1*cos(rotateAngle)*step;
+  sh->yVel = 4*step;
+  sh->zVel = 1*sin(rotateAngle)*step;
+  sh->xAcc = 1.01; sh->yAcc = 1- step; sh->zAcc = 1.01;
+  sh->age=0;
+  sh->lifetime=10; 
   sh->next = lastShoot;
   lastShoot = sh;

orxonox/trunk/src/shoot_rocket.h

@@ -33 +33 @@
     float zAcc;
     float age;
+    float lifetime;
     float collisionRadius;
   };