Changeset 7198 in orxonox.OLD for trunk/src/world_entities

Timestamp:

Mar 8, 2006, 2:30:19 PM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: new Default Values… they now too are in MultiType instead of (count, …) or (count, va_arg) style

Location:

trunk/src/world_entities

Files:

• environments/water.cc (modified) (1 diff)
• spawning_point.cc (modified) (2 diffs)
• test_entity.cc (modified) (1 diff)
• world_entity.cc (modified) (4 diffs)

trunk/src/world_entities/environments/water.cc

@@ -71 +71 @@
   LoadParam(root, "size", this, Water, setSize)
   .describe("the size of the WaterSurface")
-  .defaultValues(2, 1.0f, 1.0f);
+  .defaultValues(1.0f, 1.0f);
 
   LoadParam(root, "resolution", this, Water, setResolution)
   .describe("sets the resolution of the water surface")
-  .defaultValues(2, 10, 10);
+  .defaultValues(10, 10);
 
   LoadParam(root, "height", this, Water, setHeight)
   .describe("the height of the Waves")
-  .defaultValues(1, 0.5f);
+  .defaultValues(0.5f);
 }
 

trunk/src/world_entities/spawning_point.cc

@@ -76 +76 @@
   LoadParam(root, "frequency", this, SpawningPoint, setSpawningFrequency)
   .describe("sets the frequency of the spawning point")
-  .defaultValues(1, 1.0f);
+  .defaultValues(1.0f);
 
 
@@ -82 +82 @@
   LoadParam(root, "randomseed", this, SpawningPoint, setPositionSeed)
       .describe("sets the random position seed (variance in the spawning location around the position)")
-      .defaultValues(1, 0.0f);
+      .defaultValues(0.0f);
 
   /* now load the seed */
 /*  LoadParam(root, "classid", this, SpawningPoint, setSpawningEntity)
       .describe("sets the class id of the entity to spawn")
-      .defaultValues(1, CL_WORLD_ENTITY);*/
+      .defaultValues(CL_WORLD_ENTITY);*/
 }
 

trunk/src/world_entities/test_entity.cc

@@ -73 +73 @@
   LoadParam(root, "md2animation", this, TestEntity, setAnim)
       .describe("sets the animation of the md2 model")
-      .defaultValues(1, 1);
+      .defaultValues(1);
 
 }

trunk/src/world_entities/world_entity.cc

@@ -36 +36 @@
 SHELL_COMMAND(model, WorldEntity, loadModel)
 ->describe("sets the Model of the WorldEntity")
-->defaultValues(2, "models/ships/fighter.obj", 1.0);
+->defaultValues("models/ships/fighter.obj", 1.0);
 
 SHELL_COMMAND(debugEntity, WorldEntity, debugWE);
@@ -99 +99 @@
   LoadParam(root, "md2texture", this, WorldEntity, loadMD2Texture)
   .describe("the fileName of the texture, that should be loaded onto this world-entity. (must be relative to the data-dir)")
-  .defaultValues(1, NULL);
+  .defaultValues("");
 
   // Model Loading
   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(3, NULL, 1.0f, 0);
+  .defaultValues("", 1.0f, 0);
 
   LoadParam(root, "maxHealth", this, WorldEntity, setHealthMax)
   .describe("The Maximum health that can be loaded onto this entity")
-  .defaultValues(1, 1.0f);
+  .defaultValues(1.0f);
 
   LoadParam(root, "health", this, WorldEntity, setHealth)
   .describe("The Health the WorldEntity has at this moment")
-  .defaultValues(1, 1.0f);
+  .defaultValues(1.0f);
 }
 
@@ -438 +438 @@
 void WorldEntity::setHealthWidgetVisibilit(bool visibility)
 {
-    if (visibility)
-    {
-      if (this->healthWidget != NULL)
-        this->healthWidget->show();
-      else
-      {
-        this->createHealthWidget();
-        this->updateHealthWidget();
-        this->healthWidget->show();
-      }
-    }
-    else if (this->healthWidget != NULL)
-      this->healthWidget->hide();
+  if (visibility)
+  {
+    if (this->healthWidget != NULL)
+      this->healthWidget->show();
+    else
+    {
+      this->createHealthWidget();
+      this->updateHealthWidget();
+      this->healthWidget->show();
+    }
+  }
+  else if (this->healthWidget != NULL)
+    this->healthWidget->hide();
 }
 
@@ -595 +595 @@
   {
     SYNCHELP_WRITE_STRING("");
-}*/
+  }*/
 
   return SYNCHELP_WRITE_N;