From 095de7682100db812822a43168b78c15fad28d8a Mon Sep 17 00:00:00 2001 From: assiduous Date: Mon, 11 May 2020 17:31:16 -0700 Subject: Improved Android file loading --- Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'Graphics/GraphicsEngineOpenGL') diff --git a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp index 7566a6ce..88dde5f4 100644 --- a/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp +++ b/Graphics/GraphicsEngineOpenGL/src/EngineFactoryOpenGL.cpp @@ -92,7 +92,9 @@ public: IDeviceContext** ppImmediateContext) override final; #if PLATFORM_ANDROID - virtual void InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const override final; + virtual void InitAndroidFileSystem(struct ANativeActivity* NativeActivity, + const char* NativeActivityClassName, + struct AAssetManager* AssetManager) const override final; #endif }; @@ -276,9 +278,11 @@ void EngineFactoryOpenGLImpl::CreateHLSL2GLSLConverter(IHLSL2GLSLConverter** ppC } #if PLATFORM_ANDROID -void EngineFactoryOpenGLImpl::InitAndroidFileSystem(void* Activity, const char* ActivityClassName) const +void EngineFactoryOpenGLImpl::InitAndroidFileSystem(struct ANativeActivity* NativeActivity, + const char* NativeActivityClassName, + struct AAssetManager* AssetManager) const { - AndroidFileSystem::Init(Activity, ActivityClassName); + AndroidFileSystem::Init(NativeActivity, NativeActivityClassName, AssetManager); } #endif -- cgit v1.2.3