Merge branch 'rc/1.15.0' into release

Update RELEASE_NOTES for 1.15.0
Use __ANDROID__ instead of ANDROID
2021-12-06 11:14:00 -08:00 · 2021-12-02 11:52:04 -08:00 · 2021-11-30 11:15:49 -08:00 · 2021-11-30 11:15:42 -08:00 · 2021-11-29 14:08:28 -08:00 · 2021-11-29 14:07:03 -08:00
9 changed files with 15 additions and 14 deletions
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ repositories {
 }

 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.14.2'
+    implementation 'com.google.android.filament:filament-android:1.15.0'
 }
 ```

@@ -52,7 +52,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
 iOS projects can use CocoaPods to install the latest release:

 ```
-pod 'Filament', '~> 1.14.2'
+pod 'Filament', '~> 1.15.0'
 ```

 ### Snapshots
--- a/RELEASE_NOTES.md
+++ b/RELEASE_NOTES.md
@@ -6,6 +6,7 @@ A new header is inserted each time a *tag* is created.
 ## v1.15.0 (currently main branch)

 - engine: Fix spotlights normal bias calculation [⚠️ **Material breakage**].
+- libimage: Fix loading spherical harmonics on certain locals.

 ## v1.14.2

--- a/android/common/CallbackUtils.cpp
+++ b/android/common/CallbackUtils.cpp
@@ -19,7 +19,7 @@
 #include "private/backend/VirtualMachineEnv.h"

 void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {
-#ifdef ANDROID
+#ifdef __ANDROID__
    callbackUtils.handlerClass = env->FindClass("android/os/Handler");
    callbackUtils.handlerClass = (jclass) env->NewGlobalRef(callbackUtils.handlerClass);
    callbackUtils.post = env->GetMethodID(callbackUtils.handlerClass,
@@ -34,7 +34,7 @@ void acquireCallbackJni(JNIEnv* env, CallbackJni& callbackUtils) {

 void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler, jobject callback) {
    if (handler && callback) {
-#ifdef ANDROID
+#ifdef __ANDROID__
        if (env->IsInstanceOf(handler, callbackUtils.handlerClass)) {
            env->CallBooleanMethod(handler, callbackUtils.post, callback);
        }
@@ -45,7 +45,7 @@ void releaseCallbackJni(JNIEnv* env, CallbackJni callbackUtils, jobject handler,
    }
    env->DeleteGlobalRef(handler);
    env->DeleteGlobalRef(callback);
-#ifdef ANDROID
+#ifdef __ANDROID__
    env->DeleteGlobalRef(callbackUtils.handlerClass);
 #endif
    env->DeleteGlobalRef(callbackUtils.executorClass);
--- a/android/common/CallbackUtils.h
+++ b/android/common/CallbackUtils.h
@@ -25,7 +25,7 @@
 #include <filament/Engine.h>

 struct CallbackJni {
-#ifdef ANDROID
+#ifdef __ANDROID__
    jclass handlerClass = nullptr;
    jmethodID post = nullptr;
 #endif
--- a/android/filament-android/src/main/cpp/Stream.cpp
+++ b/android/filament-android/src/main/cpp/Stream.cpp
@@ -24,7 +24,7 @@
 #include "common/NioUtils.h"
 #include "common/CallbackUtils.h"

-#ifdef ANDROID
+#ifdef __ANDROID__

 #if __has_include(<android/hardware_buffer_jni.h>)
 #include <android/hardware_buffer_jni.h>
@@ -190,7 +190,7 @@ Java_com_google_android_filament_Stream_nSetAcquiredImage(JNIEnv* env, jclass, j
    Engine* engine = (Engine*) nativeEngine;
    Stream* stream = (Stream*) nativeStream;

-#ifdef ANDROID
+#ifdef __ANDROID__

    // This function is not available before NDK 15 or before Android 8.
    if (UTILS_UNLIKELY(!AHardwareBuffer_fromHardwareBuffer_fn)) {
--- a/android/filament-android/src/main/cpp/Texture.cpp
+++ b/android/filament-android/src/main/cpp/Texture.cpp
@@ -19,7 +19,7 @@
 #include <algorithm>
 #include <functional>

-#ifdef ANDROID
+#ifdef __ANDROID__
 #include <android/bitmap.h>
 #endif

@@ -471,7 +471,7 @@ Java_com_google_android_filament_Texture_nGeneratePrefilterMipmap(JNIEnv *env, j
 // ANDROID SPECIFIC BITS
 ////////////////////////////////////////////////////////////////////////////////////////////////////

-#ifdef ANDROID
+#ifdef __ANDROID__

 #define BITMAP_CONFIG_ALPHA_8   0
 #define BITMAP_CONFIG_RGB_565   1
--- a/android/gradle.properties
+++ b/android/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.14.2
+VERSION_NAME=1.15.0

 POM_DESCRIPTION=Real-time physically based rendering engine for Android.

--- a/ios/CocoaPods/Filament.podspec
+++ b/ios/CocoaPods/Filament.podspec
@@ -1,12 +1,12 @@
 Pod::Spec.new do |spec|
  spec.name = "Filament"
-  spec.version = "1.14.2"
+  spec.version = "1.15.0"
  spec.license = { :type => "Apache 2.0", :file => "LICENSE" }
  spec.homepage = "https://google.github.io/filament"
  spec.authors = "Google LLC."
  spec.summary = "Filament is a real-time physically based rendering engine for Android, iOS, Windows, Linux, macOS, and WASM/WebGL."
  spec.platform = :ios, "11.0"
-  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.14.2/filament-v1.14.2-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.15.0/filament-v1.15.0-ios.tgz" }

  # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
  spec.pod_target_xcconfig = {
--- a/web/filament-js/package.json
+++ b/web/filament-js/package.json
@@ -1,6 +1,6 @@
 {
  "name": "filament",
-  "version": "1.14.2",
+  "version": "1.15.0",
  "description": "Real-time physically based rendering engine",
  "main": "filament.js",
  "module": "filament.js",