Changeset 4283 in orxonox.OLD for orxonox/branches/physics/src/glmenu/glmenu_imagescreen.h

Timestamp:

May 24, 2005, 10:32:34 PM (19 years ago)

Author:

bensch

Message:

orxonox/branches/physics: merged the trunk back to branches/physics
merged with command
svn merge -r 4223:HEAD ../../trunk/ .
conflicts additively included

File:

• orxonox/branches/physics/src/glmenu/glmenu_imagescreen.h (modified) (2 diffs)

orxonox/branches/physics/src/glmenu/glmenu_imagescreen.h

@@ -17 +17 @@
  public:
   GLMenuImageScreen ();
-  GLMenuImageScreen (TiXmlElement* root);
-  void load(TiXmlElement* root);
+  GLMenuImageScreen (const TiXmlElement* root);
+  void loadParams(const TiXmlElement* root);
   virtual ~GLMenuImageScreen ();
 
@@ -28 +28 @@
   void setPosition(float offsetX, float offsetY);
   void setScale (float scaleX, float scaleY);
+  void setPosScale(float offsetX, float offsetY, float scaleX, float scaleY);
 
   void setBarImage(const char* barImage);