Changeset 4830 in orxonox.OLD for orxonox/trunk/src/world_entities/weapons

Timestamp:

Jul 11, 2005, 5:43:37 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: implemented aim

Location:

orxonox/trunk/src/world_entities/weapons

Files:

• crosshair.cc (modified) (6 diffs)
• crosshair.h (modified) (2 diffs)
• weapon.cc (modified) (2 diffs)
• weapon.h (modified) (4 diffs)

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

@@ -23 +23 @@
 #include "p_node.h"
 #include "state.h"
+#include "model.h"
 
 #include <iostream>
@@ -37 +38 @@
   this->setName("Crosshair");
 
+  this->material = NULL;
+  this->model = NULL;
+  this->rotation = 0;
+
+  this->material = new Material("Crosshair Material");
+  this->material->setDiffuseMap("maps/aim.png");
+
+  float size = 50;
+  this->model = new Model();
+  this->model->addVertex (-0.5*size, -0.5*size, 0);
+  this->model->addVertex (0.5*size, -0.5*size, 0);
+  this->model->addVertex (0.5*size, 0.5*size, 0);
+  this->model->addVertex (-0.5*size, 0.5*size, 0);
+
+  this->model->addVertexTexture(0,0);
+  this->model->addVertexTexture(1,0);
+  this->model->addVertexTexture(1,1);
+  this->model->addVertexTexture(0,1);
+
+  this->model->setMaterial(this->material);
+  this->model->addFace(4, VERTEX_TEXCOORD, 0,0, 1,1 ,2,2, 3,3);
+  this->model->finalize();
+
   EventHandler::getInstance()->subscribe(this, ES_GAME, EV_MOUSE_MOTION);
 
@@ -47 +71 @@
 Crosshair::~Crosshair ()
 {
+ // delete this->model;
+
   // delete what has to be deleted here
   EventHandler::getInstance()->unsubscribe(this);
@@ -81 +107 @@
 
 
-void Crosshair::draw() const
+void Crosshair::draw()
 {
   /*
@@ -118 +144 @@
   GraphicsEngine::storeMatrices();
 
-  float z;
-  glReadPixels ((int)position2D[0], GraphicsEngine::getInstance()->getResolutionY()-(int)position2D[1]-1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
-
-
-  printf("%f %f %f\n", (int)position2D[0], (int)position2D[1], z);
+///  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;
+
 
   GLdouble objX, objY, objZ;
   gluUnProject(position2D[0],
                GraphicsEngine::getInstance()->getResolutionY()-position2D[1]-1,
-               .5,
+               .99,
                GraphicsEngine::modMat,
                GraphicsEngine::projMat,
@@ -137 +162 @@
                &objZ );
 
-  glBegin(GL_TRIANGLES);
-  glColor3f(1,0,0);
-  glVertex3f(objX, objY, objZ);
-  glVertex3f(objX, objY+1, objZ);
-  glVertex3f(objX, objY, objZ+1);
+  this->setAbsCoor(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();
+
+
+  GraphicsEngine::enter2DMode();
+  GLdouble pos[3];
+  gluProject(this->getAbsCoor().x,
+             this->getAbsCoor().y,
+             this->getAbsCoor().z,
+             GraphicsEngine::modMat,
+             GraphicsEngine::projMat,
+             GraphicsEngine::viewPort,
+             pos, pos+1, pos+2 );
+
+  printf("%d %d %d\n", (int)pos[0], (int)pos[1], (int)pos[2]);
+  this->rotation += 5;
+
+  glTranslatef(position2D[0], position2D[1], 0);
+  glRotatef(this->rotation, 0,0,1);
+  this->model->draw();
+  /*
+  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();
+}

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

@@ -9 +9 @@
 
 #include "event_listener.h"
-
+#include "p_node.h"
 #include "vector.h"
 
 // FORWARD DEFINITION
-
+class Model;
+class Material;
 
 //! A class that enables the
-class Crosshair : public EventListener {
+class Crosshair : public PNode, public EventListener {
 
  public:
@@ -25 +26 @@
   virtual void process(const Event &event);
 
-  /** @returns the current 3D-position of the Crosshair */
-  const Vector& getPosition() { return this->position; };
-
   void tick(float dt);
-  void draw() const;
+  void draw();
 
  private:
-   Vector           position;             //!< The current position of the Crosshair
    float            position2D[2];        //!< The 2D-position on the screen
 
+   Model*           model;                //!< A model for the crosshair representing the Aim
+   Material*        material;             //!< a material for the Aim.
+   float            rotation;             //!< a rotation of the aim.
+   float            size;                 //!< The Size of the Crosshair (in % of screen resolution 1 is fullscreen)
 };
 

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

@@ -33 +33 @@
   this->setRelCoor(coordinate);
   this->setRelDir(direction);
-  this->worldEntities = State::getWorldEntityList();
 }
 
