Merge pull request #407 from SDM0/refactor

Author: MathIsFun0

assets/shaders/astral.fs

@@ -24,7 +24,7 @@ vec4 dissolve_mask(vec4 tex, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));
@@ -110,7 +110,7 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
 	float t = astral.y*2.221 + mod(time,1.);
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/texture_details.ba;
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 50.;
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));

assets/shaders/blur.fs

@@ -35,12 +35,12 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
 	vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
 
 	float two_pi = 6.28318530718;
-   
+
     vec2 radius = size/image_details.xy;
 
 	vec4 original_pixel = Texel(texture, texture_coords);
     vec4 blurred_pixel = Texel(texture, texture_coords);
-    
+
     // Blur calculations
 	float d_step = two_pi / direction;
 	float i_step = 1.0 / quality;
@@ -50,8 +50,8 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
 			blurred_pixel += Texel( texture, texture_coords + vec2(cos(d), sin(d)) * radius * i);
         }
     }
-    
-    // Final processing 
+
+    // Final processing
     blurred_pixel /= quality * direction + 1.;
     vec4 final_pixel =  vec4(blurred_pixel.rgb, original_pixel.a);
 
@@ -62,7 +62,7 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
     float t = blur.y*2.221 + mod(time,1.);
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/texture_details.ba;
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 50.;
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));
@@ -137,7 +137,7 @@ vec4 dissolve_mask(vec4 final_pixel, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));

assets/shaders/glass.fs

@@ -62,7 +62,7 @@ vec4 dissolve_mask(vec4 final_pixel, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));

assets/shaders/glitched.fs

@@ -24,7 +24,7 @@ vec4 dissolve_mask(vec4 tex, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));
@@ -108,19 +108,19 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
     vec2 texCoordsR = texture_coords;
     vec2 texCoordsG = texture_coords;
     vec2 texCoordsB = texture_coords;
-    
+
     float iTime = tan(2. * time);
 
     texCoordsR.x += (0.004 * rand(vec2(iTime, uv.y))) - 0.002 + (POLY_THROWAWAY * 0.0000001);
     texCoordsG.x += (0.007 * rand(vec2(iTime*2., uv.y*0.9))) - 0.0035 + (POLY_THROWAWAY * 0.0000001);
     texCoordsB.x += (0.010 * rand(vec2(iTime*3., uv.y*0.8))) - 0.005 + (POLY_THROWAWAY_2 * 0.0000001);
-    
+
     vec4 texR = Texel(texture, texCoordsR);
     vec4 texG = Texel(texture, texCoordsG);
     vec4 texB = Texel(texture, texCoordsB);
-    
+
     vec4 tex = vec4(texR.r, texG.g, texB.b, texR.a);
-    
+
     return dissolve_mask(tex*colour, texture_coords, uv);
 }
 

assets/shaders/gold.fs

@@ -49,7 +49,7 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
     } else {
         tex.a = 0.05;
     }
-    
+
     float avg = (pixel.r + pixel.g + pixel.b) / 3.;
     pixel = vec4(gold_color.rgb * avg + tex.rgb * tex.a, pixel.a);
 
@@ -67,7 +67,7 @@ vec4 dissolve_mask(vec4 final_pixel, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));

assets/shaders/m.fs

@@ -24,11 +24,11 @@ float sdParabola(vec2 pos, float wi, float he)
     float q = pos.x*ik*ik*0.25;
     float h = q*q - p*p*p;
     float r = sqrt(abs(h));
-    float x = (h>0.0) ? 
+    float x = (h>0.0) ?
         pow(q+r,1.0/3.0) - pow(abs(q-r),1.0/3.0)*sign(r-q) :
         2.0*cos(atan(r/q)/3.0)*sqrt(p);
     x = min(x,wi);
-    return length(pos-vec2(x,he-x*x/ik)) * 
+    return length(pos-vec2(x,he-x*x/ik)) *
            sign(ik*(pos.y-he)+pos.x*pos.x);
 }
 
@@ -88,7 +88,7 @@ vec4 dissolve_mask(vec4 final_pixel, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));

assets/shaders/mosaic.fs

@@ -24,7 +24,7 @@ vec4 dissolve_mask(vec4 tex, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));
@@ -103,15 +103,15 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
 	float t = mosaic.y*7.221 + time;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/texture_details.ba;
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 250.;
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));
 
     float field = (1.+ (
         cos(length(field_part1) / 19.483) + sin(length(field_part2) / 33.155) * cos(field_part2.y / 15.73) +
         cos(length(field_part3) / 27.193) * sin(field_part3.x / 21.92) ))/2.;
-	
+
 	float res = (.5 + .5* cos( (mosaic.x) * 2.612 + ( field + -.5 ) *3.14));
 
 	number low = min(tex.b, min(tex.g, tex.r));
@@ -120,13 +120,13 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
 
 	number gridsize = 0.6;
     number fac = max(max(0., 7.*abs(cos(uv.x*gridsize*20.))-6.), max(0., 7.*cos(uv.y*gridsize*45.)-6.));
