Changeset 8617 in orxonox.OLD for branches/water/src/world_entities/environments/mapped_water.h

Timestamp:

Jun 20, 2006, 12:58:02 PM (19 years ago)

Author:

stefalie

Message:

water: minor cleanup and the waterflow doesnt depend on the framerate anymore

File:

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

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

@@ -44 +44 @@
     void setWaterPos(float x, float y, float z) { this->waterPos = Vector(x,y,z); };
     void setWaterSize(float x, float z) { this->xWidth = x; this->zWidth = z; };
-    void setWaterUV(float uv) { this->g_WaterUV = uv; };
-    void setWaterFlow(float flow) { this->g_WaterFlow = flow; };
+    void setWaterUV(float uv) { this->waterUV = uv; };
+    void setWaterFlow(float flow) { this->waterFlow = flow; };
+    void setNormalMapScale(float scale) { this->kNormalMapScale = scale; };
 
   private:
@@ -56 +57 @@
 
     float               move;                       //!< textures coords, speeds, positions for the shaded textures....
-    float               move2;                      //!<
-    float               g_WaterUV;                  //!<
-    float               g_WaterFlow;                //!<
-    float               refrUV;                     //!<
-    float               normalUV;                   //!<
-    float               kNormalMapScale;            //!<
+    float               move2;
+    float               waterUV;                    //!< size of the waves
+    float               waterFlow;                  //!< speed of the water
+    float               normalUV;
+    float               kNormalMapScale;
 
     int                 textureSize;                //!< height and width of the texture
@@ -67 +67 @@
     Shader*             shader;
     Shader::Uniform*    cam_uni;                    //!< uniform that is used for the camera position
-
-    //FogEffect*          fog;
-
 };
 
-#endif  /* _MAPPED_WATER_H */
+#endif