Scarfski/filament
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Camera settings from gltf_viewer to SimpleViewer.

Browse Source
This commit is contained in:
Philip Rideout
2021-03-23 11:51:51 -07:00
parent 4de1b0de2d
commit 495fb14b9c
11 changed files with 220 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/filament-utils-android/src/main/cpp/AutomationEngine.cpp
View File

@@ -94,7 +94,7 @@ Java_com_google_android_filament_utils_AutomationEngine_nTick(JNIEnv* env, jclas
extern "C" JNIEXPORT void JNICALL
Java_com_google_android_filament_utils_AutomationEngine_nApplySettings(JNIEnv* env, jclass klass,
jlong nativeAutomation, jstring json, jlong view, jlongArray materials, jlong nativeIbl,
jint lightEntity, jlong nativeLm, jlong scene) {
jint lightEntity, jlong nativeLm, jlong scene, jlong renderer) {
using MaterialPointer = MaterialInstance*;
jsize materialCount = 0;
jlong* longMaterials = nullptr;
@@ -112,7 +112,7 @@ Java_com_google_android_filament_utils_AutomationEngine_nApplySettings(JNIEnv* e
size_t jsonLength = env->GetStringUTFLength(json);
automation->applySettings(nativeJson, jsonLength, (View*) view, ptrMaterials, materialCount,
(IndirectLight*) nativeIbl, (Entity&) lightEntity, (LightManager*) nativeLm,
(Scene*) scene);
(Scene*) scene, (Renderer*) renderer);
env->ReleaseStringUTFChars(json, nativeJson);
if (longMaterials) {
env->ReleaseLongArrayElements(materials, longMaterials, 0);