Merge branch 'main' into color-depth

shaders/composite.fsh

@@ -161,7 +161,7 @@ void main() {
 		//	pull previous buffer
 		vec3 prev = texture2D(colortex1, texcoord).rgb;
 		//	interlace alternates between odd and even lines on world time
-		if(mod(int(gl_FragCoord.y / pixelSize), 2) == mod(worldTime, 2))
+		if(mod(int(gl_FragCoord.y / pixelSize), 2) == mod(frameCounter, 2))
 			gl_FragData[0] = vec4(prev, 1);
 		else
 			gl_FragData[0] = vec4(final, 1);

shaders/module/interlace.frag

@@ -5,6 +5,6 @@
 	uniform sampler2D colortex1;
 	const bool colortex1Clear = false;
 
-	uniform int worldTime;
+	uniform int frameCounter;
 #endif