Changeset 4834 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons/crosshair.cc

Timestamp:

Jul 11, 2005, 5:47:23 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair in WeaponManager (instead of World) and implemented easy Cyling for LoadParam

File:

• orxonox/trunk/src/world_entities/weapons/crosshair.cc (modified) (6 diffs)

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

@@ -43 +43 @@
 }
 
-
 /**
  * destroys a Crosshair
@@ -68 +67 @@
 
   this->rotation = 0;
-  this->rotationSpeed = 5;
+  this->setRotationSpeed(5);
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
 
@@ -155 +154 @@
 void Crosshair::tick(float dt)
 {
+  // let the crosshair rotate
   this->rotation += dt * rotationSpeed;
 
 
-
-}
-
-/**
- * draws the crosshair
- */
-void Crosshair::draw()
-{
-  /*
-  const PNode* camera = State::getInstance()->getCamera();  //!< \todo MUST be different
-  Vector cameraPos = camera->getAbsCoor();
-  Vector cameraTargetPos = State::getInstance()->getCameraTarget()->getAbsCoor();
-  Vector view = cameraTargetPos - cameraPos;
-  Vector up = Vector(0, 1, 0);
-  up = camera->getAbsDir().apply(up);
-  Vector h = up.cross(view);
-  Vector v = h.cross(view);
-  h.normalize();
-  v.normalize();
-
-  float px = (position2D[0]-GraphicsEngine::getInstance()->getResolutionX()/2)*.05;
-  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);
-
-  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);
-
-  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));
-
-  glEnd();
-
-  */
-
-
-  GraphicsEngine::storeMatrices();
-
-///  float z;
-//   glReadPixels ((int)position2D[0], GraphicsEngine::getInstance()->getResolutionY()-(int)position2D[1]-1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
-
-
-  //cout << z <<"  "<< scale << "  "  << bias<< endl;
-
+  float z;
+  glReadPixels ((int)position2D[0], GraphicsEngine::getInstance()->getResolutionY()-(int)position2D[1]-1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
+  //cout << z << endl;
 
   GLdouble objX, objY, objZ;
@@ -221 +175 @@
   this->setAbsCoor(objX, objY, objZ);
 
+
+}
+
+/**
+ * draws the crosshair
+ */
+void Crosshair::draw()
+{
+  GraphicsEngine::storeMatrices();
+
+
+
+
 //   glBegin(GL_TRIANGLES);
 //   glColor3f(1,0,0);
@@ -228 +195 @@
 //   glEnd();
 
+  this->debugDraw();
 
   GraphicsEngine::enter2DMode();
@@ -253 +221 @@
   glVertex2f(size, size);
   glEnd();
-  /*
-  glBegin(GL_QUADS);
-  {
-    glColor4f(1,0,0,1);
-    glVertex2f(position2D[0]-10, position2D[1]-10);
-    glVertex2f(position2D[0]+10, position2D[1]-10);
-    glVertex2f(position2D[0]+10, position2D[1]+10);
-    glVertex2f(position2D[0]-10, position2D[1]+10);
-
-    //     glVertex2f(pos[0]-10, pos[1]-10);
-    //     glVertex2f(pos[0]-10, pos[1]+10);
-    //     glVertex2f(pos[0]+10, pos[1]+10);
-    //     glVertex2f(pos[0]+10, pos[1]-10);
-  }
-  glEnd();
-  */
+
   GraphicsEngine::leave2DMode();
 }