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

API CHANGE: make ssao options work like all other options

Browse Source 
setAmbientOcclusion (and associates) is now deprecated (but still works),
in favor of the new .enabled field in AmbientOcclusionOptions.
This commit is contained in:
Pixelflinger
2020-08-10 14:06:21 -07:00
committed by Mathias Agopian
parent b3c57a4ee1
commit 08e411aeac
13 changed files with 113 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/filament-android/src/main/cpp/View.cpp
View File

@@ -178,19 +178,25 @@ Java_com_google_android_filament_View_nIsFrontFaceWindingInverted(JNIEnv*,
extern "C" JNIEXPORT void JNICALL
Java_com_google_android_filament_View_nSetAmbientOcclusion(JNIEnv*, jclass, jlong nativeView, jint ordinal) {
View* view = (View*) nativeView;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
view->setAmbientOcclusion((View::AmbientOcclusion) ordinal);
#pragma clang diagnostic pop
}
extern "C" JNIEXPORT jint JNICALL
Java_com_google_android_filament_View_nGetAmbientOcclusion(JNIEnv*, jclass, jlong nativeView) {
View* view = (View*) nativeView;
#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wdeprecated-declarations"
return (jint)view->getAmbientOcclusion();
#pragma clang diagnostic pop
}
extern "C" JNIEXPORT void JNICALL
Java_com_google_android_filament_View_nSetAmbientOcclusionOptions(JNIEnv*, jclass,
jlong nativeView, jfloat radius, jfloat bias, jfloat power, jfloat resolution, jfloat intensity,
jint quality, jint upsampling) {
jint quality, jint upsampling, jboolean enabled) {
View* view = (View*) nativeView;
View::AmbientOcclusionOptions options = {
.radius = radius,
@@ -199,7 +205,8 @@ Java_com_google_android_filament_View_nSetAmbientOcclusionOptions(JNIEnv*, jclas
.resolution = resolution,
.intensity = intensity,
.quality = (View::QualityLevel)quality,
.upsampling = (View::QualityLevel)upsampling
.upsampling = (View::QualityLevel)upsampling,
.enabled = (bool)enabled
};
view->setAmbientOcclusionOptions(options);
}