From 6e8964a7887bfeaa69883ed7659319fecf9b3833 Mon Sep 17 00:00:00 2001 From: div0 Date: Mon, 15 Oct 2007 17:27:26 +0000 Subject: [PATCH] make water shaders work as expected; s/r_glsl_water/r_water/ git-svn-id: svn://svn.icculus.org/nexuiz/trunk@2829 f962a42d-fe04-0410-a3ab-8c8b0445ebaa --- data/default.cfg | 2 -- data/high.cfg | 4 ++-- data/low.cfg | 4 ++-- data/med.cfg | 4 ++-- data/menu/data/effects.menu | 2 +- data/normal.cfg | 4 ++-- data/omg.cfg | 4 ++-- data/scripts/water.shader | 10 +++++----- data/ultimate.cfg | 4 ++-- data/ultra.cfg | 4 ++-- 10 files changed, 20 insertions(+), 22 deletions(-) diff --git a/data/default.cfg b/data/default.cfg index 7d6118f8d..179232ab2 100644 --- a/data/default.cfg +++ b/data/default.cfg @@ -458,8 +458,6 @@ r_glsl_deluxemapping 1 r_glsl_offsetmapping 0 r_glsl_offsetmapping_reliefmapping 0 r_glsl_offsetmapping_scale 0.02 -r_glsl_water_refractdistort 0.03 -r_glsl_water_reflectdistort 0.03 // execute normal.cfg to make sure that all effect settings are reset alias menu_sync "" // will be re-aliased later exec normal.cfg diff --git a/data/high.cfg b/data/high.cfg index cd8039262..671e42c13 100644 --- a/data/high.cfg +++ b/data/high.cfg @@ -20,7 +20,7 @@ r_shadow_realtime_world 1 r_shadow_realtime_world_shadows 1 r_depthfirst 1 r_showsurfaces 0 -r_glsl_water 1 -r_glsl_water_resolutionmultiplier 0.5 +r_water 1 +r_water_resolutionmultiplier 0.5 menu_sync diff --git a/data/low.cfg b/data/low.cfg index d2d4fcb50..4b4621014 100644 --- a/data/low.cfg +++ b/data/low.cfg @@ -20,7 +20,7 @@ r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 r_depthfirst 0 r_showsurfaces 0 -r_glsl_water 0 -r_glsl_water_resolutionmultiplier 0.5 +r_water 0 +r_water_resolutionmultiplier 0.5 menu_sync diff --git a/data/med.cfg b/data/med.cfg index 7d145c7c1..2564d7644 100644 --- a/data/med.cfg +++ b/data/med.cfg @@ -20,7 +20,7 @@ r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 r_depthfirst 0 r_showsurfaces 0 -r_glsl_water 0 -r_glsl_water_resolutionmultiplier 0.5 +r_water 0 +r_water_resolutionmultiplier 0.5 menu_sync diff --git a/data/menu/data/effects.menu b/data/menu/data/effects.menu index c3e01e111..752944bd4 100644 --- a/data/menu/data/effects.menu +++ b/data/menu/data/effects.menu @@ -107,7 +107,7 @@ Item DataContainer Effects } Item Data_Cvar Reflections { - cvarName "r_glsl_water" + cvarName "r_water" defValue 0 [DataLink_OnOffSwitch] diff --git a/data/normal.cfg b/data/normal.cfg index 8cbabc052..434a0f5e5 100644 --- a/data/normal.cfg +++ b/data/normal.cfg @@ -20,7 +20,7 @@ r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 r_depthfirst 1 r_showsurfaces 0 -r_glsl_water 0 -r_glsl_water_resolutionmultiplier 0.5 +r_water 0 +r_water_resolutionmultiplier 0.5 menu_sync diff --git a/data/omg.cfg b/data/omg.cfg index 4d8d5488b..7b37cd02b 100644 --- a/data/omg.cfg +++ b/data/omg.cfg @@ -20,7 +20,7 @@ r_shadow_realtime_world 0 r_shadow_realtime_world_shadows 0 r_depthfirst 0 r_showsurfaces 1 -r_glsl_water 0 -r_glsl_water_resolutionmultiplier 0.5 +r_water 0 +r_water_resolutionmultiplier 0.5 menu_sync diff --git a/data/scripts/water.shader b/data/scripts/water.shader index 0408c7d50..2fe1adb3f 100644 --- a/data/scripts/water.shader +++ b/data/scripts/water.shader @@ -18,7 +18,7 @@ textures/water/water0 tcmod rotate 0.5 blendfunc blend } - dp_water 0.4 0.8 1 1 1 1 1 1 1 1 + dp_water 0.2 0.6 3 3 1 1 1 1 1 1 } textures/water/water1 @@ -39,7 +39,7 @@ textures/water/water1 tcmod rotate 0.5 blendfunc blend } - dp_water 0.4 0.8 1 1 1 1 1 1 1 1 + dp_water 0.2 0.6 3 3 1 1 1 1 1 1 } textures/water/water2 @@ -60,7 +60,7 @@ textures/water/water2 tcmod rotate 0.5 blendfunc blend } - dp_water 0.4 0.8 1 1 1 1 1 1 1 1 + dp_water 0.2 0.6 3 3 1 1 1 1 1 1 } textures/water/slime1 @@ -81,7 +81,7 @@ textures/water/slime1 tcMod stretch sin 1 0.05 0.2 .0015 tcmod rotate 0.5 } - dp_reflect 0.5 1 1 1 1 + dp_reflect 3 1 1 1 0.5 } textures/water/slime2 @@ -103,5 +103,5 @@ textures/water/slime2 tcmod rotate 0.5 blendfunc blend } - dp_reflect 0.5 1 1 1 1 + dp_reflect 3 1 1 1 0.5 } diff --git a/data/ultimate.cfg b/data/ultimate.cfg index c5ac9ea49..08623b235 100644 --- a/data/ultimate.cfg +++ b/data/ultimate.cfg @@ -20,7 +20,7 @@ r_shadow_realtime_world 1 r_shadow_realtime_world_shadows 1 r_depthfirst 2 r_showsurfaces 0 -r_glsl_water 1 -r_glsl_water_resolutionmultiplier 1 +r_water 1 +r_water_resolutionmultiplier 1 menu_sync diff --git a/data/ultra.cfg b/data/ultra.cfg index d3cf1a2f3..d261843d5 100644 --- a/data/ultra.cfg +++ b/data/ultra.cfg @@ -20,7 +20,7 @@ r_shadow_realtime_world 1 r_shadow_realtime_world_shadows 1 r_depthfirst 2 r_showsurfaces 0 -r_glsl_water 1 -r_glsl_water_resolutionmultiplier 0.5 +r_water 1 +r_water_resolutionmultiplier 0.5 menu_sync -- 2.39.2