Changeset 5396 in orxonox.OLD

Timestamp:

Oct 17, 2005, 10:31:00 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: fixed a BUG in the Element2D-class preventing the BindNode to functionate correctly

Location:

trunk/src

Files:

• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• lib/gui/gl_gui/glgui_pushbutton.cc (modified) (1 diff)
• world_entities/player.cc (modified) (1 diff)
• world_entities/weapons/crosshair.cc (modified) (1 diff)

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

@@ -686 +686 @@
                  projectPos+1,
                  projectPos+2);
-      this->absCoordinate.x = projectPos[0]/(float)GraphicsEngine::getInstance()->getResolutionX() + this->relCoordinate.x;
-      this->absCoordinate.y = projectPos[1]/(float)GraphicsEngine::getInstance()->getResolutionY() + this->relCoordinate.y;
-      this->absCoordinate.z = projectPos[2] + this->relCoordinate.z;
+      this->prevRelCoordinate.x = this->absCoordinate.x = projectPos[0] /* /(float)GraphicsEngine::getInstance()->getResolutionX() */ + this->relCoordinate.x;
+      this->prevRelCoordinate.y = this->absCoordinate.y = (float)GraphicsEngine::getInstance()->getResolutionY() -  projectPos[1] + this->relCoordinate.y;
+      this->prevRelCoordinate.z = this->absCoordinate.z = projectPos[2] + this->relCoordinate.z;
+      this->bRelCoorChanged = true;
     }
     else

trunk/src/lib/gui/gl_gui/glgui_pushbutton.cc

@@ -55 +55 @@
 {
   this->label->draw();
-
 }
 

trunk/src/world_entities/player.cc

@@ -150 +150 @@
   button->show();
   button->setLabel("test");
-//  button->setBindNode(this);
-  button->setRelCoor2D(500, 20);
+  button->setBindNode(this);
 
   this->weaponMan = new WeaponManager(this);

trunk/src/world_entities/weapons/crosshair.cc

@@ -67 +67 @@
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0);
 
-  this->setBindNode(this);
+//  this->setBindNode(this);
   this->material = new Material;