Changeset 3428 in orxonox.OLD

Timestamp:

Mar 1, 2005, 12:18:22 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: GLMenuImageScreen: singletonClass has private constructor.

Location:

orxonox/trunk/src

Files:

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

orxonox/trunk/src/glmenu_imagescreen.cc

@@ -18 +18 @@
 
 #include "glmenu_imagescreen.h"
-#include "importer/texture.h"
+
 #include "importer/material.h"
 
@@ -156 +156 @@
   int barHeight = 30;
 
-  int val = ((float)this->currentValue/(float)this->maxValue) * barWidth;
+  int val = (int)((float)this->currentValue/(float)this->maxValue) * barWidth;
 
   glMatrixMode(GL_PROJECTION);

orxonox/trunk/src/glmenu_imagescreen.h

@@ -9 +9 @@
 
 #include "stdincl.h"
-
 class Texture;
 class Material;
@@ -15 +14 @@
 class GLMenuImageScreen : public BaseObject {
 
+ private:
+  GLMenuImageScreen ();
+
  public:
-  GLMenuImageScreen ();
   ~GLMenuImageScreen ();
 

orxonox/trunk/src/world.cc

@@ -149 +149 @@
   
   //GLMenuImageScreen* 
-  this->glmis = new GLMenuImageScreen();
+  this->glmis = GLMenuImageScreen::getInstance();
   this->glmis->init();
   this->glmis->setMaximum(10);