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/GraphicsEngine/interface/EngineFactory.h | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'Graphics/GraphicsEngine') diff --git a/Graphics/GraphicsEngine/interface/EngineFactory.h b/Graphics/GraphicsEngine/interface/EngineFactory.h index b289911a..2f8a551c 100644 --- a/Graphics/GraphicsEngine/interface/EngineFactory.h +++ b/Graphics/GraphicsEngine/interface/EngineFactory.h @@ -33,6 +33,12 @@ #include "../../../Primitives/interface/Object.h" #include "APIInfo.h" + +#if PLATFORM_ANDROID +struct ANativeActivity; +struct AAssetManager; +#endif + DILIGENT_BEGIN_NAMESPACE(Diligent) struct IShaderSourceInputStreamFactory; @@ -67,11 +73,15 @@ DILIGENT_BEGIN_INTERFACE(IEngineFactory, IObject) #if PLATFORM_ANDROID /// On Android platform, it is necessary to initialize the file system before /// CreateDefaultShaderSourceStreamFactory() method can be called. - /// \param [in] Activity - Pointer to the activity. - /// \param [in] ActivityClassName - Activity class name. + /// \param [in] NativeActivity - Pointer to the native activity object (ANativeActivity). + /// \param [in] NativeActivityClassName - Native activity class name. + /// \param [in] AssetManager - Pointer to the asset manager (AAssetManager). + /// + /// \remarks See AndroidFileSystem::Init. VIRTUAL void METHOD(InitAndroidFileSystem)(THIS_ - void* Activity, - const char* ActivityClassName) CONST PURE; + struct ANativeActivity* NativeActivity, + const char* NativeActivityClassName, + struct AAssetManager* AssetManager) CONST PURE; #endif }; DILIGENT_END_INTERFACE -- cgit v1.2.3