Skip to content

Commit 078441d

Browse files
authored
Merge branch 'main' into streamed_texture
2 parents ffd6e28 + 629f35f commit 078441d

File tree

72 files changed

+1664
-577
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+1664
-577
lines changed

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -398,8 +398,8 @@ if (MSVC)
398398
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_CRT_SECURE_NO_WARNINGS -D_CRT_NONSTDC_NO_DEPRECATE")
399399
endif()
400400

401-
# Add colors to ninja builds
402-
if (UNIX AND CMAKE_GENERATOR STREQUAL "Ninja")
401+
# Add colors to ninja builds (when not using gcc)
402+
if (UNIX AND CMAKE_GENERATOR STREQUAL "Ninja" AND NOT FILAMENT_USING_GCC)
403403
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fcolor-diagnostics")
404404
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fcolor-diagnostics")
405405
endif()

android/filament-android/src/main/java/com/google/android/filament/TextureSampler.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -294,8 +294,8 @@ public float getAnisotropy() {
294294
/**
295295
* This controls anisotropic filtering.
296296
*
297-
* @param anisotropy Amount of anisotropy, should be a power-of-two. The default is 0.
298-
* The maximum permissible value is 7.
297+
* @param anisotropy Amount of anisotropy, should be a power-of-two. The default is 1.
298+
* The maximum permissible value is 128.
299299
*/
300300
public void setAnisotropy(float anisotropy) {
301301
mSampler = nSetAnisotropy(mSampler, anisotropy);

docs/build/maven_release.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ <h2 id="register-for-a-sonatype-account"><a class="header" href="#register-for-a
165165
<p>To publish under the <code>com.google.android</code> namespace, you'll also need to email
166166
<code>central-support@sonatype.com</code> with your account information to request access.</p>
167167
<p>Then, generate a user token through the Sonatype website. Navigate to
168-
<a href="https://central.sonatype.com/account">https://central.sonatype.com/account</a> and select <strong>Generate
169-
User Token</strong>.</p>
168+
<a href="https://central.sonatype.com/usertoken">https://central.sonatype.com/usertoken</a>
169+
and select <strong>Generate User Token</strong>.</p>
170170
<p>Finally, add the generated token credentials to <code>~/.gradle/gradle.properties</code>. (Note: these are
171171
different from the credentials used to log into your Sonatype account):</p>
172172
<pre><code class="language-gradle"># Generated Sonatype token

docs/remote/filament.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/remote/filament.wasm

21.5 KB
Binary file not shown.

docs/searchindex.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/searchindex.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

docs_src/build/requirements.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
attrs==25.4.0
2+
certifi==2025.10.5
3+
h11==0.16.0
4+
idna==3.11
5+
outcome==1.3.0.post0
6+
PySocks==1.7.1
7+
selenium==4.37.0
8+
sniffio==1.3.1
9+
sortedcontainers==2.4.0
10+
trio==0.31.0
11+
trio-websocket==0.12.2
12+
typing_extensions==4.15.0
13+
urllib3==2.5.0
14+
websocket-client==1.9.0
15+
wsproto==1.2.0

docs_src/build/run.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,8 @@ def start_server(port):
140140
res, err = execute('mdbook build', cwd=MDBOOK_DIR)
141141
assert res == 0, f"failed to execute `mdbook`. return-code={res} err=\"{err}\""
142142

143-
shutil.copytree(RAW_COPIES_DIR, BOOK_OUPUT_DIR, dirs_exist_ok=True)
143+
RAW_IGNORES = shutil.ignore_patterns('update_remote_ui.sh')
144+
145+
shutil.copytree(RAW_COPIES_DIR, BOOK_OUPUT_DIR, ignore=RAW_IGNORES, dirs_exist_ok=True)
144146
shutil.copy(os.path.join(MARKDEEP_DIR, FILAMENT_MD), BOOK_OUPUT_DIR)
145147
shutil.copy(os.path.join(MARKDEEP_DIR, MATERIALS_MD), BOOK_OUPUT_DIR)

docs_src/src_mdbook/src/build/maven_release.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ To publish under the `com.google.android` namespace, you'll also need to email
99
`central-support@sonatype.com` with your account information to request access.
1010

1111
Then, generate a user token through the Sonatype website. Navigate to
12-
[https://central.sonatype.com/account](https://central.sonatype.com/account) and select **Generate
13-
User Token**.
12+
[https://central.sonatype.com/usertoken](https://central.sonatype.com/usertoken)
13+
and select **Generate User Token**.
1414

1515
Finally, add the generated token credentials to `~/.gradle/gradle.properties`. (Note: these are
1616
different from the credentials used to log into your Sonatype account):

0 commit comments

Comments
 (0)