Skip to content

Commit 2b66d74

Browse files
r6915eeNexIsDumb
andauthored
Add default font customization flags for FunkinText (#762)
* Add default font customization flags for FunkinText * dont mind me * organizing these and deleting duplicates * oh wait oops --------- Co-authored-by: ⍚~Nex <87421482+NexIsDumb@users.noreply.github.com>
1 parent 3b88591 commit 2b66d74

File tree

3 files changed

+18
-25
lines changed

3 files changed

+18
-25
lines changed

source/funkin/backend/FunkinText.hx

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,14 @@ package funkin.backend;
22

33
import flixel.text.FlxText;
44
import flixel.util.FlxColor;
5+
import funkin.backend.system.Flags;
56

67
class FunkinText extends FlxText {
7-
public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, Size:Int = 16, Border:Bool = true) {
8+
public function new(X:Float = 0, Y:Float = 0, FieldWidth:Float = 0, ?Text:String, ?Size:Int, Border:Bool = true) {
9+
if (Size == null) Size = Flags.DEFAULT_FONT_SIZE;
10+
811
super(X, Y, FieldWidth, Text, Size);
9-
setFormat(Paths.font("vcr.ttf"), Size, FlxColor.WHITE);
12+
setFormat(Paths.font(Flags.DEFAULT_FONT), Size, FlxColor.WHITE);
1013
if (Border) {
1114
borderStyle = OUTLINE;
1215
borderSize = 1;

source/funkin/backend/system/Flags.hx

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ class Flags {
148148
public static var DEFAULT_HUD_ZOOM_MULT:Float = 0.03;
149149
public static var DEFAULT_CAM_ZOOM_LERP:Float = 0.05;
150150
public static var DEFAULT_HUD_ZOOM_LERP:Float = 0.05;
151+
152+
// Font configuration
153+
public static var DEFAULT_FONT:String = "vcr.ttf";
154+
public static var DEFAULT_FONT_SIZE:Int = 16;
151155

152156
// to translate these you need to convert them into ids
153157
// Resume -> pause.resume

source/funkin/backend/utils/CoolUtil.hx

Lines changed: 9 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,51 +3,37 @@ package funkin.backend.utils;
33
#if cpp
44
import cpp.Float64;
55
#end
6-
import flxanimate.data.AnimationData.AnimAtlas;
7-
import flixel.graphics.FlxGraphic;
8-
import openfl.display.BitmapData;
9-
import flixel.graphics.frames.FlxAtlasFrames;
10-
import flixel.graphics.frames.FlxFramesCollection;
116
#if sys
127
import sys.FileSystem;
138
#end
14-
import flixel.text.FlxText;
15-
import funkin.backend.utils.XMLUtil.TextFormat;
16-
import flixel.util.typeLimit.OneOfTwo;
17-
import flixel.util.typeLimit.OneOfThree;
18-
import flixel.tweens.FlxTween;
19-
import flixel.system.frontEnds.SoundFrontEnd;
20-
import flixel.sound.FlxSound;
21-
import funkin.backend.system.Conductor;
22-
import flixel.sound.FlxSoundGroup;
23-
import haxe.Json;
24-
import haxe.io.Path;
25-
import haxe.io.Bytes;
26-
import haxe.xml.Access;
27-
import flixel.input.keyboard.FlxKey;
28-
import lime.utils.Assets;
299
import flixel.animation.FlxAnimation;
10+
import flixel.graphics.FlxGraphic;
11+
import flixel.graphics.frames.FlxAtlasFrames;
12+
import flixel.graphics.frames.FlxFramesCollection;
3013
import flixel.input.keyboard.FlxKey;
14+
import flixel.math.FlxPoint;
3115
import flixel.sound.FlxSound;
3216
import flixel.sound.FlxSoundGroup;
3317
import flixel.system.frontEnds.SoundFrontEnd;
3418
import flixel.text.FlxText;
3519
import flixel.tweens.FlxTween;
3620
import flixel.util.FlxAxes;
3721
import flixel.util.FlxColor;
22+
import flixel.util.typeLimit.OneOfThree;
3823
import flixel.util.typeLimit.OneOfTwo;
24+
import flxanimate.data.AnimationData.AnimAtlas;
3925
import funkin.backend.system.Conductor;
4026
import funkin.backend.utils.XMLUtil.TextFormat;
4127
import haxe.CallStack;
28+
import haxe.Constraints.IMap;
29+
import haxe.EnumTools.EnumValueTools;
4230
import haxe.Json;
4331
import haxe.io.Bytes;
4432
import haxe.io.Path;
4533
import haxe.xml.Access;
4634
import lime.utils.Assets;
35+
import openfl.display.BitmapData;
4736
import openfl.geom.ColorTransform;
48-
import flixel.math.FlxPoint;
49-
import haxe.Constraints.IMap;
50-
import haxe.EnumTools.EnumValueTools;
5137

5238
using StringTools;
5339

0 commit comments

Comments
 (0)