Changeset 4100 in orxonox.OLD

Timestamp:

May 7, 2005, 3:01:10 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: better positioning

File:

• orxonox/trunk/src/glmenu/glmenu_imagescreen.cc (modified) (4 diffs)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -57 +57 @@
   this->setPosition(0,0);
   this->setScale(1,1);
-  this->setBarPosScale( .55, .7, .3, .15);
+  this->setBarPosScale( .6, .75, .3, .1);
   // End of Background image code.
 }
@@ -200 +200 @@
   if( val > barW)
     val = barW;
-
-  printf(":::::::::::::::::::::%d %d %d %d %d\n", screenHeight, barY, barW, barH, val);
 
   GraphicsEngine::enter2DMode();
@@ -214 +212 @@
   glEnd();
   
+  glDisable(GL_TEXTURE_2D);
+  /* draw white border */
+  glBegin(GL_LINE_LOOP);
+  glColor3f(1.0, 1.0, 1.0);
+  glVertex2i(barX - 2, barY - 2);
+  glVertex2i(barX + barW + 2, barY - 2);
+  glVertex2i(barX + barW + 2, barY + barH + 2);
+  glVertex2i(barX - 2, barY + barH + 2);
+  glColor3f(1.0, 1.0, 1.0);
+  glEnd();
   
   /* draw the progress bar */
   barMat->select();
   glBegin(GL_TRIANGLE_STRIP);
-  glColor3f(0.96, 0.84, 0.34);
   glTexCoord2i(0, 0); glVertex2i(barX, barY + barH);
   glTexCoord2i(1, 0); glVertex2i(barX + val, barY + barH);
@@ -245 +252 @@
     glEnd();
     
-    /* draw white border /
-    glBegin(GL_QUADS);
-    glColor3f(1.0, 1.0, 1.0);
-    glVertex2i(barX-2, barY-2);
-    glVertex2i(barX + barWidth +2, barY-2);
-    glVertex2i(barX + barWidth+2, barY + barHeight+2);
-    glVertex2i(barX - 2, barY + barHeight +2);
-    glColor3f(1.0, 1.0, 1.0);
-    glEnd();
   */