Changeset 5378 in orxonox.OLD for trunk

Timestamp:

Oct 14, 2005, 6:54:55 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: crosshair now more compliant with Element2D
Element2D now also nows size

Location:

trunk/src

Files:

• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• lib/graphics/render2D/element_2d.h (modified) (2 diffs)
• lib/graphics/text_engine/text.h (modified) (1 diff)
• world_entities/environment.cc (modified) (1 diff)
• world_entities/test_entity.cc (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (6 diffs)
• world_entities/weapons/crosshair.h (modified) (1 diff)
• world_entities/world_entity.cc (modified) (1 diff)

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -123 +123 @@
   this->toCoordinate = NULL;
   this->toDirection = NULL;
+  this->setSize2D(1,1);
 
   Render2D::getInstance()->registerElement2D(this);

trunk/src/lib/graphics/render2D/element_2d.h

@@ -98 +98 @@
     inline bool isActive() { return this->active; };
 
+
+    inline void setSize2D(float x, float y) { this->sizeX = x, this->sizeY = y; };
+    inline void setSizeX2D(float x) { this->sizeX = x; };
+    inline void setSizeY2D(float y) { this->sizeY = y; };
+    inline float getSizeX2D() const { return this->sizeX; };
+    inline float getSizeY2D() const { return this->sizeY; };
 
     // LIKE PNODE
@@ -179 +185 @@
     virtual void draw() const = 0;
 
-  protected:
+  private:
+    const PNode*            bindNode;           //!< a node over which to display this 2D-element
     float                   sizeX;              //!< The size of the rendered item in x-direction
     float                   sizeY;              //!< The size of the rendered Item in y-direction
-
-  private:
-    const PNode*            bindNode;           //!< a node over which to display this 2D-element
 
     E2D_ALIGNMENT           alignment;          //!< How the Element is aligned around its Position

trunk/src/lib/graphics/text_engine/text.h

@@ -71 +71 @@
     void setSize(float size) { this->size = size; };
     /** @returns the Size of the Text */
-    float getSize() const { return this->size; };
+//    void getSize(float &x, float& y) const { return this->size; };
 
     void setType(TEXT_RENDER_TYPE type);

trunk/src/world_entities/environment.cc

@@ -38 +38 @@
   this->loadModel("models/ships/bolido.obj");
 
-/*  if(this->obbTree == NULL)
-    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());*/
+  if(this->obbTree == NULL)
+    this->obbTree = new OBBTree(4, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
 }
 

trunk/src/world_entities/test_entity.cc

@@ -37 +37 @@
 //   this->md2Model = new MD2Model("models/tris.md2", "models/tris.pcx");
 // this->md2Model = new MD2Model("models/goblin.md2", "maps/goblin.bmp");
-//  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
+  this->obbTree = new OBBTree(4, (sVec3D*)this->md2Model->data->pVertices, this->md2Model->data->numVertices);
 
   this->md2Model->setAnim(RUN);

trunk/src/world_entities/weapons/crosshair.cc

@@ -64 +64 @@
 
   this->setLayer(E2D_TOP);
-  this->rotation = 0;
   this->setRotationSpeed(5);
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
 
-  this->position2D[0] = 0;
-  this->position2D[1] = 0;
-
+  this->setBindNode(this);
   this->material = new Material;
 
@@ -104 +101 @@
 void Crosshair::setSize(float size)
 {
-  this->size = size*.5;
-};
+  this->setSize2D(size/2, size/2);
+}
 
 /**
@@ -124 +121 @@
   if  (event.type == EV_MOUSE_MOTION)
   {
-    this->position2D[0] = event.x;
-    this->position2D[1] = event.y;
+    this->setAbsCoor2D(event.x, event.y);
   }
-
-  /*
-  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");
-*/
 }
 
