Changeset 8949 in orxonox.OLD for branches

Timestamp:

Jun 30, 2006, 1:45:59 PM (18 years ago)

Author:

stefalie

Message:

mountain_lake: changed saveParams method and MappedWater is now scritable

File:

• branches/mountain_lake/src/world_entities/environments/mapped_water.cc (modified) (3 diffs)

branches/mountain_lake/src/world_entities/environments/mapped_water.cc

@@ -23 +23 @@
 #include "glgui.h"
 #include "shell_command.h"
+#include "script_class.h"
 
 CREATE_FACTORY(MappedWater, CL_MAPPED_WATER);
@@ -28 +29 @@
 SHELL_COMMAND(gui, MappedWater, openGui);
 SHELL_COMMAND(output, MappedWater, saveParams);
+
+CREATE_SCRIPTABLE_CLASS(MappedWater, CL_MAPPED_WATER,
+                        addMethod("waterUV", ExecutorLua2<MappedWater, float, float>(&MappedWater::fadeWaterUV))
+                      ->addMethod("waterFlow", ExecutorLua2<MappedWater, float, float>(&MappedWater::fadeWaterFlow))
+                      ->addMethod("shineSize", ExecutorLua2<MappedWater, float, float>(&MappedWater::fadeShineSize))
+                      ->addMethod("shineStrength", ExecutorLua2<MappedWater, float, float>(&MappedWater::fadeShineStrength))
+                      ->addMethod("reflStrength", ExecutorLua2<MappedWater, float, float>(&MappedWater::fadeReflStrength))
+                      ->addMethod("refraction", ExecutorLua2<MappedWater, float, float>(&MappedWater::fadeRefraction))
+                      ->addMethod("waterHeight", ExecutorLua2<MappedWater, float, float>(&MappedWater::fadeWaterHeight))
+                      ->addMethod("waterColor", ExecutorLua4<MappedWater, float, float, float, float>(&MappedWater::fadeWaterColor)));
+
 
 /**
@@ -324 +336 @@
 void MappedWater::saveParams()
 {
-  PRINTF(0)("MappedWater XML Code:\n<MappedWater>\n");
-
-  PRINTF(0)("  <waterpos>%f, %f, %f</waterpos>\n", this->waterVerts[0], this->waterHeight, this->waterVerts[1]);
-  PRINTF(0)("  <watersize>%f, %f</watersize>\n", this->xWidth, this->zWidth);
-  PRINTF(0)("  <wateruv>%f</wateruv>\n", this->waterUV);
-  PRINTF(0)("  <waterflow>%f</waterflow>\n", this->waterFlow);
-  PRINTF(0)("  <lightpos>%f, %f, %f</lightpos>\n", this->lightPos.x, this->lightPos.y, this->lightPos.z);
-  PRINTF(0)("  <waterangle>%f</waterangle>\n", this->waterAngle);
-  PRINTF(0)("  <normalmapscale>%f</normalmapscale>\n", this->kNormalMapScale);
-  PRINTF(0)("  <shinesize>%f</waterpos>\n", this->shineSize);
-  PRINTF(0)("  <shinestrength>%f</shinestrength>\n", this->shineStrength);
-  PRINTF(0)("  <reflstrength>%f</reflstrength>\n", this->reflStrength);
-  PRINTF(0)("  <refraction>%f</refraction>\n", this->refraction);
-  PRINTF(0)("  <watercolor>%f, %f, %f</watercolor>\n", this->waterColor.x, this->waterColor.y, this->waterColor.z);
-
-  PRINTF(0)("</MappedWater>\n");
+  // it's not too nice, but it works fine
+  PRINTF(0)("\nMappedWater XML Code:\n<MappedWater>\n  <waterpos>%f, %f, %f</waterpos>\n  <watersize>%f, %f</watersize>\n  <wateruv>%f</wateruv>\n  <waterflow>%f</waterflow>\n  <lightpos>%f, %f, %f</lightpos>\n  <waterangle>%f</waterangle>\n  <normalmapscale>%f</normalmapscale>\n  <shinesize>%f</waterpos>\n  <shinestrength>%f</shinestrength>\n  <reflstrength>%f</reflstrength>\n  <refraction>%f</refraction>\n  <watercolor>%f, %f, %f</watercolor>\n</MappedWater>\n", this->waterVerts[0], this->waterHeight, this->waterVerts[1], this->xWidth, this->zWidth, this->waterUV, this->waterFlow, this->lightPos.x, this->lightPos.y, this->lightPos.z, this->waterAngle, this->kNormalMapScale, this->shineSize, this->shineStrength, this->reflStrength, this->refraction, this->waterColor.x, this->waterColor.y, this->waterColor.z);
 }