Changeset 5381 in orxonox.OLD for branches/2d-recalc/src/world_entities

Timestamp:

Oct 15, 2005, 7:13:23 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/2d-recalc: some recalculations.. do not know it i will continue with this, as has certain disadvantages over the old approach… maybe later

Location:

branches/2d-recalc/src/world_entities/weapons

Files:

• crosshair.cc (modified) (6 diffs)
• weapon_manager.cc (modified) (1 diff)

branches/2d-recalc/src/world_entities/weapons/crosshair.cc

@@ -65 +65 @@
   this->setLayer(E2D_TOP);
   this->setRotationSpeed(5);
-  this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
+  this->setSize(0.1);
 
-  this->setBindNode(this);
+//  this->setBindNode(this);
   this->material = new Material;
 
@@ -73 +73 @@
 
   // center the mouse on the screen, and also hide the cursors
-  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
+//  SDL_WarpMouse(GraphicsEngine::getInstance()->getResolutionX()/2, GraphicsEngine::getInstance()->getResolutionY()/2);
   GraphicsEngine::showMouse(false);
   GraphicsEngine::stealWMEvents(true);
@@ -121 +121 @@
   if  (event.type == EV_MOUSE_MOTION)
   {
-    this->setAbsCoor2D(event.x, event.y);
+    this->setAbsCoor2Dpx(event.x, event.y);
   }
 }
@@ -134 +134 @@
   this->shiftDir2D(dt * rotationSpeed);
 
-
   float z = 0.0f;
-  glReadPixels ((int)this->getAbsCoor2D().x,
-                 GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2D().y-1,
+  glReadPixels ((int)this->getAbsCoor2Dpx().x,
+                 GraphicsEngine::getInstance()->getResolutionY()-(int)this->getAbsCoor2Dpx().y-1,
                  1,
                  1,
@@ -146 +145 @@
 
   GLdouble objX=.0, objY=.0, objZ=.0;
-  gluUnProject(this->getAbsCoor2D().x,
-               GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2D().y-1,
+  gluUnProject(this->getAbsCoor2Dpx().x,
+               GraphicsEngine::getInstance()->getResolutionY()-this->getAbsCoor2Dpx().y-1,
                .99,  // z
                GraphicsEngine::modMat,
@@ -166 +165 @@
   glPushMatrix();
   glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
+//  printf("%f, %f\n", this->getAbsCoor2D().x, this->getAbsCoor2D().y);
 
   glRotatef(this->getAbsDir2D(), 0,0,1);

branches/2d-recalc/src/world_entities/weapons/weapon_manager.cc

@@ -106 +106 @@
   this->crossHairSizeAnim = new tAnimation<Crosshair>(this->crosshair, &Crosshair::setSize);
   this->crossHairSizeAnim->setInfinity(ANIM_INF_REWIND);
-  this->crossHairSizeAnim->addKeyFrame(50, .1, ANIM_LINEAR);
-  this->crossHairSizeAnim->addKeyFrame(100, .05, ANIM_LINEAR);
-  this->crossHairSizeAnim->addKeyFrame(50, .01, ANIM_LINEAR);
+  this->crossHairSizeAnim->addKeyFrame(.1, .1, ANIM_LINEAR);
+  this->crossHairSizeAnim->addKeyFrame(.2, .05, ANIM_LINEAR);
+  this->crossHairSizeAnim->addKeyFrame(.1, .01, ANIM_LINEAR);
 }