Changeset 5653 in orxonox.OLD

Timestamp:

Nov 20, 2005, 6:43:58 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: further cleanup

Location:

trunk/src

Files:

• lib/graphics/light.cc (modified) (1 diff)
• lib/particles/particle_emitter.cc (modified) (1 diff)
• util/loading/load_param.cc (modified) (3 diffs)
• util/loading/load_param.h (modified) (1 diff)
• world_entities/weapons/weapon_manager.cc (modified) (2 diffs)

trunk/src/lib/graphics/light.cc

@@ -258 +258 @@
 void LightManager::loadParams(const TiXmlElement* root)
 {
-  LoadParam<LightManager>(root, "Lights", this, &LightManager::loadLights)
+  LoadParamXML(root, "Lights", this, LightManager, loadLights)
       .describe("an XML-Element to load lights from.");
 
-  LoadParam<LightManager>(root, "ambient-color", this, &LightManager::setAmbientColor)
+  LoadParamNEW(root, "ambient-color", this, LightManager, setAmbientColor)
       .describe("sets the ambient Color of the Environmental Light");
 }

trunk/src/lib/particles/particle_emitter.cc

@@ -117 +117 @@
 
 
-  LoadParam<ParticleEmitter>(root, "emission-direction", this, &ParticleEmitter::setDirection);
+  LoadParamNEW(root, "emission-direction", this, ParticleEmitter, setDirection);
 }
 

trunk/src/util/loading/load_param.cc

@@ -107 +107 @@
 }
 
+/**
+ * Constructs a new LoadParameter
+ * @param root the XML-element to load this Parameter from
+ * @param paramName the Parameter to load
+ * @param object the BaseObject, to load this parameter on to (will be cast to executor's Parameter)
+ * @param executor the Executor, that executes the loading procedure.
+ */
 LoadParamBase::LoadParamBase(const TiXmlElement* root, const char* paramName, BaseObject* object, const Executor& executor)
 {
@@ -123 +130 @@
 }
 
-
+/**
+ * This is a VERY SPECIAL deconsrtuctor.
+ * It is made, so that it loads the Parameters on destruction.
+ * meaning, if an Executor a valid Object exist, and all
+ * Execution-Conditions are met, they are executed here.
+ */
 LoadParamBase::~LoadParamBase()
 {
   if (likely(this->executor != NULL))
   {
-    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");
+      PRINTF(4)("Loading '%s' with Parameters '%s' onto: '%s'(%s)\n", this->paramName, this->loadString, this->object->getName(), this->object->getClassName());
       this->executor->execute(this->object, this->loadString);
     }
-    printf ("\n");
     delete this->executor;
   }
@@ -142 +152 @@
 }
 
-
+/**
+ * set the default values of the executor
+ * @param count how many default values to set.
+ * @param ... the default values !! must be at least count parameters!!
+ */
 LoadParamBase* LoadParamBase::defaultValues(unsigned int count, ...)
 {

trunk/src/util/loading/load_param.h

@@ -284 +284 @@
 #include "functor_list.h"
 #undef FUNCTOR_LIST
-
-  //! 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)
-  : LoadParamBase(root, pt2Object, paramName, 1, multi, NULL, "XML")
-  {
-    if (root != NULL)
-    {
-      const TiXmlElement* elem = root->FirstChildElement(paramName);
-      if (elem != NULL)
-        (*pt2Object.*function)(elem);
-      else
-        PRINTF(4)("%s of %s is empty\n", paramName, pt2Object->getClassName());
-    }
-    else
-      PRINTF(4)("Not loaded parameter %s of %s\n", paramName, pt2Object->getClassName());
-  }
-
-  //LoadParamPT(l_XML_ELEM);
 };
 

trunk/src/world_entities/weapons/weapon_manager.cc

@@ -124 +124 @@
   LOAD_PARAM_START_CYCLE(root, element);
 
-  LoadParam<WeaponManager>(element, "weapons", this, &WeaponManager::loadWeapons)
+
+  LoadParamXML(element, "weapons", this, WeaponManager, loadWeapons)
       .describe("loads Weapons");
-      // LoadParam<WeaponManager>(root, "Weapon", this, &WeaponManager::addWeapon);
 
   LOAD_PARAM_END_CYCLE(element);
@@ -140 +140 @@
 
   Weapon* newWeapon = dynamic_cast<Weapon*>(Factory::getFirst()->fabricate(element));
-
+  /// @todo implement this !!