fa0c73d33b
Added .psd, .pbm/.pgm/.ppm, .pfm, and .hdr image formats. Extensions NOT added to r_imageextensions. png (and the above formats) can now be loaded as RGBA16, instead of being truncated to RGBA8 (8bit pngs not affected). r_imagelist will now show images from memory, instead of potentially loading new/different ones from disk. Fix serverbrowser bug being too eager to join the server (eg from alt+tab). Don't send ipv6 packets to qw/q2 masters. They won't be able to report ipv6 addresses anyway, and this reduces warnings when a host STILL has no ipv6 (my ISP sucks). this does not affect q3/dpmasters, for people without ipv4 addresses. Tried to improve compat with Bloodshot's particle effects. Fixed a couple of issues with R_AddTrisoup. Fixed string tokenizing bug where it was using the wrong buffer size values. Don't show link-local/localhost addresses in eg the status command (unless developer). qtv-rel is now an easier target, for new qtv releases. qtv warning fixes. added a nailtrail effect to 'high' particles. fixed terrain shaders. fixed fogged water issue (on one of bal's maps). first attempt at gltf2 format support git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@5400 fc73d0e0-1445-4013-8a0c-d673dee63da5
49 lines
973 B
GLSL
49 lines
973 B
GLSL
!!ver 100 450
|
|
!!permu FOG
|
|
!!cvarf r_wateralpha
|
|
!!samps diffuse lightmap
|
|
|
|
#include "sys/defs.h"
|
|
|
|
//this is the shader that's responsible for drawing default q1 turbulant water surfaces
|
|
//this is expected to be moderately fast.
|
|
|
|
#include "sys/fog.h"
|
|
varying vec2 tc;
|
|
#ifdef LIT
|
|
varying vec2 lm0;
|
|
#endif
|
|
#ifdef VERTEX_SHADER
|
|
void main ()
|
|
{
|
|
tc = v_texcoord.st;
|
|
#ifdef FLOW
|
|
tc.s += e_time * -0.5;
|
|
#endif
|
|
#ifdef LIT
|
|
lm0 = v_lmcoord;
|
|
#endif
|
|
gl_Position = ftetransform();
|
|
}
|
|
#endif
|
|
#ifdef FRAGMENT_SHADER
|
|
#ifndef ALPHA
|
|
uniform float cvar_r_wateralpha;
|
|
#define USEALPHA cvar_r_wateralpha
|
|
#else
|
|
#define USEALPHA float(ALPHA)
|
|
#endif
|
|
void main ()
|
|
{
|
|
vec2 ntc;
|
|
ntc.s = tc.s + sin(tc.t+e_time)*0.125;
|
|
ntc.t = tc.t + sin(tc.s+e_time)*0.125;
|
|
vec3 ts = vec3(texture2D(s_diffuse, ntc));
|
|
|
|
#ifdef LIT
|
|
ts *= (texture2D(s_lightmap, lm0) * e_lmscale).rgb;
|
|
#endif
|
|
|
|
gl_FragColor = fog4blend(vec4(ts, USEALPHA) * e_colourident);
|
|
}
|
|
#endif
|