@@ -156 +155 @@
    can destroy the weapons of enemies or vice versa.
 */
-void Weapon::hit (WorldEntity* entity, Vector* position)
+void Weapon::hit (WorldEntity* entity, const Vector& position)
 {}
 

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

@@ -32 +32 @@
 class TiXmlElement;
 
+//! An enumerator defining actions a Weapon can take
+typedef enum {
+  WA_NONE          =    0,    //!< No Action taken
+  WA_SHOOT         =    1,    //!< emitting Shot
+  WA_CHARGE        =    2,    //!< charge action (one click before the shot)
+  WA_RELOAD        =    3,    //!< reload right after shoot is finished
+  WA_ACTIVATE      =    4,    //!< activate the GUN
+  WA_DEACTIVATE    =    5,    //!< deactivate the GUN
+  WA_SPECIAL1      =    6,    //!< Special Action taken
 
-// typedef enum {
-//   W_SHOOT,
-//   W_EMPTY,
-//   W_RELOAD,
-//   W_SPECIAL1,
-//   W_SPECIAL2,
-//   W_SPECIAL3
-// } WeaponSoundType;
-
+  WA_ACTION_COUNT  =    6     //!< This must match the count of enumerations (without W_NONE)
+} WeaponActions;
 
 //! An enumerator defining the States of a Weapon
 typedef enum {
-  W_NONE          =    0,    //!< No State at all (if set, there is something wrong, or the weapon is not yet availiable)
-  W_SHOOT         =    1,    //!< The State of the Shooting
-  W_RELOAD        =    2,    //!< The State of the Reloading
-  W_ACTIVATING    =    3,    //!< The State in which the weapon gets activated
-  W_DEACTIVATING  =    4,    //!< The State in which the weapon gets deactivated
-  W_INACTIVE      =    5,    //!< The State where the weapon is inactive (unable to shoot)
-  W_IDLE          =    6,    //!< The State where the weapon is idle
+  WS_NONE          =    0,    //!< No State at all (if set, there is something wrong, or the weapon is not yet availiable)
+  WS_SHOOTING      =    1,    //!< The State of the Shooting
+  WS_RELOADING     =    3,    //!< The State of the Reloading
+  WS_ACTIVATING    =    4,    //!< The State in which the weapon gets activated
+  WS_DEACTIVATING  =    5,    //!< The State in which the weapon gets deactivated
+  WS_INACTIVE      =    6,    //!< The State where the weapon is inactive (unable to shoot)
+  WS_IDLE          =    7,    //!< The State where the weapon is idle
 
-  W_STATES_COUNT  =    6     //!< This must match the count of the enumerations (without W_NONE)
+  WS_STATE_COUNT  =    7     //!< This must match the count of the enumerations (without W_NONE)
 } WeaponState;
 
 
 //! a weapon can be left or right sided
+/**
+ * @todo this will be reset with mirror X/Y/Z
+ */
 #define    W_LEFT        0
 #define    W_RIGHT       1
@@ -99 +104 @@
   /** @brief fires the weapon */
   virtual void fire() = 0;
-  virtual void hit (WorldEntity* weapon, Vector* loc);
+  virtual void hit (WorldEntity* weapon, const Vector& loc);
   virtual void destroy();
 
@@ -107 +112 @@
 
  protected:
-  tList<WorldEntity>*  worldEntities;
 
-  float                localTime;                 //<! this is the local time. important for shooting attributes like frequency
-  float                idleTime;                  //<! the time a weapon needs before it can shoot again. eg. shooting frequency or actication/deactivateion delay
-  float                slowDownFactor;            //<! if the shooting frequency is a linear function of time...
+  float                localTime;                        //<! this is the local time. important for shooting attributes like frequency
+  float                idleTime;                         //<! the time a weapon needs before it can shoot again. eg. shooting frequency or actication/deactivateion delay
+  float                slowDownFactor;                   //<! if the shooting frequency is a linear function of time...
+
+  ////////////
+  // PHASES //
+  ////////////
+  float                times[WS_STATE_COUNT];            //!< Times to stay in the different States @see WeaponState
+  SoundBuffer*         soundBuffers[WA_ACTION_COUNT];    //!< SoundBuffers for all actions @see WeaponAction
+
+
 
   SoundBuffer*         fireSound;
@@ -118 +130 @@
 
  private:
-  bool                 enabled;                    //<! states if the weapon is enabled or not
-  Projectile*          projectile;          //<! the projectile used for this weapon
+  bool                 enabled;                          //<! states if the weapon is enabled or not
+  Projectile*          projectile;                       //<! the projectile used for this weapon
   //WeaponSound sound;
 };