half assed bugfixing

src/game/shaders/dither/frag.sc

@@ -42,19 +42,19 @@ float dither(float brightness, vec2 inputUv)
 	float zRes = dotsTotal;
 	float invZRes = 1 / zRes;
 	
-	float2 rampLookupUv = vec2((0.5 * invXRes + (1 - invXRes) * brightness), 0.5);
+	vec2 rampLookupUv = vec2((0.5 * invXRes + (1 - invXRes) * brightness), 0.5);
 	float brightnessCurve = texture2D(s_rampSampler, rampLookupUv).r;
 	
 	// Magic dot frequency calculation
-	float2 dx = ddx(inputUv);
-	float2 dy = ddy(inputUv);
-	float2x2 mat = float2x2(dx, dy);
-	float4 vectorized = float4(dx, dy);
+	vec2 dx = dFdx(inputUv);
+	vec2 dy = dFdy(inputUv);
+	mat2 mat = mat2(dx, dy);
+	vec4 vectorized = vec4(dx, dy);
 	float qq = dot(vectorized, vectorized);
 	float rr = determinant(mat);
 	float discriminantSqr = max(0.0, qq*qq - 4.0*rr*rr);
 	float discriminant = sqrt(discriminantSqr);	
-	float2 freq = sqrt(float2(qq + discriminant, qq - discriminant) / 2.0);
+	vec2 freq = sqrt(vec2(qq + discriminant, qq - discriminant) / 2.0);
 
 	// Figuring out how many dots we want
 	float scaleExp = exp2(globalScale);
@@ -66,7 +66,7 @@ float dither(float brightness, vec2 inputUv)
 	spacing *= brightnessSpacingMultiplier;
 	
 	float spacingLog = log2(spacing);
-	int patternScaleLevel = floor(spacingLog);
+	int patternScaleLevel = int(floor(spacingLog));
 	float patternFractional = spacingLog - patternScaleLevel;
 	vec2 uv = inputUv / exp2(patternScaleLevel);
 	
@@ -91,7 +91,7 @@ void main()
 	float testRadius = 30.0;
 	float testSpeed = 1.0;
 	vec3 testOffset = vec3(0.0, 0.0, 50.0);
-	float3 lightPos = vec3(sin(u_time.x * testSpeed) * testRadius, 5.0, cos(u_time.x * testSpeed) * testRadius);
+	vec3 lightPos = vec3(sin(u_time.x * testSpeed) * testRadius, 5.0, cos(u_time.x * testSpeed) * testRadius);
 	vec3 texColor = u_dotColor.x > 0.1 ? u_dotColor.xyz : texture2D(s_texColor, v_uv0).xyz;
 
 	// lighting
@@ -103,9 +103,9 @@ void main()
 	float r = dither(brightness * texColor.r, v_uv0);
 	float g = dither(brightness * texColor.g, v_uv0);
 	float b = dither(brightness * texColor.b, v_uv0);
-	// float3 finalColor = vec3(r, g, b);
-	float3 ditheredColor = dither(brightness, v_uv0);
-	float3 finalColor = mix(u_baseColor, texColor, ditheredColor);
+	// vec3 finalColor = vec3(r, g, b);
+	vec3 ditheredColor = dither(brightness, v_uv0);
+	vec3 finalColor = mix(u_baseColor, texColor, ditheredColor);
 	gl_FragColor = vec4(finalColor, 1.0);
 	
 }

src/game/shaders/dither/vert.sc

@@ -9,5 +9,5 @@ void main()
 	v_color0 = a_color0;
 	v_uv0 = a_texcoord0;
 	v_wpos = mul(u_model[0], vec4(a_position, 1.0)).xyz;
-	v_normal = normalize(mul(u_model[0], a_normal));
+	v_normal = normalize(mul(u_model[0], vec4(a_normal, 1.0)).xyz);
 }