vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

Platform: Add fog4 pass into default model/BSP rendering code. Also some water stuff.

Browse source
This commit is contained in:
Marco Cawthorne 2020-10-25 15:10:16 +01:00
parent 424a9093ef
commit 5a419d827e
3 changed files with 65 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
platform/base_glsl.pk3dir/glsl/defaultskin.glsl
View file

@ -15,6 +15,7 @@
!!samps =FAKESHADOWS shadowmap !!samps =FAKESHADOWS shadowmap
#include "sys/defs.h" #include "sys/defs.h"
#include "sys/fog.h"
#if gl_affinemodels == 1 #if gl_affinemodels == 1
#define affine noperspective #define affine noperspective
@ -186,6 +187,6 @@ varying vec3 light;
#ifdef FAKESHADOWS #ifdef FAKESHADOWS
diffuse_f.rgb *= ShadowmapFilter(s_shadowmap, vtexprojcoord); diffuse_f.rgb *= ShadowmapFilter(s_shadowmap, vtexprojcoord);
#endif #endif
gl_FragColor = diffuse_f; gl_FragColor = fog4(diffuse_f);
} }
#endif #endif

4
platform/base_glsl.pk3dir/glsl/defaultwall.glsl
View file

@ -1,5 +1,6 @@
!!ver 130 !!ver 130
!!permu LIGHTSTYLED !!permu LIGHTSTYLED
!!permu FOG
!!samps diffuse reflectcube normalmap !!samps diffuse reflectcube normalmap
!!permu FAKESHADOWS !!permu FAKESHADOWS
@ -13,6 +14,7 @@
!!cvardf gl_stipplealpha=0 !!cvardf gl_stipplealpha=0
#include "sys/defs.h" #include "sys/defs.h"
#include "sys/fog.h"
varying vec2 tex_c; varying vec2 tex_c;
@ -180,7 +182,7 @@ varying mat3 invsurface;
diffuse_f.rgb *= ShadowmapFilter(s_shadowmap, vtexprojcoord); diffuse_f.rgb *= ShadowmapFilter(s_shadowmap, vtexprojcoord);
#endif #endif
gl_FragColor = diffuse_f; gl_FragColor = fog4(diffuse_f);
} }
#endif #endif

87
platform/base_glsl.pk3dir/glsl/defaultwarp.glsl
View file

@ -1,51 +1,84 @@
!!ver 100 450 !!ver 100 450
!!permu FOG !!permu FOG
!!cvarf r_wateralpha
!!samps diffuse lightmap !!samps diffuse lightmap
!!cvardf gl_mono=0 !!cvardf gl_mono=0
!!cvardf gl_stipplealpha=0
#include "sys/defs.h" #include "sys/defs.h"
#include "sys/fog.h" #include "sys/fog.h"
varying vec2 tc; varying vec2 tc;
#ifdef LIT #ifdef LIT
varying vec2 lm0; varying vec2 lm0;
#endif #endif
#ifdef VERTEX_SHADER #ifdef VERTEX_SHADER
void main () void main ()
{ {
tc = v_texcoord.st; tc = v_texcoord.st;
#ifdef FLOW #ifdef FLOW
tc.s += e_time * -0.5; tc.s += e_time * -0.5;
#endif #endif
#ifdef LIT #ifdef LIT
lm0 = v_lmcoord; lm0 = v_lmcoord;
#endif #endif
gl_Position = ftetransform(); gl_Position = ftetransform();
} }
#endif #endif
#ifdef FRAGMENT_SHADER #ifdef FRAGMENT_SHADER
#ifndef ALPHA #ifndef ALPHA
uniform float cvar_r_wateralpha; #define USEALPHA 1.0
#define USEALPHA cvar_r_wateralpha
#else #else
#define USEALPHA float(ALPHA) #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 #endif
if (gl_mono == 1.0) { void main ()
float bw = (ts.r + ts.g + ts.b) / 3.0; {
ts.rgb = vec3(bw, bw, bw); vec2 ntc;
ntc.s = tc.s + sin(tc.t+e_time)*0.125;
ntc.t = tc.t + sin(tc.s+e_time)*0.125;
vec4 diffuse_f = texture2D(s_diffuse, ntc);
diffuse_f *= e_colourident;
// awful stipple alpha code
if (gl_stipplealpha == 1.0) {
float alpha = USEALPHA * e_colourident.a;
int x = int(mod(gl_FragCoord.x, 2.0));
int y = int(mod(gl_FragCoord.y, 2.0));
if (alpha <= 0.0) {
discard;
} else if (alpha <= 0.25) {
diffuse_f.a = 1.0f;
if (x + y == 2)
discard;
if (x + y == 1)
discard;
} else if (alpha <= 0.5) {
diffuse_f.a = 1.0f;
if (x + y == 2)
discard;
if (x + y == 0)
discard;
} else if (alpha < 1.0) {
diffuse_f.a = 1.0f;
if (x + y == 2)
discard;
}
} else {
#ifdef LIT
diffuse_f.rgb *= (texture2D(s_lightmap, lm0) * e_lmscale).rgb;
#endif
}
if (gl_mono == 1.0) {
float bw = (diffuse_f.r + diffuse_f.g + diffuse_f.b) / 3.0;
diffuse_f.rgb = vec3(bw, bw, bw);
}
gl_FragColor = fog4(diffuse_f);
} }
gl_FragColor = fog4(vec4(ts, USEALPHA) * e_colourident);
}
#endif #endif