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

error at assets

Browse source
This commit is contained in:
MatejMagat305 2024-03-30 11:13:37 +01:00 • committed by GitHub
parent 2bdd1b881d
commit 542a43ef0e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 4 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

8
raylib/platform_android.c
View file

@ -1,11 +1,3 @@
// +build android // +build android
#include "_cgo_export.h"
struct android_app *GetAndroidApp();
void android_init() {
struct android_app *app;
app = GetAndroidApp();
asset_manager = app->activity->assetManager;
}

8
raylib/platform_android.go
View file

@ -10,10 +10,11 @@ package rl
#include <android/native_activity.h> #include <android/native_activity.h>
#include <android_native_app_glue.h> #include <android_native_app_glue.h>
extern void android_init();
extern struct ANativeActivity *GetANativeActivity(void); extern struct ANativeActivity *GetANativeActivity(void);
static AAssetManager* asset_manager;
static AAssetManager* getAssetManager(){
return GetANativeActivity()->assetManager;
}
static const char* getInternalStoragePath(){ static const char* getInternalStoragePath(){
return GetANativeActivity()->internalDataPath; return GetANativeActivity()->internalDataPath;
} }
@ -37,7 +38,6 @@ func InitWindow(width int32, height int32, title string) {
defer C.free(unsafe.Pointer(ctitle)) defer C.free(unsafe.Pointer(ctitle))
C.InitWindow(cwidth, cheight, ctitle) C.InitWindow(cwidth, cheight, ctitle)
C.android_init()
} }
// SetCallbackFunc - Sets callback function // SetCallbackFunc - Sets callback function
@ -102,7 +102,7 @@ func OpenAsset(name string) (Asset, error) {
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
a := &asset{C.AAssetManager_open(C.asset_manager, cname, C.AASSET_MODE_UNKNOWN)} a := &asset{C.AAssetManager_open(C.getAssetManager(), cname, C.AASSET_MODE_UNKNOWN)}
if a.ptr == nil { if a.ptr == nil {
return nil, fmt.Errorf("asset file could not be opened") return nil, fmt.Errorf("asset file could not be opened")