fix font rendering pxRange

Author: malytomas

data/cage/shaders/gui/font.glsl

@@ -12,27 +12,30 @@ layout(std140, binding = CAGE_SHADER_UNIBLOCK_CUSTOMDATA) uniform Instances
 	InstanceStruct instances[512];
 };
 
+layout(binding = 0) uniform sampler2D uniTexture;
 layout(location = 0) uniform mat4 uniMvp;
 layout(location = CAGE_SHADER_ATTRIB_IN_POSITION) in vec3 inPosition;
 layout(location = CAGE_SHADER_ATTRIB_IN_UV) in vec2 inUv;
 
 out vec2 varUv;
+flat out float varPxRange;
 
 void main()
 {
 	InstanceStruct inst = instances[gl_InstanceID];
 	gl_Position = uniMvp * vec4(inPosition.xy * inst.wrld.zw + inst.wrld.xy, 0, 1);
 	varUv = inPosition.xy * inst.text.zw + inst.text.xy;
+	varPxRange = 6 * inst.wrld.w / (inst.text.w * float(textureSize(uniTexture, 0).y));
 }
 
 $define shader fragment
 
 layout(binding = 0) uniform sampler2D uniTexture;
 layout(location = 4) uniform vec3 uniColor;
-layout(location = 15) uniform float uniScreenPxRange;
 
 in vec2 varUv;
 out vec4 outColor;
+flat in float varPxRange;
 
 float median(vec3 v)
 {
@@ -42,7 +45,7 @@ float median(vec3 v)
 void main()
 {
 	float sd = median(texture(uniTexture, varUv).rgb);
-	float screenPxDistance = uniScreenPxRange * (sd - 0.5);
+	float screenPxDistance = varPxRange * (sd - 0.5);
 	float opacity = clamp(screenPxDistance + 0.5, 0, 1);
 	outColor = vec4(uniColor, opacity);
 }

sources/libengine/graphics/font.cpp

@@ -18,7 +18,6 @@ extern "C"
 #include <cage-engine/assetStructs.h>
 #include <cage-engine/font.h>
 #include <cage-engine/model.h>
-#include <cage-engine/opengl.h>
 #include <cage-engine/renderQueue.h>
 #include <cage-engine/shaderConventions.h>
 #include <cage-engine/texture.h>

sources/libengine/gui/graphics.cpp

@@ -105,7 +105,6 @@ namespace cage
 		const Real pointsScale = item->hierarchy->impl->pointsScale;
 		position *= pointsScale;
 		transform = transpose(Mat4(pointsScale * 2.0 / orr[0], 0, 0, 2.0 * position[0] / orr[0] - 1.0, 0, pointsScale * 2.0 / orr[1], 0, 1.0 - 2.0 * position[1] / orr[1], 0, 0, 1, 0, 0, 0, 0, 1));
-		data.screenPxRange = data.format.size * pointsScale * 0.13;
 	}
 
 	RenderableText::~RenderableText()
@@ -120,7 +119,6 @@ namespace cage
 		q->bind(shader);
 		q->uniform(shader, 0, transform);
 		q->uniform(shader, 4, data.color);
-		q->uniform(shader, 15, data.screenPxRange);
 		data.font->render(q, +impl->assetOnDemand, data.layout);
 	}
 

sources/libengine/gui/private.h

@@ -158,7 +158,6 @@ namespace cage
 		Holder<Font> font;
 		FontLayoutResult layout;
 		Vec3 color = Vec3::Nan();
-		Real screenPxRange;
 	};
 
 	struct TextItem : private Immovable, private CommonTextData