Changeset 4860 in orxonox.OLD for orxonox

Timestamp:

Jul 14, 2005, 1:04:21 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: made bool's loadable

Location:

orxonox/trunk/src

Files:

• lib/graphics/render2D/element_2d.cc (modified) (1 diff)
• util/loading/load_param.cc (modified) (1 diff)
• util/loading/load_param.h (modified) (3 diffs)

orxonox/trunk/src/lib/graphics/render2D/element_2d.cc

@@ -78 +78 @@
       .describe("the _relative_ position (away from alignment) this 2d-element shows");
 
-//  LoadParam<Element2D>(root, "visibility", this, &Element2D::setVisibility)
-//      .describe("if the Element is visible or not");
+  LoadParam<Element2D>(root, "visibility", this, &Element2D::setVisibility)
+      .describe("if the Element is visible or not");
 }
 

orxonox/trunk/src/util/loading/load_param.cc

@@ -113 +113 @@
 }
 
+/**
+ * checks if the input was a Bool
+ * @param BOOL a String that holds a bool: must be one of those: 1,0,true,false,TRUE,FALSE
+ * @param defaultValue a default value that is set, if BOOL is corrupt
+ * @return returns the bool, if BOOL was correct otherwise defaultValue
+ */
+bool isBool(const char* BOOL, bool defaultValue)
+{
+  if(!strcmp(BOOL, "1") || !strcmp( BOOL,"true") || !strcmp(BOOL,"TRUE"))
+    return true;
+  else if (!strcmp(BOOL, "0") || !strcmp( BOOL,"false") || !strcmp(BOOL,"FALSE"))
+    return false;
+  else
+    return defaultValue;
+
+}
 
 int isInt(const char* INT, int defaultValue)

orxonox/trunk/src/util/loading/load_param.h

@@ -70 +70 @@
 */
 
+#define l_BOOL_TYPE        bool                 //!< The type of an BOOL
+#define l_BOOL_FUNC        isBool               //!< The function to call to parse BOOL
+#define l_BOOL_NAME        "bool"               //!< The name of an BOOL
+#define l_BOOL_DEFAULT     0                    //!< a default Value for an BOOL
+
+
 #define l_INT_TYPE         int                  //!< The type of an INT
 #define l_INT_FUNC         isInt                //!< The function to call to parse INT
 #define l_INT_NAME         "int"                //!< The name of an INT
-#define l_INT_DEFAULT      0                    //!< a default Value for an INT
+#define l_INT_DEFAULT      true                 //!< a default Value for an INT
 
 #define l_LONG_TYPE        long                 //!< The type of a LONG
@@ -255 +261 @@
 *** HELPER FUNCTIONS ***
 ***********************/
+bool          isBool(const char* BOOL, bool defaultValue);
 int           isInt(const char* INT, int defaultValue);
 float         isFloat(const char* FLOAT, float defaultValue);
@@ -353 +360 @@
   LoadParam4(l_STRING, l_STRING, l_STRING, l_STRING);
 
+  //! makes functions with one bool loadeable
+  LoadParam1(l_BOOL);
+
   //! makes functions with one int loadable
   LoadParam1(l_INT);