Changeset 4597 in orxonox.OLD for orxonox/trunk/src/glmenu

Timestamp:

Jun 11, 2005, 12:55:48 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: setClassID implemented in all files

Location:

orxonox/trunk/src/glmenu

Files:

• glmenu_imagescreen.cc (modified) (11 diffs)
• glmenu_imagescreen.h (modified) (2 diffs)

orxonox/trunk/src/glmenu/glmenu_imagescreen.cc

@@ -1 +1 @@
 
 
-/* 
+/*
    orxonox - the future of 3D-vertical-scrollers
 
@@ -13 +13 @@
    ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: 
+   co-programmer:
 */
 
@@ -28 +28 @@
 using namespace std;
 /**
-   \brief standard constructor
-*/
-GLMenuImageScreen::GLMenuImageScreen () 
-{
-   this->init();
-}
-
-/**
    \param root The Element to load the GLMenu from
 */
 GLMenuImageScreen::GLMenuImageScreen(const TiXmlElement* root)
 {
-  this->init();
-  this->loadParams(root);
-}
-
-/**
-   \brief Loads a GLMenu from an inputElement
-   \param root The Element to load the GLMenu from
-*/
-void GLMenuImageScreen::loadParams(const TiXmlElement* root)
-{
-  LoadParam<GLMenuImageScreen>(root, "BackgroundImage", this, &GLMenuImageScreen::setBackgroundImage)
-    .describe("sets the image to load onto the loadscreen");
-
-  LoadParam<GLMenuImageScreen>(root, "BackgroundPS", this, &GLMenuImageScreen::setPosScale)
-    .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY");
-
-  LoadParam<GLMenuImageScreen>(root, "BarImage", this, &GLMenuImageScreen::setBarImage)
-    .describe("sets the image of the LoadingBar");
-  
-  LoadParam<GLMenuImageScreen>(root, "BarPS", this, &GLMenuImageScreen::setBarPosScale)
-    .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY");
-
-  LoadParam<GLMenuImageScreen>(root, "ElementCount", this, &GLMenuImageScreen::setMaximum)
-    .describe("The Count of elements to load into the bar (this is only a maximum value)");
-}
-
-/**
-   \brief standard deconstructor
-   \todo this deconstructor is not jet implemented - do it
-*/
-GLMenuImageScreen::~GLMenuImageScreen() 
-{
-  delete this->backMat;
-  delete this->barMat;
-}
-
-/**
-   \brief function to init the screen
-*/
-void GLMenuImageScreen::init ()
-{
   this->setClassID(CL_GLMENU_IMAGE_SCREEN, "GLMenuImageScreen");
-
+  this->setName("GLMenuLoadScreen");
   // Select Our VU Meter Background Texture
   this->backMat = new Material("load_screen");
@@ -92 +43 @@
   this->setBarPosScale( .6, .75, .3, .1);
   // End of Background image code.
-}
-
-/** 
+
+  if (root)
+    this->loadParams(root);
+}
+
+/**
+   \brief Loads a GLMenu from an inputElement
+   \param root The Element to load the GLMenu from
+*/
+void GLMenuImageScreen::loadParams(const TiXmlElement* root)
+{
+  LoadParam<GLMenuImageScreen>(root, "BackgroundImage", this, &GLMenuImageScreen::setBackgroundImage)
+    .describe("sets the image to load onto the loadscreen");
+
+  LoadParam<GLMenuImageScreen>(root, "BackgroundPS", this, &GLMenuImageScreen::setPosScale)
+    .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY");
+
+  LoadParam<GLMenuImageScreen>(root, "BarImage", this, &GLMenuImageScreen::setBarImage)
+    .describe("sets the image of the LoadingBar");
+
+  LoadParam<GLMenuImageScreen>(root, "BarPS", this, &GLMenuImageScreen::setBarPosScale)
+    .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY");
+
+  LoadParam<GLMenuImageScreen>(root, "ElementCount", this, &GLMenuImageScreen::setMaximum)
+    .describe("The Count of elements to load into the bar (this is only a maximum value)");
+}
+
+/**
+   \brief standard deconstructor
+   \todo this deconstructor is not jet implemented - do it
+*/
+GLMenuImageScreen::~GLMenuImageScreen()
+{
+  delete this->backMat;
+  delete this->barMat;
+}
+
+/**
     \brief sets the background image name
     \param backImageName name of the backgroun-image
@@ -191 +177 @@
 
 
-/** 
+/**
     \brief call this to trigger a progress event
-    
+
     this has to redraw the progress bar and the whole image
  */
@@ -211 +197 @@
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
 
-  PRINTF(4)("GLMenuImagEscreen::draw() - drawing step %i/%i\n", 
-            this->currentValue, this->maxValue);
+  PRINTF(4)("GLMenuImagEscreen::draw() - drawing step %i/%i\n",
+            this->currentValue, this->maxValue);
 
   /* screen size */
   int screenWidth = GraphicsEngine::getInstance()->getResolutionX();
   int screenHeight = GraphicsEngine::getInstance()->getResolutionY();
-  
+
   int imageWidth = (int)(screenWidth * this->scaleX);
   int imageHeight = (int)(screenHeight * this->scaleY);
@@ -229 +215 @@
   int barW = (int)(this->barW *screenWidth);
   int barH = (int)(this->barH *screenHeight);
-  
+
   float val = (float)this->currentValue/(float)this->maxValue;
-                  
+
   if( val > barW)
     val = barW;
@@ -245 +231 @@
   glTexCoord2i(1, 0); glVertex2i(offsetX + imageWidth, offsetY);
   glEnd();
-  
+
   glDisable(GL_TEXTURE_2D);
   /* draw white border */
@@ -256 +242 @@
   glColor3f(1.0, 1.0, 1.0);
   glEnd();
-  
+
   /* draw the progress bar */
   barMat->select();
@@ -275 +261 @@
     glColor3f(1.0, 1.0, 1.0);
     glEnd();
-    
-    /* draw black border 
+
+    /* draw black border
     glBegin(GL_QUADS);
     glColor3f(0.0, 0.0, 0.0);
@@ -285 +271 @@
     glColor3f(1.0, 1.0, 1.0);
     glEnd();
-    
+
   */
 
   GraphicsEngine::leave2DMode();
 
-  SDL_GL_SwapBuffers();              
-}
- 
-
+  SDL_GL_SwapBuffers();
+}
+
+

orxonox/trunk/src/glmenu/glmenu_imagescreen.h

@@ -1 @@
-/*! 
+/*!
     \file glmenu_imagescreen.h
     \brief class to display a LoadScreen
@@ -16 +16 @@
 
  public:
-  GLMenuImageScreen ();
-  GLMenuImageScreen (const TiXmlElement* root);
+  GLMenuImageScreen (const TiXmlElement* root = NULL);
   void loadParams(const TiXmlElement* root);
   virtual ~GLMenuImageScreen ();
 
-  void init ();
+  void draw ();
 
-  void draw ();
-  
   void setBackgroundImage(const char* backImageName);
   void setPosition(float offsetX, float offsetY);