Changeset 4781 in orxonox.OLD for orxonox/trunk/src

Timestamp:

Jul 2, 2005, 11:35:29 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: the mighty useless crosshair…

Location:

orxonox/trunk/src/world_entities

Files:

• player.cc (modified) (5 diffs)
• weapons/crosshair.cc (modified) (2 diffs)
• weapons/crosshair.h (modified) (1 diff)

orxonox/trunk/src/world_entities/player.cc

@@ -35 +35 @@
 #include "crosshair.h"
 
+Crosshair* test;
+
 using namespace std;
 
@@ -100 +102 @@
 
 
-  new Crosshair();
+  test = new Crosshair();
 }
 
@@ -196 +198 @@
 void Player::draw ()
 {
+  test->draw();
   glMatrixMode(GL_MODELVIEW);
   glPushMatrix();
@@ -212 +215 @@
 
   this->weaponMan->draw();
+
 }
 
@@ -299 +303 @@
 }
 
-
+/**
+ * @todo switch statement ??
+ */
 void Player::process(const Event &event)
 {

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

@@ -18 +18 @@
 #include "crosshair.h"
 #include "event_handler.h"
+
+#include "graphics_engine.h"
+#include "glincl.h"
+#include "p_node.h"
+#include "state.h"
+
 using namespace std;
 
@@ -44 +50 @@
 void Crosshair::process(const Event &event)
 {
-  printf("wow\n");
+  if  (event.type == EV_MOUSE_MOTION)
+  {
+    this->position2D[0] = event.x;
+    this->position2D[1] = event.y;
+  }
 
 }
+
+
+void Crosshair::draw() const
+{
+  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();
+
+}

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

@@ -29 +29 @@
 
   void tick(float dt);
-  void draw();
+  void draw() const;
 
  private:
    Vector           position;             //!< The current position of the Crosshair
+   float            position2D[2];        //!< The 2D-position on the screen
 
 };