Changeset 5708 in orxonox.OLD

Timestamp:

Nov 22, 2005, 3:31:30 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: newer data-revision

Location:

trunk

Files:

• scripts/gentoo/orxonox-0.3.2_alpha-r5702.ebuild (modified) (1 diff)
• src/lib/physics/fields/field.cc (modified) (1 diff)
• src/util/loading/load_param.cc (modified) (4 diffs)
• src/util/loading/load_param.h (modified) (1 diff)
• src/util/loading/load_param_description.h (modified) (1 diff)
• src/world_entities/world_entity.cc (modified) (2 diffs)

trunk/scripts/gentoo/orxonox-0.3.2_alpha-r5702.ebuild

@@ -5 +5 @@
 inherit eutils games
 
-DATA_VERSION=102
+DATA_VERSION=106
 
 DESCRIPTION="orxonox is an open-source 3D-action game programmed in C++, OpenGL, OpenAL and SDL"

trunk/src/lib/physics/fields/field.cc

@@ -62 +62 @@
   LoadParam(root, "magnitude", this, Field, setMagnitude)
       .describe("sets the magnitude of this Field")
-      ->defaultValues(1, 1);
+      .defaultValues(1, 1);
 
   LoadParam(root, "attenuation", this, Field, setAttenuation)

trunk/src/util/loading/load_param.cc

@@ -82 +82 @@
  * @param ... the default values !! must be at least count parameters!!
  */
-CLoadParam* CLoadParam::defaultValues(unsigned int count, ...)
-{
-  if (this == NULL)
-    return NULL;
-
+CLoadParam& CLoadParam::defaultValues(unsigned int count, ...)
+{
   va_list values;
   va_start(values, count);
@@ -93 +90 @@
   this->executor->defaultValues(count, values);
 
-  return this;
+  return *this;
 }
 
@@ -102 +99 @@
  * @returns a pointer to itself.
 */
-CLoadParam* CLoadParam::describe(const char* descriptionText)
+CLoadParam& CLoadParam::describe(const char* descriptionText)
 {
   if (LoadClassDescription::parametersDescription && this->paramDesc && !this->paramDesc->getDescription())
@@ -108 +105 @@
       this->paramDesc->setDescription(descriptionText);
     }
-  return this;
+  return *this;
 }
 

trunk/src/util/loading/load_param.h

@@ -91 +91 @@
     ~CLoadParam();
 
-    CLoadParam* describe(const char* descriptionText);
-    CLoadParam* defaultValues(unsigned int count, ...);
+    CLoadParam& describe(const char* descriptionText);
+    CLoadParam& defaultValues(unsigned int count, ...);
+    CLoadParam& attribute(const char* attributeName, const Executor& executor);
 
 

trunk/src/util/loading/load_param_description.h

@@ -45 +45 @@
 
   void print() const;
+
  private:
   char*         paramName;             //!< The name of the parameter.

trunk/src/world_entities/world_entity.cc

@@ -78 +78 @@
   LoadParam(root, "model", this, WorldEntity, loadModel)
       .describe("the fileName of the model, that should be loaded onto this world-entity. (must be relative to the data-dir)")
-      ->defaultValues(2, NULL, 1.0f);
+      .defaultValues(2, NULL, 1.0f);
 
 }
@@ -119 +119 @@
   {
     PRINTF(4)("creating obb tree\n");
-    
-    
+
+
     this->obbTree = new OBBTree(depth, (sVec3D*)this->model->getVertexArray(), this->model->getVertexCount());
     return true;