Changeset 3362 in orxonox.OLD

Timestamp:

Jan 6, 2005, 11:43:04 PM (19 years ago)

Author:

patrick

Message:

orxonox/branches/parenting: remved HUD, reimplemented the display function. now rocks.

Location:

orxonox/branches/parenting/src

Files:

• Makefile.in (modified) (1 diff)
• glmenu_imagescreen.cc (modified) (2 diffs)
• world.cc (modified) (1 diff)

orxonox/branches/parenting/src/Makefile.in

@@ -299 +299 @@
           esac; \
         done; \
-        echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  src/Makefile'; \
+        echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu  src/Makefile'; \
         cd $(top_srcdir) && \
-          $(AUTOMAKE) --foreign  src/Makefile
+          $(AUTOMAKE) --gnu  src/Makefile
 .PRECIOUS: Makefile
 Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status

orxonox/branches/parenting/src/glmenu_imagescreen.cc

@@ -69 +69 @@
   */
 
-  int e_bnd=0,b0=0,BANDS=64,j=0,k=0; // 0 = 32 band and 1 = 64 band.
-  int red,green,blue,alpha=100;
-  
-  float vuX,vuY;
-  long x;
-  float gap=7.915f; // for default
-  double equVal,y1=0;
-  float AV_peak_falloff = 0.8f; // Spead the Peaks fall.
-  
-  int n;
-  
-  // Screen Size.
-  int screen_width = 640;
-  int screen_height = 480;
-  
-  // Set Image Size.
-  int hud_width = 50;
-  int hud_height = 50;
-  
-  // Start pos of image.
-  int hud_x = 10;
-  int hud_y = 10;
-  
-  glEnable(GL_BLEND);
-  glEnable(GL_TEXTURE_2D);
   
   // Select Our VU Meter Background Texture
   this->backTex = new Texture();
   this->backTex->loadImage("orx_tex.bmp");
-  glPushAttrib(GL_LIGHTING_BIT | GL_TRANSFORM_BIT);
-  
-  glDisable(GL_LIGHTING);
-  glMatrixMode(GL_PROJECTION);
-  glPushMatrix();
-  glLoadIdentity();
-  glOrtho(0,screen_width,0,screen_height,-1,1); // Set Up An Ortho Screen
-  glMatrixMode(GL_MODELVIEW);
-  glLoadIdentity();
-  glPushMatrix();
-  glEnable(GL_BLEND);
 
-  glBegin(GL_QUADS);
-  glTexCoord2i(0, 0); glVertex2i(hud_x, hud_y);
-  glTexCoord2i(1, 0 ); glVertex2i( hud_x+hud_width, hud_y );
-  glTexCoord2i( 1, 1 ); glVertex2i( hud_x+hud_width, hud_y+hud_height );
-  glTexCoord2i( 0, 1 ); glVertex2i( hud_x, hud_y+hud_height );
-  glEnd();
-
-  glDisable(GL_BLEND);
-  glPopMatrix();
-  glMatrixMode(GL_PROJECTION);
-  glPopMatrix();
-  glPopAttrib();
-  glDisable(GL_TEXTURE_2D);
-  glDisable(GL_BLEND);
   // End of Background image code.
 }
@@ -173 +123 @@
   glEnable(GL_TEXTURE_2D);  
   */
+
+  glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
+
+  // Screen Size.
+  int screen_width = 640;
+  int screen_height = 480;
   
+  // Set Image Size.
+  int hud_width = 400;
+  int hud_height = 400;
+  
+  // Start pos of image.
+  int hud_x = 120;
+  int hud_y = 40;
+  
+  glEnable(GL_BLEND);
+  glEnable(GL_TEXTURE_2D);
+
+  glPushAttrib(GL_LIGHTING_BIT | GL_TRANSFORM_BIT);
+  
+  glDisable(GL_LIGHTING);
+  glMatrixMode(GL_PROJECTION);
+  glPushMatrix();
+  glLoadIdentity();
+  glOrtho(0,screen_width,0,screen_height,-1,1); // Set Up An Ortho Screen
+  glMatrixMode(GL_MODELVIEW);
+  glLoadIdentity();
+  glPushMatrix();
+  glEnable(GL_BLEND);
+
+  glBegin(GL_QUADS);
+  glTexCoord2i(0, 0); glVertex2i(hud_x, hud_y);
+  glTexCoord2i(1, 0 ); glVertex2i( hud_x+hud_width, hud_y );
+  glTexCoord2i( 1, 1 ); glVertex2i( hud_x+hud_width, hud_y+hud_height );
+  glTexCoord2i( 0, 1 ); glVertex2i( hud_x, hud_y+hud_height );
+  glEnd();
+
+  glDisable(GL_BLEND);
+  glPopMatrix();
+  glMatrixMode(GL_PROJECTION);
+  glPopMatrix();
+  glPopAttrib();
+  glDisable(GL_TEXTURE_2D);
+
+
   SDL_GL_SwapBuffers();                    
-
-  delete this->backTex;
-  SDL_Delay(5000);
+  SDL_Delay(1000);
 }
 

orxonox/branches/parenting/src/world.cc

@@ -615 +615 @@
   
   //glmis = new GLMenuImageScreen();
-  glmis->init();
-  //glmis->draw();
+  ///glmis->init();
 
   // draw debug coord system