53a7b3d47c
The ragdoll API is potentially usable now, but still really limited. Enabled SQL requests by default using sqlite. Note that you'll need the sqlite dll to use this. MySQL should still be usable, but I didn't try. MySQL requires -DUSE_MYSQL to compile it, and a dll and -mysql argument to enable it. Fixed nacl. NPFTE plugin now invokes an exe to run the game rather than running the game within the browser. externvalue builtin now accepts & prefix to return a pointer instead. Fixed vector autocvars. uri_get, bufstr_add, bufstr_free, now functional. QC debugger can now show asm if line numbers are not available. Added support for QC watchpoints. Use the watchpoint command. gl_specular now give specular even without rtlights, thankfully not as blatently, but its there. android will not crash due to supported audio formats, and gles2 can be selected via a cvar (requires full FTEDroidActivity/program restart). git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@4152 fc73d0e0-1445-4013-8a0c-d673dee63da5
87 lines
2.1 KiB
GLSL
87 lines
2.1 KiB
GLSL
!!cvarf r_glsl_turbscale
|
|
//modifier: REFLECT (s_t2 is a reflection instead of diffusemap)
|
|
//modifier: STRENGTH (0.1 = fairly gentle, 0.2 = big waves)
|
|
//modifier: FRESNEL (5=water)
|
|
//modifier: TXSCALE (0.2 - wave strength)
|
|
//modifier: RIPPLEMAP (s_t3 contains a ripplemap
|
|
//modifier: TINT (some colour value)
|
|
|
|
uniform float cvar_r_glsl_turbscale;
|
|
|
|
#ifndef FRESNEL
|
|
#define FRESNEL 5.0
|
|
#endif
|
|
#ifndef STRENGTH
|
|
#define STRENGTH 0.1
|
|
#endif
|
|
#ifndef TXSCALE
|
|
#define TXSCALE 0.2
|
|
#endif
|
|
#ifndef TINT
|
|
#define TINT vec3(0.7, 0.8, 0.7)
|
|
#endif
|
|
|
|
varying vec2 tc;
|
|
varying vec4 tf;
|
|
varying vec3 norm;
|
|
varying vec3 eye;
|
|
#ifdef VERTEX_SHADER
|
|
attribute vec2 v_texcoord;
|
|
attribute vec3 v_normal;
|
|
uniform vec3 e_eyepos;
|
|
void main (void)
|
|
{
|
|
tc = v_texcoord.st;
|
|
tf = ftetransform();
|
|
norm = v_normal;
|
|
eye = e_eyepos - v_position.xyz;
|
|
gl_Position = tf;
|
|
}
|
|
#endif
|
|
#ifdef FRAGMENT_SHADER
|
|
uniform sampler2D s_t0; //refract
|
|
uniform sampler2D s_t1; //normalmap
|
|
uniform sampler2D s_t2; //diffuse/reflection
|
|
#ifdef RIPPLEMAP
|
|
uniform sampler2D s_t3; //ripplemap
|
|
#endif
|
|
|
|
uniform float e_time;
|
|
void main (void)
|
|
{
|
|
vec2 stc, ntc;
|
|
vec3 n, refr, refl, fres;
|
|
float f;
|
|
stc = (1.0 + (tf.xy / tf.w)) * 0.5;
|
|
|
|
//apply q1-style warp, just for kicks
|
|
ntc.s = tc.s + sin(tc.t+e_time)*0.125;
|
|
ntc.t = tc.t + sin(tc.s+e_time)*0.125;
|
|
|
|
//generate the two wave patterns from the normalmap
|
|
n = (texture2D(s_t1, TXSCALE*tc + vec2(e_time*0.1, 0.0)).xyz);
|
|
n += (texture2D(s_t1, TXSCALE*tc - vec2(0, e_time*0.097)).xyz);
|
|
n -= 1.0 - 4.0/256.0;
|
|
|
|
#ifdef RIPPLEMAP
|
|
n += texture2D(s_t3, stc)*3;
|
|
#endif
|
|
|
|
//the fresnel term decides how transparent the water should be
|
|
f = pow(1.0-abs(dot(normalize(n), normalize(eye))), float(FRESNEL));
|
|
|
|
refr = texture2D(s_t0, stc + n.st*STRENGTH*cvar_r_glsl_turbscale).rgb * TINT;
|
|
#ifdef REFLECT
|
|
refl = texture2D(s_t2, stc - n.st*STRENGTH*cvar_r_glsl_turbscale).rgb;
|
|
#else
|
|
refl = texture2D(s_t2, ntc).xyz;
|
|
#endif
|
|
// refl += 0.1*pow(dot(n, vec3(0.0,0.0,1.0)), 64.0);
|
|
|
|
fres = refr * (1.0-f) + refl*f;
|
|
|
|
// fres = texture2D(s_t2, stc).xyz;
|
|
|
|
gl_FragColor = vec4(fres, 1.0);
|
|
}
|
|
#endif
|