diff --git a/gldefs.shinemaps b/gldefs.shinemaps index e798415b2..b8ddf076c 100644 --- a/gldefs.shinemaps +++ b/gldefs.shinemaps @@ -44,5 +44,6 @@ HardwareShader Texture "models/leadmap.png" } HardwareShader Texture "models/barriermap.png" { - Shader "shaders/glsl/Shinemap.fp" + Shader "shaders/glsl/Shinemap_barrier.fp" + Texture "bartex" "models/barrierbar.png" } diff --git a/language.version b/language.version index d05c36ad1..4707d2600 100644 --- a/language.version +++ b/language.version @@ -1,2 +1,2 @@ [default] -SWWM_MODVER="\cxSWWM GZ\c- r299 (Thu 4 Jun 15:58:26 CEST 2020)"; +SWWM_MODVER="\cxSWWM GZ\c- r300 (Thu 4 Jun 16:37:11 CEST 2020)"; diff --git a/modeldef.pickups b/modeldef.pickups index 1d09f17b3..a640d0951 100644 --- a/modeldef.pickups +++ b/modeldef.pickups @@ -281,6 +281,7 @@ Model "EBarrierX" SurfaceSkin 0 1 "barriermap.png" Scale 0.05 0.05 0.05 ZOffset 16 + DONTCULLBACKFACES FrameIndex XZW1 A 0 0 } diff --git a/models/barrierbar.png b/models/barrierbar.png new file mode 100644 index 000000000..5dbd8f18f Binary files /dev/null and b/models/barrierbar.png differ diff --git a/shaders/glsl/Shinemap_barrier.fp b/shaders/glsl/Shinemap_barrier.fp new file mode 100644 index 000000000..65558931e --- /dev/null +++ b/shaders/glsl/Shinemap_barrier.fp @@ -0,0 +1,9 @@ +vec4 ProcessTexel() +{ + vec3 rnorm = normalize(vEyeNormal.xyz)*(1,-1,1); + vec4 basemap = getTexel(rnorm.xy*.49+.5); + basemap.rgb *= .25; + vec3 grad = texture(bartex,vec2(0.,vTexCoord.t*5.+timer)).rgb; + grad *= .25; + return basemap+vec4(grad,0.); +}