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

Timestamp:

Jun 20, 2006, 2:18:30 PM (19 years ago)

Author:

stefalie

Message:

water: cleanup and waste of time, but i got nothing better to do

File:

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

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

@@ -1 +1 @@
 /*!
  * @file mapped_water.h
- *
+ *  worldentity for flat, cool looking, mapped water
 */
-/* example input in .oxw file with the standard values
+/*! example input in .oxw file with the standard values
 <MappedWater>
   <waterpos>0,0,0</waterpos>
@@ -16 +16 @@
 
 
-
 #ifndef _MAPPED_WATER_H
 #define _MAPPED_WATER_H
@@ -23 +22 @@
 #include "material.h"
 #include "shader.h"
-#include "effects/fog_effect.h"
 
 
@@ -53 +51 @@
 
   private:
+    void initParams();
+    void initTextures();
     void initShaders();
 
   private:
-    Vector              waterPos;                   //!< position of the water
-    float               xWidth, zWidth;             //!< size of the water quad
-    Vector              lightPos;                   //!< position of the light that is used to render the reflection
-    float               waterAngle;                 //!< defines how much the water will be turned around the point waterPos
+    Vector              waterPos;               //!< position of the water
+    float               xWidth, zWidth;         //!< size of the water quad
+    Vector              lightPos;               //!< position of the light that is used to render the reflection
+    float               waterAngle;             //!< defines how much the water will be turned around the point waterPos
 
-    float               move;                       //!< textures coords, speeds, positions for the shaded textures....
+    float               move;                   //!< textures coords, speeds, positions for the shaded textures....
     float               move2;
-    float               waterUV;                    //!< size of the waves
-    float               waterFlow;                  //!< speed of the water
+    float               waterUV;                //!< size of the waves
+    float               waterFlow;              //!< speed of the water
     float               normalUV;
     float               kNormalMapScale;
 
-    int                 textureSize;                //!< height and width of the texture
+    int                 textureSize;            //!< height and width of the texture
     Material            mat;
     Shader*             shader;
-    Shader::Uniform*    cam_uni;                    //!< uniform that is used for the camera position
+    Shader::Uniform*    cam_uni;                //!< uniform that is used for the camera position
 };