Changeset 6305 in orxonox.OLD for trunk

Timestamp:

Dec 26, 2005, 1:46:16 PM (19 years ago)

Author:

bensch

Message:

trunk: removed unused Text

Location:

trunk/src

Files:

• lib/gui/gl_gui/glgui_bar.cc (modified) (1 diff)
• world_entities/weapons/aim.cc (modified) (4 diffs)

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

@@ -67 +67 @@
   glBegin(GL_QUADS);
 
-  glVertex2f(.1 * this->getSizeX2D(), .1 * this->getSizeY2D());
-  glVertex2f(.1 * this->getSizeX2D(), this->getSizeY2D()* .9 * (value/maximum));
-  glVertex2f(this->getSizeX2D() * .9, this->getSizeY2D() * .9 * (value/maximum));
-  glVertex2f(this->getSizeX2D() * .9, .1 * this->getSizeY2D());
+  glVertex2f(3.0, 3.0);
+  glVertex2f(3.0, (this->getSizeY2D()-3.0)* (value/maximum));
+  glVertex2f(this->getSizeX2D()-3.0, (this->getSizeY2D()-3.0) * (value/maximum));
+  glVertex2f(this->getSizeX2D()-3.0, 3.0);
 
   glEnd();

trunk/src/world_entities/weapons/aim.cc

@@ -53 +53 @@
     delete this->material;
 
-  if (this->text != NULL)
-    delete this->text;
+/*  if (this->text != NULL)
+    delete this->text;*/
 }
 
@@ -79 +79 @@
   this->anim->addKeyFrame(50, .01, ANIM_LINEAR);
 
-  this->text = new Text();
+/*  this->text = new Text();
   this->text->setLayer(this->getLayer());
   this->text->setParent2D(this);
   this->text->setRelCoor2D(10, -50);
   this->text->setParentMode2D(E2D_PARENT_MOVEMENT);
-  this->text->setText("Testing");
+  this->text->setText("Testing");*/
 }
 
@@ -124 +124 @@
 
 /**
- * sets the size of the Aim.
+ * @brief sets the size of the Aim.
  * @param size the size in pixels
  */
@@ -150 +150 @@
   this->shiftDir2D(dt * rotationSpeed);
 
-  char outputText[100];
-  sprintf(outputText, "%s - distance: %f\n", this->getParent()->getName(), (this->source->getAbsCoor() - this->getAbsCoor()).len());
-  this->text->setText(outputText);
+//   char outputText[100];
+//   sprintf(outputText, "%s - distance: %f\n", this->getParent()->getName(), (this->source->getAbsCoor() - this->getAbsCoor()).len());
+//   this->text->setText(outputText);