r2829 - in trunk/data: . menu/data scripts
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Oct 15 13:27:26 EDT 2007
Author: div0
Date: 2007-10-15 13:27:26 -0400 (Mon, 15 Oct 2007)
New Revision: 2829
Modified:
trunk/data/default.cfg
trunk/data/high.cfg
trunk/data/low.cfg
trunk/data/med.cfg
trunk/data/menu/data/effects.menu
trunk/data/normal.cfg
trunk/data/omg.cfg
trunk/data/scripts/water.shader
trunk/data/ultimate.cfg
trunk/data/ultra.cfg
Log:
make water shaders work as expected; s/r_glsl_water/r_water/
Modified: trunk/data/default.cfg
===================================================================
--- trunk/data/default.cfg 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/default.cfg 2007-10-15 17:27:26 UTC (rev 2829)
@@ -458,8 +458,6 @@
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
Modified: trunk/data/high.cfg
===================================================================
--- trunk/data/high.cfg 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/high.cfg 2007-10-15 17:27:26 UTC (rev 2829)
@@ -20,7 +20,7 @@
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
Modified: trunk/data/low.cfg
===================================================================
--- trunk/data/low.cfg 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/low.cfg 2007-10-15 17:27:26 UTC (rev 2829)
@@ -20,7 +20,7 @@
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
Modified: trunk/data/med.cfg
===================================================================
--- trunk/data/med.cfg 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/med.cfg 2007-10-15 17:27:26 UTC (rev 2829)
@@ -20,7 +20,7 @@
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
Modified: trunk/data/menu/data/effects.menu
===================================================================
--- trunk/data/menu/data/effects.menu 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/menu/data/effects.menu 2007-10-15 17:27:26 UTC (rev 2829)
@@ -107,7 +107,7 @@
}
Item Data_Cvar Reflections
{
- cvarName "r_glsl_water"
+ cvarName "r_water"
defValue 0
[DataLink_OnOffSwitch]
Modified: trunk/data/normal.cfg
===================================================================
--- trunk/data/normal.cfg 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/normal.cfg 2007-10-15 17:27:26 UTC (rev 2829)
@@ -20,7 +20,7 @@
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
Modified: trunk/data/omg.cfg
===================================================================
--- trunk/data/omg.cfg 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/omg.cfg 2007-10-15 17:27:26 UTC (rev 2829)
@@ -20,7 +20,7 @@
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
Modified: trunk/data/scripts/water.shader
===================================================================
--- trunk/data/scripts/water.shader 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/scripts/water.shader 2007-10-15 17:27:26 UTC (rev 2829)
@@ -18,7 +18,7 @@
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 @@
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 @@
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 @@
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 @@
tcmod rotate 0.5
blendfunc blend
}
- dp_reflect 0.5 1 1 1 1
+ dp_reflect 3 1 1 1 0.5
}
Modified: trunk/data/ultimate.cfg
===================================================================
--- trunk/data/ultimate.cfg 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/ultimate.cfg 2007-10-15 17:27:26 UTC (rev 2829)
@@ -20,7 +20,7 @@
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
Modified: trunk/data/ultra.cfg
===================================================================
--- trunk/data/ultra.cfg 2007-10-15 13:35:34 UTC (rev 2828)
+++ trunk/data/ultra.cfg 2007-10-15 17:27:26 UTC (rev 2829)
@@ -20,7 +20,7 @@
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
More information about the nexuiz-commits
mailing list