Changeset 4734 in orxonox.OLD for orxonox/trunk/src/util

Timestamp:

Jun 29, 2005, 3:05:47 PM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: light loadable

Location:

orxonox/trunk/src/util/loading

Files:

• load_param.cc (modified) (3 diffs)
• load_param.h (modified) (4 diffs)

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

@@ -114 +114 @@
 
 
-int isInt(const char* Int, int defaultValue)
+int isInt(const char* INT, int defaultValue)
 {
   char* endPtr = NULL;
-  int result = strtol(Int, &endPtr, 10);
-
-  if ( endPtr >= Int && endPtr < Int + strlen(Int))
+  int result = strtol(INT, &endPtr, 10);
+
+  if ( endPtr >= INT && endPtr < INT + strlen(INT))
     return defaultValue;
   else
@@ -125 +125 @@
 }
 
-float isFloat(const char* Float, float defaultValue)
+float isFloat(const char* FLOAT, float defaultValue)
 {
   char* endPtr = NULL;
-  double result = strtod(Float, &endPtr);
-
-  if ( endPtr >= Float && endPtr < Float + strlen(Float))
+  double result = strtod(FLOAT, &endPtr);
+
+  if ( endPtr >= FLOAT && endPtr < FLOAT + strlen(FLOAT))
     return defaultValue;
   else
@@ -136 +136 @@
 }
 
-const char* isString(const char* string, const char* defaultValue)
-{
-  if (string != NULL)
-    return string;
+const Vector& isVector(const char* VECTOR, const Vector& defaultValue)
+{
+
+
+}
+
+const char* isString(const char* STRING, const char* defaultValue)
+{
+  if (STRING != NULL)
+    return STRING;
   else
     return defaultValue;

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

@@ -23 +23 @@
 
 #include "base_object.h"
+#include "vector.h"
 #include "factory.h"
 #include "debug.h"
@@ -69 +70 @@
 #define l_FLOAT_NAME       "float"              //!< The name of a FLOAT
 #define l_FLOAT_DEFAULT    0.0                  //!< a default Value for a FLOAT
+
+//#define l_VECTOR_TYPE      const Vector&        //!< The type of a VECTOR
+//#define l_VECTOR_FUNC      isVector             //!< The function to parse a VECTOR
+//#define l_VECTOR_NAME      "Vector[x/y/z]"      //!< The name of a VECTOR
+//#define l_VECTOR_DEFAULT   Vector(0,0,0)        //!< Default value for a VECTOR
 
 #define l_STRING_TYPE      const char*          //!< The type of a STRING
@@ -230 +236 @@
 *** HELPER FUNCTIONS ***
 ***********************/
-int           isInt(const char* Int, int defaultValue);
-float         isFloat(const char* Float, float defaultValue);
-const char*   isString(const char* string, const char* defaultValue);
+int           isInt(const char* INT, int defaultValue);
+float         isFloat(const char* FLOAT, float defaultValue);
+//const Vector& isVector(const char* VECTOR, const Vector& defaultValue);
+const char*   isString(const char* STRING, const char* defaultValue);
+
 //TiXmlEmlemnt* isXmlElem(const)
 
@@ -346 +354 @@
   LoadParam5(l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT, l_FLOAT);
 
+  //! makes functions with one Vector loadable
+  //LoadParam1(l_VECTOR);
+
   // loads a Ti-XML-element
   LoadParam(const TiXmlElement* root, const char* paramName, T* pt2Object, void(T::*function)(const TiXmlElement*), bool multi = false)