Skip to content

Commit 4eabc26

Browse files
authored
Merge branch 'dev' into bit_count_functions
2 parents 4b83524 + e245463 commit 4eabc26

File tree

682 files changed

+9324
-3896
lines changed

Some content is hidden

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

682 files changed

+9324
-3896
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
- name: Git checkout
1919
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2020
- name: Install Node
21-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
21+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
2222
with:
2323
node-version: 22
2424
cache: 'npm'
@@ -44,15 +44,15 @@ jobs:
4444
strategy:
4545
fail-fast: false
4646
matrix:
47-
os: [ windows-latest ]
47+
os: [ ubuntu-latest ]
4848
CI: [ 0, 1, 2, 3 ]
4949
env:
5050
CI: ${{ matrix.CI }}
5151
steps:
5252
- name: Git checkout
5353
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
5454
- name: Install Node
55-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
55+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
5656
with:
5757
node-version: 22
5858
cache: 'npm'

.github/workflows/codeql-code-scanning.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,16 @@ jobs:
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3
33+
uses: github/codeql-action/init@16140ae1a102900babc80a33c44059580f687047 # v4
3434
with:
3535
languages: ${{ matrix.language }}
3636
config-file: ./.github/codeql-config.yml
3737
queries: security-and-quality
3838

3939
- name: Autobuild
40-
uses: github/codeql-action/autobuild@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3
40+
uses: github/codeql-action/autobuild@16140ae1a102900babc80a33c44059580f687047 # v4
4141

4242
- name: Perform CodeQL Analysis
43-
uses: github/codeql-action/analyze@64d10c13136e1c5bce3e5fbde8d4906eeaafc885 # v3
43+
uses: github/codeql-action/analyze@16140ae1a102900babc80a33c44059580f687047 # v4
4444
with:
4545
category: "/language:${{matrix.language}}"

.github/workflows/read-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
- name: Git checkout
2323
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
2424
- name: Install Node
25-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
25+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
2626
with:
2727
node-version: 22
2828
cache: 'npm'

.github/workflows/report-size.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ jobs:
5858
- name: Git checkout
5959
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
6060
- name: Install Node
61-
uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5
61+
uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6
6262
with:
6363
node-version: 22
6464
cache: 'npm'

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
npm-debug.log
77
.jshintrc
88
.vs/
9+
.puppeteer_profile/
910

1011
test/unit/build
1112
test/treeshake/index.bundle.js

build/three.cjs

Lines changed: 125 additions & 46 deletions
Large diffs are not rendered by default.

