From b3e9940625678a31aa9bb7e17c2188740833e8cc Mon Sep 17 00:00:00 2001 From: Philip Rideout Date: Tue, 17 May 2022 12:24:34 -0700 Subject: [PATCH] Java minor API change: ssctStartTraceDistance => ssctShadowDistance (#5566) This makes Java match better with C++ and helps prepare for autogenerated Java bindings. --- RELEASE_NOTES.md | 2 ++ android/filament-android/src/main/cpp/View.cpp | 4 ++-- .../src/main/java/com/google/android/filament/View.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 735ebaf157..17625b53da 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -5,6 +5,8 @@ A new header is inserted each time a *tag* is created. ## v1.22.2 (currently main branch) +- Java minor API change: rename ssctStartTraceDistance to ssctShadowDistance + ## v1.22.1 - Metal: Shaders now use `half` floating-point arithmetic when possible for improved performance. [⚠️ **Recompile Materials**] diff --git a/android/filament-android/src/main/cpp/View.cpp b/android/filament-android/src/main/cpp/View.cpp index a8bcc22f3d..f519ceeb49 100644 --- a/android/filament-android/src/main/cpp/View.cpp +++ b/android/filament-android/src/main/cpp/View.cpp @@ -259,14 +259,14 @@ Java_com_google_android_filament_View_nSetAmbientOcclusionOptions(JNIEnv*, jclas extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_View_nSetSSCTOptions(JNIEnv *, jclass, jlong nativeView, - jfloat ssctLightConeRad, jfloat ssctStartTraceDistance, jfloat ssctContactDistanceMax, + jfloat ssctLightConeRad, jfloat ssctShadowDistance, jfloat ssctContactDistanceMax, jfloat ssctIntensity, jfloat ssctLightDirX, jfloat ssctLightDirY, jfloat ssctLightDirZ, jfloat ssctDepthBias, jfloat ssctDepthSlopeBias, jint ssctSampleCount, jint ssctRayCount, jboolean ssctEnabled) { View* view = (View*) nativeView; View::AmbientOcclusionOptions options = view->getAmbientOcclusionOptions(); options.ssct.lightConeRad = ssctLightConeRad; - options.ssct.shadowDistance = ssctStartTraceDistance; + options.ssct.shadowDistance = ssctShadowDistance; options.ssct.contactDistanceMax = ssctContactDistanceMax; options.ssct.intensity = ssctIntensity; options.ssct.lightDirection = math::float3{ ssctLightDirX, ssctLightDirY, ssctLightDirZ }; diff --git a/android/filament-android/src/main/java/com/google/android/filament/View.java b/android/filament-android/src/main/java/com/google/android/filament/View.java index 2f47d71d5f..8dffe7360e 100644 --- a/android/filament-android/src/main/java/com/google/android/filament/View.java +++ b/android/filament-android/src/main/java/com/google/android/filament/View.java @@ -252,7 +252,7 @@ public class View { * Distance from where tracing starts. * This affects how far shadows are cast. */ - public float ssctStartTraceDistance = 0.01f; + public float ssctShadowDistance = 0.01f; /** * Maximum contact distance with the cone. Intersections between the traced cone and @@ -1616,7 +1616,7 @@ public class View { options.resolution, options.intensity, options.bilateralThreshold, options.quality.ordinal(), options.lowPassFilter.ordinal(), options.upsampling.ordinal(), options.enabled, options.bentNormals, options.minHorizonAngleRad); - nSetSSCTOptions(getNativeObject(), options.ssctLightConeRad, options.ssctStartTraceDistance, + nSetSSCTOptions(getNativeObject(), options.ssctLightConeRad, options.ssctShadowDistance, options.ssctContactDistanceMax, options.ssctIntensity, options.ssctLightDirection[0], options.ssctLightDirection[1], options.ssctLightDirection[2], options.ssctDepthBias, options.ssctDepthSlopeBias, options.ssctSampleCount,