TTF font support

Text is now rendered with ttf files instead of bitmap fonts.

Adds a dependency on `SDL2_ttf`.

Console text is rendered character by character, and will support a limited set of Unicode characters.
UI text is rendered by passing the whole string to `SDL2_ttf` and supports all of Unicode.

Multiple ttf files can be specified for each font, one for each writing script. The writing script to use can be specified with `uifont`.

The `textbright` and `uitextrows` variables, and the `tabify` command have been removed.

the valid range for `conscale` has been restricted to [0.5, 2] and the default value has been changed to 1.

Added configuration variables:
- conshadow(0, 255, 255): controls the intensity of the shadow added to console text to increase visibility
- uifps(0, 60, 1000): controls the maximum rate at which UI text element update their contents; set to zero to disable the limit

Author: Jed-

config/font.cfg

@@ -1,14 +1,12 @@
 
 // Execute dedicated game fonts here
 
-loopfiles f "data/interface/font" cfg [
-	exec (+s "data/interface/font/" $f ".cfg")
-]
+// font name filename.ttf
+// fontface script rtl? filename.ttf
 
-// Change the two following lines to define default font
-fontalias "default"    "main"
-fontalias "default.ol" "main.ol"
+// valid script names are defined in /usr/include/harfbuzz/hb-common.h
 
-// Shorthand aliases
-fontalias "def"    "default"
-fontalias "def.ol" "default.ol"
+font "default"  "data/interface/font/Roboto-Regular.ttf"
+font "mono"     "data/interface/font/DejaVuSansMono.ttf"
+font "wide"     "data/interface/font/vipnagor.ttf"
+font "webdings" "data/interface/font/webdings.ttf"

config/glsl/hud.cfg

@@ -28,33 +28,6 @@ shader 0 "hud" [
     }
 ]
 
-shader 0 "hudtext" [
-    attribute vec4 vvertex, vcolor;
-    attribute vec2 vtexcoord0;
-    uniform mat4 hudmatrix;
-    varying vec2 texcoord0;
-    varying vec4 colorscale;
-    void main(void)
-    {
-        gl_Position = hudmatrix * vvertex;
-        texcoord0 = vtexcoord0; 
-        colorscale = vcolor;
-    }
-] [
-    uniform sampler2D tex0;
-    uniform vec4 textparams;
-    varying vec2 texcoord0;
-    varying vec4 colorscale;
-    fragdata(0) vec4 fragcolor;
-    void main(void)
-    {
-        float dist = texture2D(tex0, texcoord0).r;
-        float border = smoothstep(textparams.x, textparams.y, dist);
-        float outline = smoothstep(textparams.z, textparams.w, dist);
-        fragcolor = vec4(colorscale.rgb * outline, colorscale.a * border);
-    }
-]
-
 shader 0 "hudrgb" [
     attribute vec4 vvertex, vcolor;
     attribute vec2 vtexcoord0;

config/glsl/particle.cfg

@@ -107,17 +107,13 @@ shader 0 "particletext" [
         color = vec4(vcolor.rgb * ldrscale, vcolor.a);
     }
 ] [
-    uniform vec4 textparams;
-    uniform sampler2D tex0;
+    uniform sampler2DRect tex0;
     varying vec4 color;
     varying vec2 texcoord0;
     fragdata(0) vec4 fragcolor;
     void main(void)
     {
-        float dist = texture2D(tex0, texcoord0).r;
-        float border = smoothstep(textparams.x, textparams.y, dist);
-        float outline = smoothstep(textparams.z, textparams.w, dist);
-        fragcolor = vec4(color.rgb * outline, color.a * border);
+        fragcolor = color * texture2DRect(tex0, texcoord0);
     }
 ]
 

config/ui/hud/editstats.cfg

