Changeset 3430 in orxonox.OLD for orxonox/branches/trackManager/src/glmenu_imagescreen.h

Timestamp:

Mar 1, 2005, 9:50:30 AM (20 years ago)

Author:

bensch

Message:

orxonox/branches/trackManager: merged trunk back to trackManager
merged with command
svn merge -r 3369:HEAD trunk/ branches/trackManager
resoloved conflicts in favor of the trunk.

Location:

orxonox/branches/trackManager

Files:

• . (modified) (1 prop)
• src/glmenu_imagescreen.h (modified) (3 diffs)

orxonox/branches/trackManager/src/glmenu_imagescreen.h

@@ -9 +9 @@
 
 #include "stdincl.h"
-
 class Texture;
+class Material;
 
 class GLMenuImageScreen : public BaseObject {
 
+ private:
+  GLMenuImageScreen ();
+
  public:
-  GLMenuImageScreen ();
   ~GLMenuImageScreen ();
+
+  static GLMenuImageScreen* getInstance();
+
+  static GLMenuImageScreen* singletonRef;
 
   void init ();
@@ -28 +34 @@
   void setSize (float height, float width);
   
-  void setMaximum (int maxStep);
+  void setMaximum (int maxValue);
   int getMaximum ();
   void setValue (int currentValue);
@@ -35 +41 @@
 
  private:
-  char* backImageName;       //! the name of the file of the background image
-  float height, width;       //! hight and width of the image
-  float offsetX, offsetY;    //! offset of the image from left and up
-  Texture* backTex;          //! background texture
-  int currentValue;          //! the current count of step() calls fired yet
-  int maxStep;               //! total count of steps
+  char* backImageName;       //!< the name of the file of the background image
+  float height, width;       //!< hight and width of the image
+  float offsetX, offsetY;    //!< offset of the image from left and up
+  Material* backMat;         //!< Background Material.
+  int currentValue;          //!< the current count of step() calls fired yet
+  int maxValue;              //!< total count of steps
 
 };