Changeset 3939 for data/trunk/shaders

Timestamp:

Jun 29, 2006, 11:45:49 AM (18 years ago)

Author:

bensch

Message:

data/trunk: merged the data from the atmos branche back

Location:

data/trunk/shaders

Files:

• cloud.frag (copied) (copied from data/branches/atmospheric_engine/shaders/cloud.frag)
• cloud.vert (copied) (copied from data/branches/atmospheric_engine/shaders/cloud.vert)
• mapped_water.frag (modified) (2 diffs)
• sky.frag (copied) (copied from data/branches/atmospheric_engine/shaders/sky.frag)
• sky.vert (copied) (copied from data/branches/atmospheric_engine/shaders/sky.vert)

data/trunk/shaders/mapped_water.frag

@@ -10 +10 @@
 uniform sampler2D dudvMap;
 uniform sampler2D depthMap;
+uniform float kShine;
+uniform float shineStrength;
+uniform float reflStrength;
+uniform float kRefraction;
 uniform vec4 waterColor;
 
 void main()
 {
-        const float kShine = 128.0;
         const float kDistortion = 0.015;
-        const float kRefraction = 0.009;
 
         vec4 distOffset = texture2D(dudvMap, normCoords.xy) * kDistortion;
@@ -50 +52 @@
         vec4 specular = vec4(pow(intensity, kShine));
 
-        gl_FragColor = refractionColor + reflectionColor + specular; 
+        gl_FragColor = refractionColor + reflStrength * reflectionColor + shineStrength * specular; 
 }