Changeset 1920 in orxonox.OLD for orxonox

Timestamp:

Jun 8, 2004, 1:47:33 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: rockets added (in 3D)

Location:

orxonox/trunk/core

Files:

• Makefile (modified) (4 diffs)
• player.cc (modified) (4 diffs)
• player.h (modified) (2 diffs)
• shoot_laser.cc (modified) (3 diffs)
• shoot_laser.h (modified) (2 diffs)
• shoot_rocket.cc (added)
• shoot_rocket.h (added)
• world.h (modified) (1 diff)

orxonox/trunk/core/Makefile

@@ -29 +29 @@
         orxonox.h \
         data_core.h
-        
+
 SOURCES = \
         orxonox.cc \
@@ -43 +43 @@
         environment.o \
         shoot_laser.o \
+        shoot_rocket.o \
         ai.o
 
@@ -75 +76 @@
         @echo ""
         @echo "For further info see the README file"
-        
+
 clean:
         rm -rf *.o *~ orxonox
@@ -87 +88 @@
 #data_tank.o: data_tank.cc \
 #               data_tank.h     
-        
+
 #EOF

orxonox/trunk/core/player.cc

@@ -19 +19 @@
 #include "player.h"
 #include <iostream>
+#include <stdlib.h>
 
 
@@ -28 +29 @@
   xCor = yCor = zCor = 0;
   shootLaser = new ShootLaser;
+  shootRocket = new ShootRocket;
 }
 
@@ -76 +78 @@
   shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
   shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
+  shootRocket->addShoot(xCor, yCor, zCor);
   //cout << "Player::shoot" << endl;
 }
@@ -92 +95 @@
   /* draw all the shoots additionaly */
   shootLaser->drawShoot();
+  shootRocket->drawShoot();
   //cout << "Player::drawPlayer" << endl;
 }

orxonox/trunk/core/player.h

@@ -7 +7 @@
 
 #include "shoot_laser.h"
+#include "shoot_rocket.h"
 #include "data_tank.h"
 
@@ -24 +25 @@
   /* this player wanna shoot? so include a ref to ShootLaser */
   ShootLaser* shootLaser;
+  ShootRocket* shootRocket;
 
   void setPosition(float x, float y, float z);

orxonox/trunk/core/shoot_laser.cc

@@ -47 +47 @@
       glPushMatrix(); 
       glTranslatef(tmpShoot->xCor, tmpShoot->yCor, tmpShoot->zCor);
-      tmpShoot->xCor+=tmpShoot->xInc;
-      tmpShoot->yCor+=tmpShoot->yInc;
+      tmpShoot->xCor+=tmpShoot->xVel;
+      tmpShoot->yCor+=tmpShoot->yVel;
       glScalef(0.1, 0.1, 0.1);
       glutWireCube(1.0);
@@ -113 +113 @@
   shoot* sh = new shoot;
   sh->xCor = x; sh->yCor = y; sh->zCor = z;
-  sh->xInc = 0; sh->yInc = .4/step; sh->zInc = 0;
+  sh->xVel = 0; sh->yVel = .4/step; sh->zVel = 0;
   sh->next = lastShoot;
   lastShoot = sh;
@@ -119 +119 @@
 
 void ShootLaser::addShootExt(float x, float y, float z, 
-                             float xInc, float yInc, float zInc)
+                             float xVel, float yVel, float zVel)
 {
   //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->xVel = xVel/step; sh->yVel = yVel/step; sh->zVel = zVel/step;
   sh->next = lastShoot;
   lastShoot = sh;

orxonox/trunk/core/shoot_laser.h

@@ -20 +20 @@
     float yCor;
     float zCor;    
-    float xInc;
-    float yInc;
-    float zInc;
+    float xVel;
+    float yVel;
+    float zVel;
     float collisionRadius;
   };
@@ -33 +33 @@
   void addShoot(shoot* sh);
   void addShoot(float x, float y, float z);
-  void addShootExt(float x, float y, float z, float xInc, float yInc, float zInc);
+  void addShootExt(float x, float y, float z, float xVel, float yVel, float zVel);
   void setShootStep(float step);
   void removeShoot(shoot* sh);

orxonox/trunk/core/world.h

@@ -12 +12 @@
 #include "environment.h"
 #include "shoot_laser.h"
+#include "shoot_rocket.h"
 #include "stdincl.h"
 #include "data_tank.h"