Improve GUI on Android, add OpenAsset function

raylib/platform_android.c

@@ -5,3 +5,9 @@
 void android_main(struct android_app *app) {
     androidMain(app);
 }
+
+void init_asset_manager(void *state) {
+    struct android_app *app;
+	app = (struct android_app *)state;
+	asset_manager = app->activity->assetManager;
+}

raylib/platform_android.go

@@ -4,12 +4,21 @@ package raylib
 
 /*
 #include "raylib.h"
-#include "android_native_app_glue.h"
+#include <android/asset_manager.h>
+#include <android_native_app_glue.h>
 
 extern void android_main(struct android_app *app);
+
+AAssetManager* asset_manager;
+extern void init_asset_manager(void *state);
 */
 import "C"
-import "unsafe"
+
+import (
+	"errors"
+	"io"
+	"unsafe"
+)
 
 var callbackHolder func(unsafe.Pointer)
 
@@ -18,6 +27,7 @@ func InitWindow(width int32, height int32, app unsafe.Pointer) {
 	cwidth := (C.int)(width)
 	cheight := (C.int)(height)
 	C.InitWindow(cwidth, cheight, app)
+	C.init_asset_manager(app)
 }
 
 // Sets callback function
@@ -31,3 +41,34 @@ func androidMain(app *C.struct_android_app) {
 		callbackHolder(unsafe.Pointer(app))
 	}
 }
+
+// Open asset
+func OpenAsset(name string) (io.ReadCloser, error) {
+	cname := C.CString(name)
+	defer C.free(unsafe.Pointer(cname))
+
+	a := &asset{C.AAssetManager_open(C.asset_manager, cname, C.AASSET_MODE_UNKNOWN)}
+
+	if a.ptr == nil {
+		return nil, errors.New("asset file could not be opened")
+	}
+
+	return a, nil
+}
+
+type asset struct {
+	ptr *C.AAsset
+}
+
+func (a *asset) Read(p []byte) (n int, err error) {
+	n = int(C.AAsset_read(a.ptr, unsafe.Pointer(&p[0]), C.size_t(len(p))))
+	if n == 0 && len(p) > 0 {
+		return 0, io.EOF
+	}
+	return n, nil
+}
+
+func (a *asset) Close() error {
+	C.AAsset_close(a.ptr)
+	return nil
+}

raylib/platform_arm.go

@@ -44,3 +44,12 @@ func EnableCursor() {
 func DisableCursor() {
 	C.DisableCursor()
 }
+
+// Open asset
+func OpenAsset(name string) (io.ReadCloser, error) {
+	f, err := os.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	return f, nil
+}

raylib/platform_desktop.go

@@ -7,7 +7,12 @@ package raylib
 #include <stdlib.h>
 */
 import "C"
-import "unsafe"
+
+import (
+	"io"
+	"os"
+	"unsafe"
+)
 
 // Initialize Window and OpenGL Graphics
 func InitWindow(width int32, height int32, title string) {
@@ -70,3 +75,12 @@ func GetDroppedFiles(count *int32) []string {
 func ClearDroppedFiles() {
 	C.ClearDroppedFiles()
 }
+
+// Open asset
+func OpenAsset(name string) (io.ReadCloser, error) {
+	f, err := os.Open(name)
+	if err != nil {
+		return nil, err
+	}
+	return f, nil
+}

raylib/utils.go

@@ -17,6 +17,11 @@ const (
 
 var traceDebugMsgs = false
 
+// Set debug messages
+func SetDebug(enabled bool) {
+	traceDebugMsgs = enabled
+}
+
 // Trace log
 func TraceLog(msgType int, text string, v ...interface{}) {
 	switch msgType {
@@ -33,8 +38,3 @@ func TraceLog(msgType int, text string, v ...interface{}) {
 		}
 	}
 }
-
-// Set debug messages
-func SetDebug(enabled bool) {
-	traceDebugMsgs = enabled
-}

raylib/utils_android.go

@@ -6,26 +6,26 @@ package raylib
 #include <android/log.h>
 #include <stdlib.h>
 
-void logInfo(const char *msg) {
+void log_info(const char *msg) {
     __android_log_print(ANDROID_LOG_INFO, "raylib", msg);
 }
 
-void logWarn(const char *msg) {
+void log_warn(const char *msg) {
     __android_log_print(ANDROID_LOG_WARN, "raylib", msg);
 }
 
-void logError(const char *msg) {
+void log_error(const char *msg) {
     __android_log_print(ANDROID_LOG_ERROR, "raylib", msg);
 }
 
-void logDebug(const char *msg) {
+void log_debug(const char *msg) {
     __android_log_print(ANDROID_LOG_DEBUG, "raylib", msg);
 }
 
-void logInfo(const char *msg);
-void logWarn(const char *msg);
-void logError(const char *msg);
-void logDebug(const char *msg);
+void log_info(const char *msg);
+void log_warn(const char *msg);
+void log_error(const char *msg);
+void log_debug(const char *msg);
 */
 import "C"
 
@@ -45,30 +45,32 @@ const (
 
 var traceDebugMsgs = false
 
+// Set debug messages
+func SetDebug(enabled bool) {
+	traceDebugMsgs = enabled
+}
+
+// Trace log
 func TraceLog(msgType int, text string, v ...interface{}) {
 	switch msgType {
 	case LogInfo:
 		msg := C.CString(fmt.Sprintf("INFO: "+text, v...))
 		defer C.free(unsafe.Pointer(msg))
-		C.logInfo(msg)
+		C.log_info(msg)
 	case LogError:
 		msg := C.CString(fmt.Sprintf("ERROR: "+text, v...))
 		defer C.free(unsafe.Pointer(msg))
-		C.logError(msg)
+		C.log_error(msg)
 		os.Exit(1)
 	case LogWarning:
 		msg := C.CString(fmt.Sprintf("WARNING: "+text, v...))
 		defer C.free(unsafe.Pointer(msg))
-		C.logWarn(msg)
+		C.log_warn(msg)
 	case LogDebug:
 		if traceDebugMsgs {
 			msg := C.CString(fmt.Sprintf("DEBUG: "+text, v...))
 			defer C.free(unsafe.Pointer(msg))
-			C.logDebug(msg)
+			C.log_debug(msg)
 		}
 	}
 }
-
-func SetDebug(enabled bool) {
-	traceDebugMsgs = enabled
-}