Changeset 8037 in orxonox.OLD for trunk/src/world_entities/environments/mapped_water.h

Timestamp:

May 31, 2006, 4:52:34 PM (19 years ago)

Author:

bensch

Message:

trunk: merged the water back
merged with command
svn merge -r7798:HEAD ​https://svn.orxonox.net/orxonox/branches/water .

conflicts are all resolved

File:

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

trunk/src/world_entities/environments/mapped_water.h

@@ -10 +10 @@
 #include "world_entity.h"
 #include "material.h"
-#include "texture.h"
 #include "shader.h"
 
@@ -20 +19 @@
 
     void loadParams(const TiXmlElement* root);
+
 
     void activateReflection();
@@ -31 +31 @@
 
   private:
+    void setLightPosition(float x, float y, float z) { this->lightPos = Vector(x,y,z); };
     void setHeight(float height);
 
   private:
-    float           waterHeight;       //!< y-coord of the Water
-    Material        mat;
+    float               waterHeight;                //!< y-coord of the Water
 
-    Texture         texture;
-    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
+    Vector              lightPos;
+    Material            mat;
+    Shader*             shader;
+    Shader::Uniform*    cam_uni;                        //!< uniform that is used for the camera position
 
 };