-	
+
 	hsl.x = hsl.x + res + fac;
-	hsl.y = hsl.y*1.3;	
+	hsl.y = hsl.y*1.3;
 	hsl.z = hsl.z*0.6+0.4;
 
     tex =(1.-delta)*tex + delta*RGB(hsl)*vec4(0.6,0.5,1.4,tex.a);
-	
+
 	return dissolve_mask(tex*colour, texture_coords, uv);
 }
 

assets/shaders/noisy.fs

@@ -31,7 +31,7 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
     float random = rand(uv);
 
     if (pixel.a > 0.) pixel.a += 0.1*sin(noisy.x) - 0.51;
-	
+
 	return dissolve_mask(vec4(pixel.rgb * random, pixel.a), texture_coords, uv);
 }
 
@@ -46,7 +46,7 @@ vec4 dissolve_mask(vec4 final_pixel, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));

assets/shaders/oversat.fs

@@ -24,7 +24,7 @@ vec4 dissolve_mask(vec4 tex, vec2 texture_coords, vec2 uv)
 	float t = time * 10.0 + 2003.;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/max(texture_details.b, texture_details.a);
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 2.3 * max(texture_details.b, texture_details.a);
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));
@@ -134,12 +134,12 @@ vec4 RGBtoHSV(vec4 rgb)
 
 vec4 HSVtoRGB(vec4 hsv) {
     vec4 rgb;
-    
+
     float h = hsv.x * 6.0;
     float c = hsv.z * hsv.y;
     float x = c * (1.0 - abs(mod(h, 2.0) - 1.0));
     float m = hsv.z - c;
-    
+
     if (h < 1.0) {
         rgb = vec4(c, x, 0.0, hsv.a);
     } else if (h < 2.0) {
@@ -153,27 +153,27 @@ vec4 HSVtoRGB(vec4 hsv) {
     } else {
         rgb = vec4(c, 0.0, x, hsv.a);
     }
-    
+
     rgb.rgb += m;
-    
+
     return rgb;
 }
 vec3 increaseContrast(vec3 color, float amount)
 {
     // Convert from [0,1] to [-0.5,0.5] range
     vec3 centered = color - 0.5;
-    
+
     // Increase contrast
     centered *= amount;
-    
+
     // Convert back to [0,1] range and clamp
     return clamp(centered + 0.5, 0.0, 1.0);
 }
 vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords )
 {
     vec4 tex = Texel(texture, texture_coords);
 	vec2 uv = (((texture_coords)*(image_details)) - texture_details.xy*texture_details.ba)/texture_details.ba;
-	
+
 	// Dummy, doesn't do anything but at least it makes the shader useable
     if (uv.x > uv.x * 2.){
         uv = oversat;
@@ -192,7 +192,7 @@ vec4 effect( vec4 colour, Image texture, vec2 texture_coords, vec2 screen_coords
 	float t = oversat.y*2.221 + time;
 	vec2 floored_uv = (floor((uv*texture_details.ba)))/texture_details.ba;
     vec2 uv_scaled_centered = (floored_uv - 0.5) * 50.;
-	
+
 	vec2 field_part1 = uv_scaled_centered + 50.*vec2(sin(-t / 143.6340), cos(-t / 99.4324));
 	vec2 field_part2 = uv_scaled_centered + 50.*vec2(cos( t / 53.1532),  cos( t / 61.4532));
 	vec2 field_part3 = uv_scaled_centered + 50.*vec2(sin(-t / 87.53218), sin(-t / 49.0000));

items/blind.lua

@@ -351,15 +351,15 @@ local trick = {
 				v:flip()
 			end
 		end
-		--[[if #G.hand.cards > 1 then 
-            G.E_MANAGER:add_event(Event({ trigger = 'after', delay = 0.2, func = function() 
-                G.E_MANAGER:add_event(Event({ func = function() G.hand:shuffle('cry_trick'); play_sound('cardSlide1', 0.85);return true end })) 
+		--[[if #G.hand.cards > 1 then
+            G.E_MANAGER:add_event(Event({ trigger = 'after', delay = 0.2, func = function()
+                G.E_MANAGER:add_event(Event({ func = function() G.hand:shuffle('cry_trick'); play_sound('cardSlide1', 0.85);return true end }))
                 delay(0.15)
-                G.E_MANAGER:add_event(Event({ func = function() G.hand:shuffle('cry_trick'); play_sound('cardSlide1', 1.15);return true end })) 
+                G.E_MANAGER:add_event(Event({ func = function() G.hand:shuffle('cry_trick'); play_sound('cardSlide1', 1.15);return true end }))
                 delay(0.15)
-                G.E_MANAGER:add_event(Event({ func = function() G.hand:shuffle('cry_trick'); play_sound('cardSlide1', 1);return true end })) 
+                G.E_MANAGER:add_event(Event({ func = function() G.hand:shuffle('cry_trick'); play_sound('cardSlide1', 1);return true end }))
                 delay(0.5)
-            return true end })) 
+            return true end }))
         end--]]
 	end,
 }