@@ -156 +132 @@
 {
   // let the crosshair rotate
-  this->rotation += dt * rotationSpeed;
+  this->shiftDir2D(dt * rotationSpeed);
 
 
   float z = 0.0f;
-  glReadPixels ((int)position2D[0], GraphicsEngine::getInstance()->getResolutionY()-(int)position2D[1]-1, 1, 1, GL_DEPTH_COMPONENT, GL_FLOAT, &z);
-  //cout << z << endl;
+  glReadPixels ((int)this->getAbsCoor2D().x,
+                 GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
+                 1,
+                 1,
+                 GL_DEPTH_COMPONENT,
+                 GL_FLOAT,
+                 &z);
+
 
   GLdouble objX=.0, objY=.0, objZ=.0;
-  gluUnProject(position2D[0],
-               GraphicsEngine::getInstance()->getResolutionY()-position2D[1]-1,
+  gluUnProject(this->getAbsCoor2D().x,
+               GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
                .99,  // z
                GraphicsEngine::modMat,
@@ -175 +157 @@
 
   this->setAbsCoor(objX, objY, objZ);
-
-  //this->positioning();
 }
 
@@ -184 +164 @@
 void Crosshair::draw() const
 {
-//   glBegin(GL_TRIANGLES);
-//   glColor3f(1,0,0);
-//   glVertex3f(objX, objY, objZ);
-//   glVertex3f(objX, objY+1, objZ);
-//   glVertex3f(objX, objY, objZ+1);
-//   glEnd();
   glPushMatrix();
-  GLdouble pos[3] = { 0.0, 0.0, 0.0};
-  gluProject(this->getAbsCoor().x,
-             this->getAbsCoor().y,
-             this->getAbsCoor().z,
-             GraphicsEngine::modMat,
-             GraphicsEngine::projMat,
-             GraphicsEngine::viewPort,
-             pos, pos+1, pos+2 );
+  glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
 
-
-  glTranslatef(position2D[0], position2D[1], 0);
-  glRotatef(this->rotation, 0,0,1);
+  glRotatef(this->getAbsDir2D(), 0,0,1);
   this->material->select();
   glBegin(GL_TRIANGLE_STRIP);
   glTexCoord2f(0, 0);
-  glVertex2f(-size, -size);
+  glVertex2f(-this->getSizeX2D(), -this->getSizeY2D());
   glTexCoord2f(1, 0);
-  glVertex2f(size, -size);
+  glVertex2f(this->getSizeX2D(), -this->getSizeY2D());
   glTexCoord2f(0, 1);
-  glVertex2f(-size, size);
+  glVertex2f(-this->getSizeX2D(), this->getSizeY2D());
   glTexCoord2f(1, 1);
-  glVertex2f(size, size);
+  glVertex2f(this->getSizeX2D(), this->getSizeY2D());
   glEnd();
   glPopMatrix();

trunk/src/world_entities/weapons/crosshair.h

@@ -40 +40 @@
 
  private:
-   float            position2D[2];        //!< The 2D-position on the screen
-
    Material*        material;             //!< a material for the Aim.
-   float            rotation;             //!< a rotation of the aim.
    float            rotationSpeed;        //!< Speed of the Rotation.
-   float            size;                 //!< The Size of the Crosshair (in % of screen resolution 1 is fullscreen)
 };
 

trunk/src/world_entities/world_entity.cc

@@ -98 +98 @@
 bool WorldEntity::buildObbTree(unsigned int depth)
 {
-//   if (this->obbTree)
-//     delete this->obbTree;
-//
-//   if (this->model)
-//   {
-//     PRINTF(4)("creating obb tree\n");
-//     this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
-//     return true;
-//   }
-//   else
-//   {
-//     PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
-//     this->obbTree = NULL;
-//     return false;
-//  }
+  if (this->obbTree)
+    delete this->obbTree;
+
+  if (this->model)
+  {
+    PRINTF(4)("creating obb tree\n");
+    this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
+    return true;
+  }
+  else
+  {
+    PRINTF(2)("could not create obb-tree, because no model was loaded yet\n");
+    this->obbTree = NULL;
+    return false;
+  }
 }