Changeset 8622 in orxonox.OLD for branches/water/src/world_entities/environments/mapped_water.cc

Timestamp:

Jun 20, 2006, 1:27:38 PM (19 years ago)

Author:

stefalie

Message:

water: cleanup… and hey: the mighty reflection is back

File:

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

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

@@ -32 +32 @@
   this->toList(OM_ENVIRON);
 
-  // the NormalMapScale will be overwritten if its also set in the oxw file
+  // those standardvalues will be overwritten if they're also set in the oxw file
+  this->setWaterPos(0, 0, 0);
+  this->setWaterSize(100, 100);
+  this->setWaterUV(9);
+  this->setWaterFlow(0.08);
+  this->setLightPos(0, 10, 0);
+  this->setWaterAngle(0);
   this->setNormalMapScale(0.25f);
+
 
   if (root != NULL)
@@ -178 +185 @@
   LoadParam(root, "waterpos", this, MappedWater, setWaterPos);
   LoadParam(root, "watersize", this, MappedWater, setWaterSize);
-  LoadParam(root, "lightpos", this, MappedWater, setLightPosition);
+  LoadParam(root, "lightpos", this, MappedWater, setLightPos);
   LoadParam(root, "wateruv", this, MappedWater, setWaterUV);
   LoadParam(root, "waterflow", this, MappedWater, setWaterFlow);
   LoadParam(root, "normalmapscale", this, MappedWater, setNormalMapScale);
+  LoadParam(root, "waterangle", this, MappedWater, setWaterAngle);
 }
 
@@ -193 +201 @@
   glPushMatrix();
   glTranslatef(this->waterPos.x ,0 ,this->waterPos.z);
+  glRotatef(this->waterAngle, 0, 1, 0);
 
   mat.select();