Merge branch 'main' of github.com:google/filament

daz3d · Jul 26, 2021 · c1a3168 · c1a3168
2 parents 9e3d1fe + ba68ea8
commit c1a3168
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,7 @@ repositories {
 }
 
 dependencies {
-    implementation 'com.google.android.filament:filament-android:1.11.0'
+    implementation 'com.google.android.filament:filament-android:1.11.1'
 }
 ```
 
@@ -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.11.0'
+pod 'Filament', '~> 1.11.1'
 ```
 
 ### Snapshots

diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -3,7 +3,9 @@
 This file contains one line summaries of commits that are worthy of mentioning in release notes.
 A new header is inserted each time a *tag* is created.
 
-## v1.11.2 (currently main branch)
+## v1.11.3 (currently main branch)
+
+## v1.11.2
 
 - engine: New API: `ColorGrading::Builder::toneMapper(const ToneMapper*)`.
 - engine: New tone mapper: `GenericToneMapper`, a configurable tone mapper.
@@ -15,8 +17,11 @@ A new header is inserted each time a *tag* is created.
 - engine: Luminance scaling can now be used with any tone mapping operator. It was previously tied
   to the "EVILS" tone mapping operator.
 - engine: Removed the "EVILS" tone mapping operator [⚠️ **API Change**].
-- engine: Improvements to Skinning. A new `SkinningBuffer` API allows bone sharing between 
+- engine: Improvements to Skinning. A new `SkinningBuffer` API allows bone sharing between
   renderables.
+- engine: Improvements to internal memory allocation for Metal and Vulkan backends.
+- engine: Default to OpenGL backend when Windows does not support Vulkan.
+- samples: Add new sample app: image_viewer.
 
 ## v1.11.0
 

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -1,5 +1,5 @@
 GROUP=com.google.android.filament
-VERSION_NAME=1.11.0
+VERSION_NAME=1.11.1
 
 POM_DESCRIPTION=Real-time physically based rendering engine for Android.
 

diff --git 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.11.0"
+  spec.version = "1.11.1"
   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.11.0/filament-v1.11.0-ios.tgz" }
+  spec.source = { :http => "https://github.com/google/filament/releases/download/v1.11.1/filament-v1.11.1-ios.tgz" }
 
   # Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
   spec.pod_target_xcconfig = {

diff --git a/web/filament-js/package.json b/web/filament-js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "filament",
-  "version": "1.11.0",
+  "version": "1.11.1",
   "description": "Real-time physically based rendering engine",
   "main": "filament.js",
   "module": "filament.js",