Changeset 2036 in orxonox.OLD for orxonox/trunk/src/player.cc

Timestamp:

Jun 27, 2004, 7:48:44 PM (21 years ago)

Author:

patrick

Message:

orxonxo/trunk/src: extended framework: class inheritance, right including (had som bugs), framework not finished yet

File:

• orxonox/trunk/src/player.cc (modified) (5 diffs)

orxonox/trunk/src/player.cc

@@ -16 +16 @@
 */
 
+#include <iostream>
+#include <stdlib.h>
+#include <GL/glut.h>
+
+#include "shoot_laser.h"
+#include "shoot_rocket.h"
+#include "data_tank.h"
 
 #include "player.h"
-#include <iostream>
-#include <stdlib.h>
-
 
 using namespace std;
 
 
-Player::Player () {
-  // cout << "Player::Player" << endl;
+Player::Player() 
+   : WorldEntity() {
+  //cout << "Player::Player" << endl;
   xCor = yCor = zCor = 0;
   shootLaser = new ShootLaser;
@@ -58 +63 @@
 void Player::goX(float x) 
 {
-  //cout << "Player::goX" << endl;
   xCor += x;
 }
@@ -73 +77 @@
 }
 
+
+
 void Player::shoot(int n) 
 {
+
   //  if (shootLaser->inhibitor++ <= 100)
-    shootLaser->addShoot(xCor, yCor, zCor);
-    // else if (shootLaser->inhibitor++ <= 200)
-    shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
-    //  else if (shootLaser->inhibitor++ <= 300)
-    shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
-    //  else
-    shootLaser->inhibitor =0;
+  shootLaser->addShoot(xCor, yCor, zCor);
+  // else if (shootLaser->inhibitor++ <= 200)
+  shootLaser->addShootExt(xCor, yCor, zCor, .1, .4, .0);
+  //  else if (shootLaser->inhibitor++ <= 300)
+  shootLaser->addShootExt(xCor, yCor, zCor, -0.1, .4, .0);
+  //  else
+  shootLaser->inhibitor =0;
   
-    //  if (shootRocket->inhibitor++ >=80)
-    {
-      shootRocket->addBackParable(xCor, yCor, zCor);
-      shootRocket->addSideAcc(xCor, yCor, zCor, RIGHT);
-      shootRocket->addSideAcc(xCor, yCor, zCor, LEFT);
-      shootRocket->addRotater(xCor, yCor, zCor);
-      //  if (shootRocket->inhibitor >=90)
-      //        shootRocket->inhibitor =0;
-    }
+  //  if (shootRocket->inhibitor++ >=80)
+  {
+    shootRocket->addBackParable(xCor, yCor, zCor);
+    shootRocket->addSideAcc(xCor, yCor, zCor, RIGHT);
+    shootRocket->addSideAcc(xCor, yCor, zCor, LEFT);
+    shootRocket->addRotater(xCor, yCor, zCor);
+    //  if (shootRocket->inhibitor >=90)
+    //        shootRocket->inhibitor =0;
+  }
   //cout << "Player::shoot" << endl;
+  
+  /*
+  shootLaser->addShoot(xCor, yCor, zCor);
+  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;
+  */
 }
 
@@ -100 +115 @@
 
 
-void Player::drawPlayer(void) 
+void Player::paint() 
 {
+  //cout << "Player::drawPlayer" << endl;
   glPushMatrix();
   glTranslatef(xCor, yCor, 3.0);
@@ -110 +126 @@
   shootLaser->drawShoot();
   shootRocket->drawShoot();
-  //cout << "Player::drawPlayer" << endl;
+  //cout << "Player::drawPlayer, end" << endl;
 }