diff --git a/language.version b/language.version index 8561bb513..9ed0dd7a6 100644 --- a/language.version +++ b/language.version @@ -1,3 +1,3 @@ [default] -SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r167 \cu(Fri 8 Jul 22:38:24 CEST 2022)\c-"; -SWWM_SHORTVER="\cw1.3pre r167 \cu(2022-07-08 22:38:24)\c-"; +SWWM_MODVER="\cyDEMOLITIONIST \cw1.3pre r168 \cu(Fri 8 Jul 22:49:53 CEST 2022)\c-"; +SWWM_SHORTVER="\cw1.3pre r168 \cu(2022-07-08 22:49:53)\c-"; diff --git a/shaders/glsl/NewLogoAnimated.fp b/shaders/glsl/NewLogoAnimated.fp index 85dcb5c03..1ff69bfb4 100644 --- a/shaders/glsl/NewLogoAnimated.fp +++ b/shaders/glsl/NewLogoAnimated.fp @@ -1,17 +1,21 @@ // animated DEMOLITIONIST logo -#define overlay(a,b) (a<0.5)?(2.0*a*b):(1.0-(2.0*(1.0-a)*(1.0-b))) -#define hardlight(a,b) (2*a<1.0)?clamp(2.0*a*b,0.0,1.0):clamp(1.0-2.0*(1.0-b)*(1.0-a),0.0,1.0) -const float pi = 3.14159265358979323846; +#define PI 3.14159265 vec2 warpcoord( in vec2 uv ) { vec2 offset; - offset.y = sin(pi*2.*(uv.x*8.+timer*.25))*.005; - offset.x = cos(pi*2.*(uv.y*4.+timer*.25))*.005; + offset.y = sin(PI*2.*(uv.x*8.+timer*.25))*.005; + offset.x = cos(PI*2.*(uv.y*4.+timer*.25))*.005; return uv+offset; } +float hardlight( in float a, in float b ) +{ + if ( 2.*a < 1. ) return clamp(2.*a*b,0.,1.); + return clamp(1.-2.*(1.-b)*(1.-a),0.,1.); +} + // based on gimp color to alpha, but simplified vec4 blacktoalpha( in vec4 src ) {