Changeset 1900 in orxonox.OLD for orxonox/trunk/core/shoot_laser.cc

Timestamp:

May 23, 2004, 11:21:38 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: hardware independant game speed, more shoots, more speed - see mail

File:

• orxonox/trunk/core/shoot_laser.cc (modified) (4 diffs)

orxonox/trunk/core/shoot_laser.cc

@@ -29 +29 @@
 {
   lastShoot = null;
+  step = 1.0;
 }
 
@@ -46 +47 @@
       glPushMatrix(); 
       glTranslatef(tmpShoot->xCor, tmpShoot->yCor, tmpShoot->zCor);
+      tmpShoot->xCor+=tmpShoot->xInc;
       tmpShoot->yCor+=tmpShoot->yInc;
       glScalef(0.1, 0.1, 0.1);
@@ -55 +57 @@
       /* fix2: conditions, that a struct tree can be cut off */
       /* fix3: more efficent and nicer please */
-      if (tmpShoot->yCor > 50) 
+      if (tmpShoot->yCor > 20) 
         {
+          /* normal case: delete one element, link the others */
           if (lastRef != null) 
             {
-              cout << "garbage collection" << endl;
+              //cout << "garbage collection" << endl;
               lastRef->next = tmpShoot->next;
               delete tmpShoot;
-              tmpShoot = lastRef;         
-              lastRef = tmpShoot;
-              tmpShoot = tmpShoot->next;
-              cout << "garbage collection left" << endl;
+              tmpShoot = lastRef->next;
+              //cout << "garbage collection left" << endl;
             }
           else
             {
-              cout << "garbage collecton on last el" << endl;
+              /* special case: first element to be processed */
+              //cout << "garbage collecton: first el in queue" << endl;
               lastRef = tmpShoot->next;
               delete tmpShoot;
               tmpShoot = lastRef;
-              if (tmpShoot != null) {
-                lastRef = tmpShoot;
-                tmpShoot = tmpShoot->next;
-                cout << "noch nich null" << endl;
-              }
-              else {
-                lastRef = null;
-                tmpShoot = null;
-                lastShoot = null;
-                cout << "endl null" << endl;
-              }
-              cout << "garbage collection on last el left" << endl;
+              lastShoot = tmpShoot;
+              if (tmpShoot != null) 
+                {
+                  tmpShoot = tmpShoot->next;
+                  //cout << "noch nich null" << endl;
+                }
+              else 
+                {
+                  lastRef = null;
+                  tmpShoot = null;
+                  lastShoot = null;
+                  //cout << "endl null" << endl;
+                }
+              
+              //cout << "garbage collection: firtst el in queue left" << endl;
             }
         }
@@ -108 +113 @@
   shoot* sh = new shoot;
   sh->xCor = x; sh->yCor = y; sh->zCor = z;
-  sh->xInc = 0; sh->yInc = .2; sh->zInc = 0;
+  sh->xInc = 0; sh->yInc = .4/step; sh->zInc = 0;
   sh->next = lastShoot;
   lastShoot = sh;
 }
 
+void ShootLaser::addShootExt(float x, float y, float z, 
+                             float xInc, float yInc, float zInc)
+{
+  //cout << "ShootLaser::addShootExtended" << endl;
+  shoot* sh = new shoot;
+  sh->xCor = x; sh->yCor = y; sh->zCor = z;
+  sh->xInc = xInc/step; sh->yInc = yInc/step; sh->zInc = zInc/step;
+  sh->next = lastShoot;
+  lastShoot = sh;
+}
+
+void ShootLaser::setShootStep(float step) 
+{
+  cout << "ShootLaser::setShootStep to " << step << endl;
+  this->step = step;
+}
+
+
+/* Exterminate shoot from game, implement this method  */
+/* if you like to add animatiion */
+void ShootLaser::removeShoot(shoot* sh)
+{
+  glPushMatrix(); 
+  glTranslatef(sh->xCor, sh->yCor, sh->zCor);
+  glutWireCube(1.0);
+  glPopMatrix();
+}