Changeset 4824 in orxonox.OLD

Timestamp:

Jul 8, 2005, 1:24:12 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: cleaned out the crosshair of the Player

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (4 diffs)
• weapons/crosshair.cc (modified) (3 diffs)

orxonox/trunk/src/world_entities/player.cc

@@ -33 +33 @@
 #include "event.h"
 
-#include "crosshair.h"
-
-
 
 using namespace std;
@@ -76 +73 @@
   */
   delete this->weaponMan;
-  delete this->crosshair;
 }
 
@@ -100 +96 @@
   this->weaponMan->addWeapon(wpRight, W_CONFIG2);
   this->weaponMan->addWeapon(wpLeft, W_CONFIG2);
-
-
-  this->crosshair = new Crosshair();
 }
 
@@ -198 +191 @@
 void Player::draw ()
 {
-  this->crosshair->draw();
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();

orxonox/trunk/src/world_entities/weapons/crosshair.cc

@@ -115 +115 @@
   GraphicsEngine::storeMatrices();
 
-  GLdouble z;
+  GLfloat z;
+  glReadPixels ((int)position2D[0], GraphicsEngine::getInstance()->getResolutionY()-(int)position2D[1], 1, 1, GL_DEPTH_COMPONENT, GL_DOUBLE, &z);
+
+  printf("%p:: %d %d %f\n",this, (int)position2D[0], (int)position2D[1], z);
+
   GLdouble objX, objY, objZ;
   if (gluUnProject(position2D[0],
       GraphicsEngine::getInstance()->getResolutionY()-position2D[1],
-      .8,
+      z,
       GraphicsEngine::modMat,
       GraphicsEngine::projMat,
@@ -126 +130 @@
       &objY,
       &objZ ));
-
+  /*
   glBegin(GL_TRIANGLES);
   glColor3f(1,0,0);
@@ -133 +137 @@
   glVertex3f(objX, objY, objZ+1);
   glEnd();
+  */
 }