qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-03-21 09:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix bsp water surfaces.

Browse source 
Everything seems to be working for the bsp renderer.
This commit is contained in:
Bill Currie 2013-06-07 19:08:58 +09:00
parent f43592589d
commit 26fc0b74e6
2 changed files with 44 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
libs/video/renderer/glsl/glsl_bsp.c
View file

@ -115,6 +115,7 @@ static const char *bsp_vert_effects[] =
static const char *bsp_lit_effects[] =
{
"QuakeForge.Fragment.fog",
"QuakeForge.env.warp.nop",
"QuakeForge.Fragment.colormap",
"QuakeForge.Fragment.bsp.lit",
0
@ -122,9 +123,11 @@ static const char *bsp_lit_effects[] =
static const char *bsp_turb_effects[] =
{
"QuakeForge.Math.const",
"QuakeForge.Fragment.fog",
"QuakeForge.env.warp.turb",
"QuakeForge.Fragment.colormap",
"QuakeForge.Fragment.bsp.lit",
"QuakeForge.Fragment.bsp.unlit",
0
};

45
libs/video/renderer/glsl/quakeforge.glsl
View file

@ -48,16 +48,24 @@ mappedColor (float pix, float light)
return texture2D (colormap, vec2 (pix, light));
}
-- Fragment.turb
-- env.warp.nop
vec2
warp_st (vec2 st, float time)
{
return st;
}
-- env.warp.turb
const float SPEED = 20.0;
const float CYCLE = 128.0;
const float FACTOR = PI * 2.0 / CYCLE;
const vec2 BIAS = vec2 (1.0, 1.0)
const vec2 BIAS = vec2 (1.0, 1.0);
const float SCALE = 8.0;
vec2
turb_st (vec2 st, float time)
warp_st (vec2 st, float time)
{
vec2 angle = st.ts * CYCLE / 2.0;
vec2 phase = vec2 (time, time) * SPEED;
@ -106,7 +114,7 @@ sky_color (vec3 dir)
st = base + flow * time / 16.0;
pix = texture2D (solid, st).r;
}
return texture2D (palette, pix);
return texture2D (palette, vec2 (pix, 0));
}
-- Vertex.mdl
@ -194,6 +202,7 @@ main (void)
uniform sampler2D texture;
uniform sampler2D lightmap;
uniform float time;
varying vec2 tst;
varying vec2 lst;
@ -202,14 +211,40 @@ varying vec4 color;
void
main (void)
{
float pix = texture2D (texture, tst).r;
float pix;
vec2 st;
float light = texture2D (lightmap, lst).r;
vec4 c;
st = warp_st (tst, time);
pix = texture2D (texture, st).r;
c = mappedColor (pix, light * 4.0) * color;
gl_FragColor = fogBlend (c);
}
-- Fragment.bsp.unlit
uniform sampler2D texture;
uniform sampler2D palette;
uniform float time;
varying vec2 tst;
varying vec4 color;
void
main (void)
{
float pix;
vec2 st;
vec4 c;
st = warp_st (tst, time);
pix = texture2D (texture, st).r;
c = texture2D (palette, vec2(pix, 0)) * color;
gl_FragColor = fogBlend (c);
}
-- Fragment.bsp.sky
varying vec3 direction;