variadic parameter for runesNumber in LoadFontEx

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

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()