Changeset 9869 in orxonox.OLD for trunk/src/lib/gui/gl/glmenu

Timestamp:

Oct 3, 2006, 12:19:30 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: merged the new_class_id branche back to the trunk.
merged with command:
svn merge ​https://svn.orxonox.net/orxonox/branches/new_class_id trunk -r9683:HEAD
no conflicts… puh..

Location:

trunk/src/lib/gui/gl/glmenu

Files:

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

trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.cc

@@ -24 +24 @@
 #include "util/loading/factory.h"
 #include "util/loading/load_param.h"
-
-CREATE_FACTORY(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
-
+#include "debug.h"
+
+#include "class_id_DEPRECATED.h"
+ObjectListDefinitionID(GLMenuImageScreen, CL_GLMENU_IMAGE_SCREEN);
+CREATE_FACTORY(GLMenuImageScreen);
 
 /**
@@ -33 +35 @@
 GLMenuImageScreen::GLMenuImageScreen(const TiXmlElement* root)
 {
-  this->setClassID(CL_GLMENU_IMAGE_SCREEN, "GLMenuImageScreen");
+  this->registerObject(this, GLMenuImageScreen::_objectList);
   this->setName("GLMenuLoadScreen");
   // Select Our VU Meter Background Texture
@@ -58 +60 @@
 {
   LoadParam(root, "BackgroundImage", this, GLMenuImageScreen, setBackgroundImage)
-    .describe("sets the image to load onto the loadscreen");
+  .describe("sets the image to load onto the loadscreen");
 
   LoadParam(root, "BackgroundPS", this, GLMenuImageScreen, setPosScale)
-    .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY");
+  .describe("The Position and Scale of the Background Image in %(0-1.0). PosX, PosY, SizeX, SizeY");
 
   LoadParam(root, "BarImage", this, GLMenuImageScreen, setBarImage)
-    .describe("sets the image of the LoadingBar");
+  .describe("sets the image of the LoadingBar");
 
   LoadParam(root, "BarPS", this, GLMenuImageScreen, setBarPosScale)
-    .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY");
+  .describe("The Position and Scale of the Loading Bar in %(0-1.0). PosX, PosY, SizeX, SizeY");
 
   LoadParam(root, "ElementCount", this, GLMenuImageScreen, setMaximum)
-    .describe("The Count of elements to load into the bar (this is only a maximum value)");
+  .describe("The Count of elements to load into the bar (this is only a maximum value)");
 }
 

trunk/src/lib/gui/gl/glmenu/glmenu_imagescreen.h

@@ -15 +15 @@
 class GLMenuImageScreen : public BaseObject
 {
-
+  ObjectListDeclaration(GLMenuImageScreen);
 public:
   GLMenuImageScreen (const TiXmlElement* root = NULL);
@@ -33 +33 @@
   void setMaximum (int maxValue);
   /** @returns the maximum of countable steps*/
-  inline int GLMenuImageScreen::getMaximum() const { return this->maxValue; };
+  inline int getMaximum() const { return this->maxValue; };
 
   void setValue (int currentValue);