upgrade to Filament 1.21.0

This commit is contained in:
Nick Fisher
2022-04-14 01:54:33 +08:00
parent f4f7d28388
commit 53ab72bcff
139 changed files with 4410 additions and 20097 deletions

View File

@@ -56,15 +56,13 @@ extern "C" {
void* filament_viewer_new(
jobject surface,
const char* opaqueShaderPath,
const char* fadeShaderPath,
JNIEnv* env,
jobject assetManager
) {
ANativeWindow* layer = ANativeWindow_fromSurface(env, surface);
am = AAssetManager_fromJava(env, assetManager);
return new FilamentViewer((void*)layer, opaqueShaderPath, fadeShaderPath, loadResource, freeResource);
return new FilamentViewer((void*)layer, loadResource, freeResource);
}
void render(

View File

@@ -8,8 +8,6 @@ void load_skybox(void* viewer, const char* skyboxPath, const char* iblPath);
void* filament_viewer_new(
void* layer,
const char* opaqueShaderPath,
const char* fadeShaderPath,
void* assetManager
);
}

View File

@@ -20,8 +20,6 @@ interface FilamentInterop : Library {
fun filament_viewer_new(
layer:Object,
opaqueShaderPath:String,
fadeShaderPath:String,
env:JNIEnv,
am:AssetManager
) : Pointer;