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

Timestamp:

Nov 20, 2005, 6:32:39 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new LoadParam procedure with all NON-cycling load-options, and it works perfectly (on first sight

now going to make the same for cycling LoadOptions

Location:

trunk/src/util/loading

Files:

• load_param.cc (modified) (2 diffs)
• load_param.h (modified) (2 diffs)

trunk/src/util/loading/load_param.cc

@@ -110 +110 @@
 {
   this->loadString = grabParameter(root, paramName);
+  this->paramName = paramName;
   this->object = object;
   if (root != NULL)
@@ -127 +128 @@
   if (likely(this->executor != NULL))
   {
-   if (likely(this->object != NULL))
-     this->executor->execute(this->object, this->loadString);
-
+    printf("%s: %s", this->paramName, this->loadString);
+    if (likely(this->object != NULL && this->executor != NULL) &&
+        ( this->loadString != NULL ||
+         ((this->executor->getType() & Executor_NoLoadString) == Executor_NoLoadString)))
+    {
+      printf(" - exec");
+      this->executor->execute(this->object, this->loadString);
+    }
+    printf ("\n");
     delete this->executor;
   }
 
+}
+
+
+LoadParamBase* LoadParamBase::defaultValues(unsigned int count, ...)
+{
+  if (this == NULL)
+    return NULL;
+
+  va_list values;
+  va_start(values, count);
+
+  assert(executor != NULL);
+  this->executor->defaultValues(count, values);
+
+  return this;
 }
 

trunk/src/util/loading/load_param.h

@@ -22 +22 @@
 #define _LOAD_PARAM_H
 
-#include "functor_list.h"
-
-#include "debug.h"
-
-#include "factory.h"
-#include "substring.h"
-#include "tinyxml.h"
+#include "base_object.h"
+
 #include "executor/executor.h"
 #include "executor/executor_specials.h"
@@ -74 +69 @@
 
   protected:
+    bool                     withLoadString;       //!< If we need the loadString to execute this.
     Executor*                executor;
     BaseObject*              object;
+    const char*              paramName;
 
     LoadClassDescription*    classDesc;            //!< The LoadClassDescription of this LoadParameter