Changeset 1919 in orxonox.OLD

Timestamp:

Jun 7, 2004, 11:14:21 PM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: gc modified, player moves with world, collision detection works

Location:

orxonox/trunk/core

Files:

• data_tank.cc (modified) (1 diff)
• data_tank.h (modified) (1 diff)
• shoot_laser.cc (modified) (1 diff)
• world.cc (modified) (3 diffs)

orxonox/trunk/core/data_tank.cc

@@ -19 +19 @@
 using namespace std;
 
+float DataTank::xOffset = 0;
+float DataTank::yOffset = 0;
+float DataTank::zOffset = 0;
 
 DataTank::DataTank () {}
-
-
-
 DataTank::~DataTank () {}
 

orxonox/trunk/core/data_tank.h

@@ -10 +10 @@
   ~DataTank ();
 
+  static float xOffset;
+  static float yOffset;
+  static float zOffset;
+
 };
 

orxonox/trunk/core/shoot_laser.cc

@@ -57 +57 @@
       /* fix2: conditions, that a struct tree can be cut off */
       /* fix3: more efficent and nicer please */
-      if (tmpShoot->yCor > 20) 
+      if (tmpShoot->yCor - DataTank::yOffset > 20) 
         {
           /* normal case: delete one element, link the others */

orxonox/trunk/core/world.cc

@@ -150 +150 @@
 {
   glLoadIdentity();
-  gluLookAt(0.0, -14.0 + primitiveMove, 15.0, 0.0, 0.0 + primitiveMove, 0.0, 0.0, 1.0, 0.0);
+  gluLookAt(0.0, -14.0 + DataTank::yOffset, 15.0, 0.0, 0.0 + DataTank::yOffset, 0.0, 0.0, 1.0, 0.0);
   /* first draw all players */
   playerList* tmpPlayer = lastPlayer;
@@ -167 +167 @@
     }
 
-
-  //glPushMatrix();
-  //glTranslatef(0.0, -primitiveMove, 0.0);
 
   /* now draw the rest of the world: environement */
@@ -206 +203 @@
   glEnd();
 
-
-  primitiveMove+=0.07;
+  //primitiveMove+=0.07;
+  DataTank::yOffset += 0.07;
+
+  tmpPlayer = lastPlayer;
+  while( tmpPlayer != null ) 
+    {
+      tmpPlayer->player->yCor += 0.07;
+      tmpPlayer = tmpPlayer->next;
+    }
+
+  
 }