UnrealXR/raylib-go
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

variadic parameter for runesNumber in LoadFontEx

Browse source
This commit is contained in:
Oleksandr Kryvonos 2024-02-25 12:18:39 +01:00
parent a490f10c86
commit a870a09894
2 changed files with 10 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

5
raylib/raylib_purego.go
View file

@ -2829,9 +2829,12 @@ func LoadFont(fileName string) Font {
}
// LoadFontEx - Load font from file with extended parameters, use NULL for codepoints and 0 for codepointCount to load the default character setFont
func LoadFontEx(fileName string, fontSize int32, codepoints []rune) Font {
func LoadFontEx(fileName string, fontSize int32, codepoints []rune, runesNumber ...int32) Font {
var font Font
codepointCount := int32(len(codepoints))
if len(runesNumber) > 0 {
codepointCount = int32(runesNumber[0])
}
loadFontEx(uintptr(unsafe.Pointer(&font)), fileName, fontSize, codepoints, codepointCount)
return font
}

19
raylib/rtext.go
View file

@ -47,7 +47,7 @@ func LoadFont(fileName string) Font {
}
// LoadFontEx - Load Font from file with extended parameters
func LoadFontEx(fileName string, fontSize int32, fontChars []rune) Font {
func LoadFontEx(fileName string, fontSize int32, fontChars []rune, runesNumber ...int32) Font {
var cfontChars *C.int
var ccharsCount C.int
@ -58,23 +58,16 @@ func LoadFontEx(fileName string, fontSize int32, fontChars []rune) Font {
cfontChars = (*C.int)(unsafe.Pointer(&fontChars[0]))
ccharsCount = (C.int)(len(fontChars))
}
if fontChars == nil {
if len(runesNumber) > 0 {
ccharsCount = (C.int)(runesNumber[0])
}
}
ret := C.LoadFontEx(cfileName, cfontSize, cfontChars, ccharsCount)
v := newFontFromPointer(unsafe.Pointer(&ret))
return v
}
// LoadFontEx - Load Font from file with extended parameter - number of runes to load
func LoadFontExByRunesNumber(fileName string, fontSize int32, runesNumber int32) Font {
ccharsCount := (C.int)(runesNumber)
cfileName := C.CString(fileName)
defer C.free(unsafe.Pointer(cfileName))
cfontSize := (C.int)(fontSize)
ret := C.LoadFontEx(cfileName, cfontSize, nil, ccharsCount)
v := newFontFromPointer(unsafe.Pointer(&ret))
return v
}
// LoadFontFromImage - Loads an Image font file (XNA style)
func LoadFontFromImage(image Image, key color.RGBA, firstChar int32) Font {
cimage := image.cptr()