From 6e090424c5418463c53d607b234ca29cccc30d49 Mon Sep 17 00:00:00 2001
From: Milan Nikolic <gen2brain@gmail.com>
Date: Sat, 27 Aug 2022 17:37:54 +0200
Subject: [PATCH] Change LoadFontEx to accept []rune, fixes #136

---
 examples/text/ttf_loading/main.go | 17 +++++++++--------
 raylib/rtext.go                   | 11 ++++++++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/examples/text/ttf_loading/main.go b/examples/text/ttf_loading/main.go
index 57e7eaa..1d266e6 100644
--- a/examples/text/ttf_loading/main.go
+++ b/examples/text/ttf_loading/main.go
@@ -3,7 +3,7 @@ package main
 import (
 	"fmt"
 
-	"github.com/gen2brain/raylib-go/raylib"
+	rl "github.com/gen2brain/raylib-go/raylib"
 )
 
 func main() {
@@ -17,7 +17,7 @@ func main() {
 	// NOTE: Textures/Fonts MUST be loaded after Window initialization (OpenGL context is required)
 
 	// TTF Font loading with custom generation parameters
-	font := rl.LoadFontEx("fonts/KAISG.ttf", 96, nil, 0)
+	font := rl.LoadFontEx("fonts/KAISG.ttf", 96, nil)
 
 	// Generate mipmap levels to use trilinear filtering
 	// NOTE: On 2D drawing it won't be noticeable, it looks like FILTER_BILINEAR
@@ -30,7 +30,7 @@ func main() {
 	rl.SetTextureFilter(font.Texture, rl.FilterPoint)
 	currentFontFilter := 0 // FilterPoint
 
-	count := int32(0)
+	count := 0
 	droppedFiles := make([]string, 0)
 
 	rl.SetTargetFPS(60)
@@ -38,7 +38,7 @@ func main() {
 	for !rl.WindowShouldClose() {
 		// Update
 		//----------------------------------------------------------------------------------
-		fontSize += rl.GetMouseWheelMove() * 4.0
+		fontSize += int32(rl.GetMouseWheelMove() * 4.0)
 
 		// Choose font texture filter method
 		if rl.IsKeyPressed(rl.KeyOne) {
@@ -63,12 +63,13 @@ func main() {
 
 		// Load a dropped TTF file dynamically (at current fontSize)
 		if rl.IsFileDropped() {
-			droppedFiles = rl.GetDroppedFiles(&count)
+			droppedFiles = rl.LoadDroppedFiles()
+			count = len(droppedFiles)
 
 			if count == 1 { // Only support one ttf file dropped
 				rl.UnloadFont(font)
-				font = rl.LoadFontEx(droppedFiles[0], fontSize, nil, 0)
-				rl.ClearDroppedFiles()
+				font = rl.LoadFontEx(droppedFiles[0], fontSize, nil)
+				rl.UnloadDroppedFiles()
 			}
 		}
 
@@ -104,7 +105,7 @@ func main() {
 
 	rl.UnloadFont(font) // Font unloading
 
-	rl.ClearDroppedFiles() // Clear internal buffers
+	rl.UnloadDroppedFiles() // Clear internal buffers
 
 	rl.CloseWindow()
 }
diff --git a/raylib/rtext.go b/raylib/rtext.go
index c228d78..f3435c8 100644
--- a/raylib/rtext.go
+++ b/raylib/rtext.go
@@ -37,12 +37,17 @@ func LoadFont(fileName string) Font {
 }
 
 // LoadFontEx - Load Font from file with extended parameters
-func LoadFontEx(fileName string, fontSize int32, fontChars *int32, charsCount int32) Font {
+func LoadFontEx(fileName string, fontSize int32, fontChars []rune) Font {
+	var cfontChars *C.int
+	var ccharsCount C.int
+
 	cfileName := C.CString(fileName)
 	defer C.free(unsafe.Pointer(cfileName))
 	cfontSize := (C.int)(fontSize)
-	cfontChars := (*C.int)(unsafe.Pointer(fontChars))
-	ccharsCount := (C.int)(charsCount)
+	if fontChars != nil {
+		cfontChars = (*C.int)(unsafe.Pointer(&fontChars[0]))
+		ccharsCount = (C.int)(len(fontChars))
+	}
 	ret := C.LoadFontEx(cfileName, cfontSize, cfontChars, ccharsCount)
 	v := newFontFromPointer(unsafe.Pointer(&ret))
 	return v