build/three.core.js

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17353,6 +17353,7 @@ class Material extends EventDispatcher {
1735317353
* This material is not affected by lights.
1735417354
*
1735517355
* @augments Material
17356+
* @demo scenes/material-browser.html#MeshBasicMaterial
1735617357
*/
1735717358
class MeshBasicMaterial extends Material {
1735817359

@@ -20753,6 +20754,7 @@ function checkGeometryIntersection( object, material, raycaster, ray, uv, uv1, n
2075320754
* ```
2075420755
*
2075520756
* @augments BufferGeometry
20757+
* @demo scenes/geometry-browser.html#BoxGeometry
2075620758
*/
2075720759
class BoxGeometry extends BufferGeometry {
2075820760

@@ -24813,6 +24815,7 @@ const _ray$2 = /*@__PURE__*/ new Ray();
2481324815
* or {@link FBXLoader } import respective models.
2481424816
*
2481524817
* @augments Mesh
24818+
* @demo scenes/bones-browser.html
2481624819
*/
2481724820
class SkinnedMesh extends Mesh {
2481824821

@@ -29610,6 +29613,8 @@ class VideoTexture extends Texture {
2961029613

2961129614
this.source.data.cancelVideoFrameCallback( this._requestVideoFrameCallbackId );
2961229615

29616+
this._requestVideoFrameCallbackId = 0;
29617+
2961329618
}
2961429619

2961529620
super.dispose();
@@ -30185,6 +30190,7 @@ class ExternalTexture extends Texture {
3018530190
* ```
3018630191
*
3018730192
* @augments BufferGeometry
30193+
* @demo scenes/geometry-browser.html#CapsuleGeometry
3018830194
*/
3018930195
class CapsuleGeometry extends BufferGeometry {
3019030196

@@ -30402,6 +30408,7 @@ class CapsuleGeometry extends BufferGeometry {
3040230408
* ```
3040330409
*
3040430410
* @augments BufferGeometry
30411+
* @demo scenes/geometry-browser.html#CircleGeometry
3040530412
*/
3040630413
class CircleGeometry extends BufferGeometry {
3040730414

@@ -30531,6 +30538,7 @@ class CircleGeometry extends BufferGeometry {
3053130538
* ```
3053230539
*
3053330540
* @augments BufferGeometry
30541+
* @demo scenes/geometry-browser.html#CylinderGeometry
3053430542
*/
3053530543
class CylinderGeometry extends BufferGeometry {
3053630544

@@ -30856,6 +30864,7 @@ class CylinderGeometry extends BufferGeometry {
3085630864
* ```
3085730865
*
3085830866
* @augments CylinderGeometry
30867+
* @demo scenes/geometry-browser.html#ConeGeometry
3085930868
*/
3086030869
class ConeGeometry extends CylinderGeometry {
3086130870

@@ -31264,6 +31273,7 @@ class PolyhedronGeometry extends BufferGeometry {
3126431273
* ```
3126531274
*
3126631275
* @augments PolyhedronGeometry
31276+
* @demo scenes/geometry-browser.html#DodecahedronGeometry
3126731277
*/
3126831278
class DodecahedronGeometry extends PolyhedronGeometry {
3126931279

@@ -35220,6 +35230,7 @@ function addContour( vertices, contour ) {
3522035230
* ```
3522135231
*
3522235232
* @augments BufferGeometry
35233+
* @demo scenes/geometry-browser.html#ExtrudeGeometry
3522335234
*/
3522435235
class ExtrudeGeometry extends BufferGeometry {
3522535236

@@ -36094,6 +36105,7 @@ function toJSON$1( shapes, options, data ) {
3609436105
* ```
3609536106
*
3609636107
* @augments PolyhedronGeometry
36108+
* @demo scenes/geometry-browser.html#IcosahedronGeometry
3609736109
*/
3609836110
class IcosahedronGeometry extends PolyhedronGeometry {
3609936111

@@ -36168,6 +36180,7 @@ class IcosahedronGeometry extends PolyhedronGeometry {
3616836180
* ```
3616936181
*
3617036182
* @augments BufferGeometry
36183+
* @demo scenes/geometry-browser.html#LatheGeometry
3617136184
*/
3617236185
class LatheGeometry extends BufferGeometry {
3617336186

@@ -36385,6 +36398,7 @@ class LatheGeometry extends BufferGeometry {
3638536398
* ```
3638636399
*
3638736400
* @augments PolyhedronGeometry
36401+
* @demo scenes/geometry-browser.html#OctahedronGeometry
3638836402
*/
3638936403
class OctahedronGeometry extends PolyhedronGeometry {
3639036404

@@ -36451,6 +36465,7 @@ class OctahedronGeometry extends PolyhedronGeometry {
3645136465
* ```
3645236466
*
3645336467
* @augments BufferGeometry
36468+
* @demo scenes/geometry-browser.html#PlaneGeometry
3645436469
*/
3645536470
class PlaneGeometry extends BufferGeometry {
3645636471

@@ -36579,6 +36594,7 @@ class PlaneGeometry extends BufferGeometry {
3657936594
* ```
3658036595
*
3658136596
* @augments BufferGeometry
36597+
* @demo scenes/geometry-browser.html#RingGeometry
3658236598
*/
3658336599
class RingGeometry extends BufferGeometry {
3658436600

@@ -36740,6 +36756,7 @@ class RingGeometry extends BufferGeometry {
3674036756
* ```
3674136757
*
3674236758
* @augments BufferGeometry
36759+
* @demo scenes/geometry-browser.html#ShapeGeometry
3674336760
*/
3674436761
class ShapeGeometry extends BufferGeometry {
3674536762

@@ -36961,6 +36978,7 @@ function toJSON( shapes, data ) {
3696136978
* ```
3696236979
*
3696336980
* @augments BufferGeometry
36981+
* @demo scenes/geometry-browser.html#SphereGeometry
3696436982
*/
3696536983
class SphereGeometry extends BufferGeometry {
3696636984

@@ -37130,6 +37148,7 @@ class SphereGeometry extends BufferGeometry {
3713037148
* ```
3713137149
*
3713237150
* @augments PolyhedronGeometry
37151+
* @demo scenes/geometry-browser.html#TetrahedronGeometry
3713337152
*/
3713437153
class TetrahedronGeometry extends PolyhedronGeometry {
3713537154

@@ -37193,6 +37212,7 @@ class TetrahedronGeometry extends PolyhedronGeometry {
3719337212
* ```
3719437213
*
3719537214
* @augments BufferGeometry
37215+
* @demo scenes/geometry-browser.html#TorusGeometry
3719637216
*/
3719737217
class TorusGeometry extends BufferGeometry {
3719837218

@@ -37345,6 +37365,7 @@ class TorusGeometry extends BufferGeometry {
3734537365
* ```
3734637366
*
3734737367
* @augments BufferGeometry
37368+
* @demo scenes/geometry-browser.html#TorusKnotGeometry
3734837369
*/
3734937370
class TorusKnotGeometry extends BufferGeometry {
3735037371

@@ -37557,6 +37578,7 @@ class TorusKnotGeometry extends BufferGeometry {
3755737578
* ```
3755837579
*
3755937580
* @augments BufferGeometry
37581+
* @demo scenes/geometry-browser.html#TubeGeometry
3756037582
*/
3756137583
class TubeGeometry extends BufferGeometry {
3756237584

@@ -38132,6 +38154,7 @@ class RawShaderMaterial extends ShaderMaterial {
3813238154
* (pdf), by Brent Burley.
3813338155
*
3813438156
* @augments Material
38157+
* @demo scenes/material-browser.html#MeshStandardMaterial
3813538158
*/
3813638159
class MeshStandardMaterial extends Material {
3813738160

@@ -38541,6 +38564,7 @@ class MeshStandardMaterial extends Material {
3854138564
* best results, always specify an environment map when using this material.
3854238565
*
3854338566
* @augments MeshStandardMaterial
38567+
* @demo scenes/material-browser.html#MeshPhysicalMaterial
3854438568
*/
3854538569
class MeshPhysicalMaterial extends MeshStandardMaterial {
3854638570

@@ -39059,6 +39083,7 @@ class MeshPhysicalMaterial extends MeshStandardMaterial {
3905939083
* some graphical accuracy.
3906039084
*
3906139085
* @augments Material
39086+
* @demo scenes/material-browser.html#MeshPhongMaterial
3906239087
*/
3906339088
class MeshPhongMaterial extends Material {
3906439089

@@ -39454,6 +39479,7 @@ class MeshPhongMaterial extends Material {
3945439479
* A material implementing toon shading.
3945539480
*
3945639481
* @augments Material
39482+
* @demo scenes/material-browser.html#MeshToonMaterial
3945739483
*/
3945839484
class MeshToonMaterial extends Material {
3945939485

@@ -39768,6 +39794,7 @@ class MeshToonMaterial extends Material {
3976839794
* A material that maps the normal vectors to RGB colors.
3976939795
*
3977039796
* @augments Material
39797+
* @demo scenes/material-browser.html#MeshNormalMaterial
3977139798
*/
3977239799
class MeshNormalMaterial extends Material {
3977339800

@@ -39948,6 +39975,7 @@ class MeshNormalMaterial extends Material {
3994839975
* {@link MeshPhysicalMaterial}, at the cost of some graphical accuracy.
3994939976
*
3995039977
* @augments Material
39978+
* @demo scenes/material-browser.html#MeshLambertMaterial
3995139979
*/
3995239980
class MeshLambertMaterial extends Material {
3995339981

@@ -40323,6 +40351,7 @@ class MeshLambertMaterial extends Material {
4032340351
* near and far plane. White is nearest, black is farthest.
4032440352
*
4032540353
* @augments Material
40354+
* @demo scenes/material-browser.html#MeshDepthMaterial
4032640355
*/
4032740356
class MeshDepthMaterial extends Material {
4032840357

@@ -40587,6 +40616,7 @@ class MeshDistanceMaterial extends Material {
4058740616
* shadows.
4058840617
*
4058940618
* @augments Material
40619+
* @demo scenes/material-browser.html#MeshMatcapMaterial
4059040620
*/
4059140621
class MeshMatcapMaterial extends Material {
4059240622

build/three.core.min.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.

0 commit comments

Comments
 (0)