add special android directory methods and initialization args

This commit is contained in:
Mamadou Babaei
2023-03-16 23:59:28 +01:00
parent 05c48fb7f3
commit 6fb666d887
6 changed files with 22 additions and 8 deletions
@@ -42,6 +42,7 @@
#if PLATFORM_ANDROID
#include "SGConnectImpl/SGExportedFunctions.h"
#include "SGInterop/SGIC_FString.h"
#include "SGInterop/SGIC_jclass.h"
#include "SGInterop/SGIC_jmethodID.h"
#include "SGInterop/SGIC_JNIEnv_Ptr.h"
@@ -110,10 +111,13 @@ int32 FSGConnectJNI::Initialize()
}
FSGIC_jmethodID InGetLibraryVersionMethodIDContainer{GetLibraryVersionMethodID};
FSGIC_FString ProjectSavedDirContainer{FPaths::ProjectSavedDir()};
Result = SGConnectImpl_Android_Initialize(&InEnvContainer, &InClassContainer,
&InInitMethodIDContainer,
&InDisposeMethodIDContainer,
&InGetLibraryVersionMethodIDContainer);
&InGetLibraryVersionMethodIDContainer,
&ProjectSavedDirContainer);
#endif /* PLATFORM_ANDROID */
return Result;
@@ -42,6 +42,7 @@
#if PLATFORM_ANDROID
#include "SGCoreImpl/SGExportedFunctions.h"
#include "SGInterop/SGIC_FString.h"
#include "SGInterop/SGIC_jclass.h"
#include "SGInterop/SGIC_jmethodID.h"
#include "SGInterop/SGIC_JNIEnv_Ptr.h"
@@ -123,11 +124,14 @@ int32 FSGCoreJNI::Initialize()
}
FSGIC_jmethodID InWriteHapticsMethodIDContainer{WriteHapticsMethodID};
FSGIC_FString ProjectSavedDirContainer{FPaths::ProjectSavedDir()};
Result = SGCoreImpl_Android_Initialize(&InEnvContainer, &InClassContainer,
&InActiveDevicesMethodIDContainer,
&InGetDeviceStringMethodIDContainer,
&InGetSensorStringMethodIDContainer,
&InWriteHapticsMethodIDContainer);
&InWriteHapticsMethodIDContainer,
&ProjectSavedDirContainer);
#endif /* PLATFORM_ANDROID */
return Result;
@@ -60,14 +60,16 @@ int32 SGConnectImpl_Android_Initialize(
void* InClass,
void* InInitMethodID,
void* InDisposeMethodID,
void* InGetLibraryVersionMethodID)
void* InGetLibraryVersionMethodID,
void* StoragePath)
{
return SGConnect::Android::Initialize(
StaticCast<FSGIC_JNIEnv_Ptr*>(InEnv)->Ptr,
StaticCast<FSGIC_jclass*>(InClass)->Class,
StaticCast<FSGIC_jmethodID*>(InInitMethodID)->MethodID,
StaticCast<FSGIC_jmethodID*>(InDisposeMethodID)->MethodID,
StaticCast<FSGIC_jmethodID*>(InGetLibraryVersionMethodID)->MethodID);
StaticCast<FSGIC_jmethodID*>(InGetLibraryVersionMethodID)->MethodID,
std::string{TCHAR_TO_UTF8(*StaticCast<FSGIC_FString*>(StoragePath)->String)});
}
#endif /* PLATFORM_ANDROID */
@@ -74,7 +74,8 @@ SENSEGLOVECONNECTIMPL_PUBLIC_API int32 SGConnectImpl_Android_Initialize(
void* InClass,
void* InInitMethodID,
void* InDisposeMethodID,
void* InGetLibraryVersionMethodID);
void* InGetLibraryVersionMethodID,
void* StoragePath);
#endif /* PLATFORM_ANDROID */
/*******************************************************************************
@@ -154,7 +154,8 @@ int32 SGCoreImpl_Android_Initialize(
void* InActiveDevicesMethodID,
void* InGetDeviceStringMethodID,
void* InGetSensorStringMethodID,
void* InWriteHapticsMethodID)
void* InWriteHapticsMethodID,
void* StoragePath)
{
return SGCore::Android::Initialize(
StaticCast<FSGIC_JNIEnv_Ptr*>(InEnv)->Ptr,
@@ -162,7 +163,8 @@ int32 SGCoreImpl_Android_Initialize(
StaticCast<FSGIC_jmethodID*>(InActiveDevicesMethodID)->MethodID,
StaticCast<FSGIC_jmethodID*>(InGetDeviceStringMethodID)->MethodID,
StaticCast<FSGIC_jmethodID*>(InGetSensorStringMethodID)->MethodID,
StaticCast<FSGIC_jmethodID*>(InWriteHapticsMethodID)->MethodID);
StaticCast<FSGIC_jmethodID*>(InWriteHapticsMethodID)->MethodID,
std::string{TCHAR_TO_UTF8(*StaticCast<FSGIC_FString*>(StoragePath)->String)});
}
#endif /* PLATFORM_ANDROID */
@@ -75,7 +75,8 @@ SENSEGLOVECOREIMPL_PUBLIC_API int32 SGCoreImpl_Android_Initialize(
void* InActiveDevicesMethodID,
void* InGetDeviceStringMethodID,
void* InGetSensorStringMethodID,
void* InWriteHapticsMethodID);
void* InWriteHapticsMethodID,
void* StoragePath);
#endif /* PLATFORM_ANDROID */
/*******************************************************************************