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

Timestamp:

May 30, 2006, 4:48:20 PM (18 years ago)

Author:

stefalie

Message:

branches/water: …

File:

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

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

@@ -10 +10 @@
 #include "world_entity.h"
 #include "material.h"
-#include "texture.h"
 #include "shader.h"
 
@@ -34 +33 @@
 
   private:
-    float           waterHeight;                //!< y-coord of the Water
-    Material        mat;
-    float           move;
-    float           g_WaterUV;          //!< The scale for the water textures
-    float           kNormalMapScale;
-    float           g_WaterFlow;
-    float           move2;
-    float           refrUV;
-    float           normalUV;
+    float               waterHeight;                //!< y-coord of the Water
 
-    int             textureSize;                //!< size of the texture
-    Shader*         shader;
+    float               move;                       //!< textures coords, speeds, positions for the shaded textures....
+    float               move2;                      //!<
+    float               g_WaterUV;                  //!<
+    float               g_WaterFlow;                //!<
+    float               refrUV;                     //!<
+    float               normalUV;                   //!<
+    float               kNormalMapScale;            //!<
+
+    int                 textureSize;                //!< size of the texture
+    Material            mat;
+    Shader*             shader;
+    Shader::Uniform*    uni;
 
 };