@@ -333,8 +333,8 @@ uiLiteMenu "edithud" [
 							uigrid 2 $uiPad:3XL $uiPad:L [
 								uihlist $uiPad:XL [
 									uitext "WTR" 0.5
-									uitext (tabify (format "%1k" $editstatwtr) 1) 0.5
-									uitext (tabify (format "(%1%%)" $editstatvtr) 2) 0.5
+									uitext (format "%1k" $editstatwtr) 0.5
+									uitext (format "(%1%%)" $editstatvtr) 0.5
 								]
 								uihlist $uiPad:XL [
 									uitext "WVT" 0.5

config/ui/hud/gamehud.cfg

@@ -735,7 +735,7 @@ newui "scoreboard" [
 				uiFastImg (fade (? $arg1 0.5 0.25)) "hud/" "shelf" "" $uiPad:5XL
 				uiFastImg <mad:.18/.18/.18> "hud/" "glow" "" $uiPad:5XL
 				push n (+ $n 1) [
-					uifontcolortext "def.ol" $n (|A! (? $arg1 0xB0 0x60)) 0.55
+					uifontcolortext "default" $n (|A! (? $arg1 0xB0 0x60)) 0.55
 				]
 			] ; uialign- -1
 		]
@@ -786,14 +786,14 @@ newui ".killUI" [
 			uifill 0 0.3
 			t = (getrespawnwait)
             uispace 0.02 0.02 [
-                uifonttext "wide.ol" $lasthudkillinfo $uiPad:USS
+                uifonttext "wide" $lasthudkillinfo $uiPad:USS
             ]
 			uispace 0 0 [
 				uioffset 0 $uiPad:D2XL- [
                     if (m_invasion $getmode) [
-                        uifonttext "wide.ol" (+s "^f4Lives remaining: " $getclientlives) $uiPad:USS
+                        uifonttext "wide" (+s "^f4Lives remaining: " $getclientlives) $uiPad:USS
                     ] [
-                        uifontcolortext "wide.ol" (? $t $t " ") (? (< (getmillis) (+ 100 (getlastspawnattempt))) $c_red $c_white) 1
+                        uifontcolortext "wide" (? $t $t " ") (? (< (getmillis) (+ 100 (getlastspawnattempt))) $c_red $c_white) 1
                     ]
 				]
 			]

config/ui/hud/geo_prefab.cfg

@@ -24,7 +24,7 @@ uiLiteMenu "geo_prefab" [
 						uiclamp*e
 						uispace $uiPad:S $uiPad:O3 [
 							uialign -1 -1
-							uifontcolortext "def.ol" $i (|A! 0x98) 0.55
+							uifontcolortext "default" $i (|A! 0x98) 0.55
 						]
 						uihover [
 							if (!= $i $.UI_obrsel) [

config/ui/hud/mapmodel_browser.cfg

@@ -54,11 +54,11 @@ uiLiteMenu "mapmodel_browser" [
 								uimodelpreview (mapmodelname $i 1) "mapmodel"
 								uiclamp*e
 								uispace $uiPad:S $uiPad:O3 [
-									uifonttext "def.ol" $i 0.55
+									uifonttext "default" $i 0.55
 								] ; uialign- -1 -1
 								if (iskeyheld "LSHIFT") [
 									uispace $uiPad:S 0 [
-										uifonttext "webdings.ol" "q" 0.65
+										uifonttext "webdings" "q" 0.65
 									] ; uialign- -1 1
 									uirelease [ clearmodel (+s "mapmodel/" (mapmodelname $i)) ]
 								] [
@@ -77,14 +77,14 @@ uiLiteMenu "mapmodel_browser" [
 								uimodelpreview (mapmodelname $i 1) "mapmodel"
 								uiclamp*e
 								uispace $uiPad:S $uiPad:O3 [
-									uifontcolortext "def.ol" $i (|A! 0xA0) 0.55
+									uifontcolortext "default" $i (|A! 0xA0) 0.55
 								] ; uialign- -1 -1
 								uihover [ .mm_selidx = $n ; uiSetMillis ]
 								uioutline $c_line1 $.z $.z
 							]
 							if (mapmodelloaded $i) [
 								uispace $uiPad:S $uiPad:O3 [
-									uifonttext "webdings.ol" "a" 0.55
+									uifonttext "webdings" "a" 0.55
 								] ; uialign- 1 -1
 							]
 							uiHoverOnce [ uiHoverSound ]

config/ui/hud/texture_browser.cfg

@@ -29,7 +29,7 @@ uiLiteMenu "texture_browser" [
 							]
 							uispace $uiPad:S $uiPad:O3 [
 								uialign -1 -1
-								uifontcolortext "def.ol" $i (|A! 0x98) 0.55
+								uifontcolortext "default" $i (|A! 0x98) 0.55
 							]
 						]
 						uipress [ uiSetMillis ]
@@ -83,7 +83,7 @@ uiLiteMenu "texture_browser" [
 							uiclip 0 $uiPad:6XL [ uicolortext "/" $c_gray 1.2 ]
 						] // text takes up a lot of vertical space, have to "cut" it
 						uifill $uiPad:DXS 0 [
-							uifonttext "def.ol" (max $.tb_totalpg 1) 0.7
+							uifonttext "default" (max $.tb_totalpg 1) 0.7
 							uialign- -1 1
 						]
 						uiclamp*y
@@ -110,7 +110,7 @@ uiLiteMenu "texture_browser" [
 								uislotview $i
 								uiclamp*e
 								uispace $uiPad:S $uiPad:O3 [
-									uifontcolortext "def.ol" $i (|A! 0xA0) 0.55
+									uifontcolortext "default" $i (|A! 0xA0) 0.55
 								] ; uialign- -1 -1
 								uirelease [
 									settex (getslottex $i)

config/ui/lib.cfg

@@ -793,12 +793,12 @@ uiButton = [
 
 // uiFancyText  FONT  TEXT  SIZE  0xCOLOR  TRANSPARENCY
 uiFancyText = [
-	if (=s $arg1 "") [ arg1 = "def" ]
+	if (=s $arg1 "") [ arg1 = "default" ]
 	if $arg4 [] [ arg4 = $c_white ]
 	if (< $numargs 5) [ arg5 = 1 ]
 	uigroup [
 		uioffset $uiPad:O1- $uiPad:O1 [
-			uifontcolortext [@arg1.ol] (stripcolors $arg2) (|A (*fA $arg5 0x20)) $arg3
+			uifontcolortext  $arg1     (stripcolors $arg2) (|A (*fA $arg5 0x20)) $arg3
 			uifontcolortext  $arg1     (stripcolors $arg2) (|A (*fA $arg5))      $arg3
 		]
 		uioffset $uiPad:O1 $uiPad:O1- [
@@ -809,7 +809,7 @@ uiFancyText = [
 
 // uiEmbossText  FONT  TEXT  SIZE  0xCOLOR
 uiEmbossText = [
-	if (=s $arg1 "") [ arg1 = "def" ]
+	if (=s $arg1 "") [ arg1 = "default" ]
 	uigroup [
 		uioffset $uiPad:O2- $uiPad:O2 [
 			uifontcolortext $arg1 (stripcolors $arg2) 0 $arg3
@@ -851,7 +851,7 @@ uiVerSld = [
 			] ; uiclamp-x
 			uivlist $uiPad:M- [
 				loop i (strlen $arg6) [
-					uifontcolortext "def.ol" (substr $arg6 $i 1) (|A! (? $arg9 0xA0 0x60)) 0.65
+					uifontcolortext "default" (substr $arg6 $i 1) (|A! (? $arg9 0xA0 0x60)) 0.65
 				]
 			]
 		]
@@ -880,7 +880,7 @@ uiHorSld = [
 					uiclamp*y
 				]
 			] ; uiclamp-y
-			uifontcolortext "def.ol" $arg6 (|A! (? $arg9 0xA0 0x60)) 0.65
+			uifontcolortext "default" $arg6 (|A! (? $arg9 0xA0 0x60)) 0.65
 		]
 		uiclamp*e
 	]
@@ -910,7 +910,7 @@ uiVerColorSld = [
 			] ; uiclamp-x
 			uivlist $uiPad:M- [
 				loop i (strlen $$arg1) [
-					uifontcolortext "wide.ol" (substr $$arg1 $i 1) (|A! (? $arg9 0xA0 0x60)) 0.7
+					uifontcolortext "wide" (substr $$arg1 $i 1) (|A! (? $arg9 0xA0 0x60)) 0.7
 				]
 			]
 		]
@@ -940,7 +940,7 @@ uiHorColorSld = [
 					uiclamp*y
 				]
 			] ; uiclamp-y
-			uifontcolortext "wide.ol" $$arg1 (|A! (? $arg9 0xA0 0x60)) 0.7
+			uifontcolortext "wide" $$arg1 (|A! (? $arg9 0xA0 0x60)) 0.7
 		]
 		uiclamp*e
 	]

config/ui/libnew.cfg

@@ -170,7 +170,7 @@ uiSliderH = [
 						uiFastImgStretched "" "shadow2" "" "" [ uiclamp.x ]
 						uiclamp*e
 						if $arg9 [ arg10 = 0xA0FFFFFF ] [ arg10 = 0x60FFFFFF ]
-						uiFontColorText "def.ol" $arg6 0.65 $arg10
+						uiFontColorText "default" $arg6 0.65 $arg10
 					] ; uiclamp-y
 				]
 			] ; uiclamp-y