Changeset 1896 in orxonox.OLD for orxonox/trunk/core/player.cc

Timestamp:

May 20, 2004, 1:01:57 AM (20 years ago)

Author:

patrick

Message:

orxonox/trunk: added ability to shoot. so check out the new release and shoot the fuck up

File:

• orxonox/trunk/core/player.cc (modified) (6 diffs)

orxonox/trunk/core/player.cc

@@ -20 +20 @@
 #include <iostream>
 
+
 using namespace std;
 
@@ -25 +26 @@
 Player::Player () {
   xCor = yCor = zCor = 0;
+  shootLaser = new ShootLaser;
 }
 
-
-
-Player::~Player () {}
+Player::~Player () 
+{
+  //delete shootLaser;
+}
 
 
@@ -37 +40 @@
 }
 
-void Player::getPosition(float* x, float* y, float* z) 
+
+void Player::getPosition(float* x, float* y, float* z)
 {
   *x = xCor; *y = yCor; *z = zCor;
@@ -44 +48 @@
 void Player::goX(float x) 
 {
+  //cout << "Player::goX" << endl;
   xCor += x;
 }
@@ -58 +63 @@
 }
 
-void Player::shoot(int n) {
+void Player::shoot(int n) 
+{
+  shootLaser->addShoot(xCor, yCor, zCor);
+  //cout << "Player::shoot" << endl;
 }
 
@@ -67 +75 @@
 void Player::drawPlayer(void) 
 {
-  //cout << "Player::drawPlayer()" << endl;
-  //glColor3f(0.0, 0.9, 0.7);
-  //glRectf(-0.5 + yCor, -0.5 + xCor, 0.5 + yCor, 2.0 + xCor);
-
   glPushMatrix();
+  glTranslatef(xCor, yCor, 3.0);
   glScalef(1.0, 3.0, 1.0);
-  glTranslatef(xCor, yCor, 3.0);
   glutWireCube(1.0);
   glPopMatrix();
+  /* draw all the shoots additionaly */
+  shootLaser->drawShoot();
+  //cout << "Player::drawPlayer" << endl;
+}
 
 
-  //cout << "x: " << xCor << " y: " << yCor << endl;
-}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+