Compare commits

..

1 Commits

Author SHA1 Message Date
Sungun Park
23e1779f1e Fix a compile error
FMaterial accesses a private static method of the MaterialDefinition
class, which incurs a compile error for certain compilers.
2025-09-24 12:07:40 -07:00
6 changed files with 8 additions and 15 deletions

View File

@@ -31,7 +31,7 @@ repositories {
}
dependencies {
implementation 'com.google.android.filament:filament-android:1.65.3'
implementation 'com.google.android.filament:filament-android:1.65.2'
}
```
@@ -51,7 +51,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
iOS projects can use CocoaPods to install the latest release:
```shell
pod 'Filament', '~> 1.65.3'
pod 'Filament', '~> 1.65.2'
```
## Documentation

View File

@@ -1,5 +1,5 @@
GROUP=com.google.android.filament
VERSION_NAME=1.65.3
VERSION_NAME=1.65.2
POM_DESCRIPTION=Real-time physically based rendering engine for Android.

View File

@@ -51,14 +51,7 @@ MaterialDefinition* UTILS_NULLABLE MaterialCache::acquire(FEngine& engine,
engine.getShaderLanguage(), data, size);
assert_invariant(parser);
// The `key` must be constructed using parser.get() before parser is moved into the lambda
// function. This prevents a potential crash or undefined behavior, as accessing a moved-from
// object is unsafe. The validity of the generated key is guaranteed because the
// MaterialDefinition object (which owns the same parser object) created within the lambda is
// subsequently used as the associated value in the map.
const Key key{ parser.get() };
return mDefinitions.acquire(key, [&engine, parser = std::move(parser)]() mutable {
return mDefinitions.acquire(Key{parser.get()}, [&engine, parser = std::move(parser)]() mutable {
return MaterialDefinition::create(engine, std::move(parser));
});
}

View File

@@ -109,7 +109,7 @@ struct MaterialDefinition {
private:
friend class MaterialCache;
friend class FMaterial; // for onEditCallback
friend class FMaterial;
static std::unique_ptr<MaterialParser> createParser(backend::Backend const backend,
utils::FixedCapacityVector<backend::ShaderLanguage> languages,

View File

@@ -1,12 +1,12 @@
Pod::Spec.new do |spec|
spec.name = "Filament"
spec.version = "1.65.3"
spec.version = "1.65.2"
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.65.3/filament-v1.65.3-ios.tgz" }
spec.source = { :http => "https://github.com/google/filament/releases/download/v1.65.2/filament-v1.65.2-ios.tgz" }
# Fix linking error with Xcode 12; we do not yet support the simulator on Apple silicon.
spec.pod_target_xcconfig = {

View File

@@ -1,6 +1,6 @@
{
"name": "filament",
"version": "1.65.3",
"version": "1.65.2",
"description": "Real-time physically based rendering engine",
"main": "filament.js",
"module": "filament.js",