diff options
author | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-04-03 16:11:22 +0000 |
---|---|---|
committer | Michael Pohoreski <ptolemy@lindenlab.com> | 2020-04-03 16:11:22 +0000 |
commit | eb4ceb533dd8e27c4b0b6f972c84f1c5783387b8 (patch) | |
tree | 5810370c1efec3ea07257808686174d13d5c5361 | |
parent | 6058c49bb4c4753712d958e5436348218439b911 (diff) | |
parent | a3f0913b4bcd23fd1fad2fa9ad6563d55abee4da (diff) |
Merged in SL-12852 (pull request #57)
SL-12852 Cleanup for readability
Approved-by: Dave Houlton <euclid@lindenlab.com>
-rw-r--r-- | indra/newview/app_settings/shaders/class1/environment/waterF.glsl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl index d1e6c7da1a..d370997123 100644 --- a/indra/newview/app_settings/shaders/class1/environment/waterF.glsl +++ b/indra/newview/app_settings/shaders/class1/environment/waterF.glsl @@ -74,13 +74,13 @@ void main() vec3 viewVec = normalize(view.xyz); //get wave normals - //get wave normals - vec3 wave1_a = texture2D(bumpMap, vec2(refCoord.w, view.w)).xyz*2.0-1.0; + vec2 bigwave = vec2(refCoord.w, view.w); + vec3 wave1_a = texture2D(bumpMap, bigwave ).xyz*2.0-1.0; vec3 wave2_a = texture2D(bumpMap, littleWave.xy).xyz*2.0-1.0; vec3 wave3_a = texture2D(bumpMap, littleWave.zw).xyz*2.0-1.0; - vec3 wave1_b = texture2D(bumpMap2, vec2(refCoord.w, view.w)).xyz*2.0-1.0; + vec3 wave1_b = texture2D(bumpMap2, bigwave ).xyz*2.0-1.0; vec3 wave2_b = texture2D(bumpMap2, littleWave.xy).xyz*2.0-1.0; vec3 wave3_b = texture2D(bumpMap2, littleWave.zw).xyz*2.0-1.0; |