Changeset 4823 in orxonox.OLD

Timestamp:

Jul 8, 2005, 12:30:31 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better algorithm to get the position of the crosshair

Location:

orxonox/trunk/src

Files:

• story_entities/world.cc (modified) (2 diffs)
• world_entities/weapons/crosshair.cc (modified) (3 diffs)

orxonox/trunk/src/story_entities/world.cc

@@ -880 +880 @@
     }
   delete iterator;
+  crosshair->draw();
 
   glCallList (objectList);
@@ -885 +886 @@
   ParticleEngine::getInstance()->draw(); //!< \todo should be dts like in the Trunk;
 
-  crosshair->draw();
   TextEngine::getInstance()->draw();
   LightManager::getInstance()->draw(); // must be at the end of the drawing procedure, otherwise Light cannot be handled as PNodes //

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

@@ -57 +57 @@
   }
 
+  /*
+  GLdouble z;
+  GLdouble objX, objY, objZ;
+  glReadPixels (event.x, event.y, 1, 1, GL_DEPTH_COMPONENT, GL_DOUBLE, &z);
+
+
+  if (gluUnProject(event.x,
+      event.y,
+      10,
+      GraphicsEngine::modMat,
+      GraphicsEngine::projMat,
+      GraphicsEngine::viewPort,
+      &objX,
+      &objY,
+      &objZ ))
+    PRINT(0)("screen %d %d -> obj(%f/%f/%f)\n", event.x, event.y, objX, objY, objZ);
+  else
+    PRINT(0)("shit\n");
+*/
 }
 
@@ -62 +81 @@
 void Crosshair::draw() const
 {
+  /*
   const PNode* camera = State::getInstance()->getCamera();  //!< \todo MUST be different
   Vector cameraPos = camera->getAbsCoor();
@@ -76 +96 @@
   float py = -(position2D[1]-GraphicsEngine::getInstance()->getResolutionY()/2)*.05;
 
-
-
   glBegin(GL_TRIANGLES);
   glVertex3f(cameraTargetPos.x - h.x*px - v.x*py,
-             cameraTargetPos.y - h.y*px - v.y*py,
-             cameraTargetPos.z - h.z*px - v.z*py);
+  cameraTargetPos.y - h.y*px - v.y*py,
+  cameraTargetPos.z - h.z*px - v.z*py);
 
   glVertex3f(cameraTargetPos.x - h.x*(px+1) - v.x*py,
-             cameraTargetPos.y - h.y*(px+1) - v.y*py,
-             cameraTargetPos.z - h.z*(px+1) - v.z*py);
+  cameraTargetPos.y - h.y*(px+1) - v.y*py,
+  cameraTargetPos.z - h.z*(px+1) - v.z*py);
 
   glVertex3f(cameraTargetPos.x - h.x*px - v.x*(py+1),
-             cameraTargetPos.y - h.y*px - v.y*(py+1),
-             cameraTargetPos.z - h.z*px - v.z*(py+1));
+  cameraTargetPos.y - h.y*px - v.y*(py+1),
+  cameraTargetPos.z - h.z*px - v.z*(py+1));
 
   glEnd();
 
+  */
+
+  GraphicsEngine::storeMatrices();
+
+  GLdouble z;
+  GLdouble objX, objY, objZ;
+  if (gluUnProject(position2D[0],
+      GraphicsEngine::getInstance()->getResolutionY()-position2D[1],
+      .8,
+      GraphicsEngine::modMat,
+      GraphicsEngine::projMat,
+      GraphicsEngine::viewPort,
+      &objX,
+      &objY,
+      &objZ ));
+
+  glBegin(GL_TRIANGLES);
+  glColor3f(1,0,0);
+  glVertex3f(objX, objY, objZ);
+  glVertex3f(objX, objY+1, objZ);
+  glVertex3f(objX, objY, objZ+1);
+  glEnd();
 }