Skip to content

Commit 94fa230

Browse files
committed
合并mrdoob167版本,解决冲突
1 parent 065eb6d commit 94fa230

File tree

1,788 files changed

+153934
-105200
lines changed

Some content is hidden

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

1,788 files changed

+153934
-105200
lines changed

.eslintrc.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@
4040
"XRMediaBinding": "readonly",
4141
"CodeMirror": "readonly",
4242
"esprima": "readonly",
43-
"jsonlint": "readonly"
43+
"jsonlint": "readonly",
44+
"VideoFrame": "readonly"
4445
},
4546
"rules": {
4647
"no-throw-literal": [

.github/ISSUE_TEMPLATE/bug_report.yml

+1
Original file line numberDiff line numberDiff line change
@@ -81,5 +81,6 @@ body:
8181
- Windows
8282
- MacOS
8383
- Linux
84+
- ChromeOS
8485
- Android
8586
- iOS

.github/renovate.json

+6
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
"matchUpdateTypes": ["patch", "minor", "pin", "digest"],
1313
"groupName": "devDependencies (non-major)",
1414
"automerge": true
15+
},
16+
{
17+
"description": "ESLint v9 requires flat configs, not yet supported by our plugins. See https://github.com/mrdoob/three.js/pull/28354#issuecomment-2106528332",
18+
"matchPackageNames": ["eslint"],
19+
"matchUpdateTypes": ["major"],
20+
"enabled": false
1521
}
1622
]
1723
}

.github/workflows/ci.yml

+14-19
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,6 @@ on:
66
- 'build/**'
77
- 'docs/**'
88
- 'files/**'
9-
push:
10-
paths-ignore:
11-
- 'build/**'
12-
- 'docs/**'
13-
- 'files/**'
149

1510
permissions:
1611
contents: read
@@ -21,9 +16,9 @@ jobs:
2116
runs-on: ubuntu-latest
2217
steps:
2318
- name: Git checkout
24-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
19+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2520
- name: Install Node
26-
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
21+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
2722
with:
2823
node-version: 18
2924
cache: 'npm'
@@ -38,9 +33,9 @@ jobs:
3833
runs-on: ubuntu-latest
3934
steps:
4035
- name: Git checkout
41-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
36+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
4237
- name: Install Node
43-
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
38+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
4439
with:
4540
node-version: 18
4641
cache: 'npm'
@@ -55,9 +50,9 @@ jobs:
5550
runs-on: ubuntu-latest
5651
steps:
5752
- name: Git checkout
58-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
53+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
5954
- name: Install Node
60-
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
55+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
6156
with:
6257
node-version: 18
6358
cache: 'npm'
@@ -74,30 +69,30 @@ jobs:
7469
strategy:
7570
fail-fast: false
7671
matrix:
77-
os: [ windows-latest, ubuntu-latest, macos-latest ]
72+
os: [ windows-latest ]
7873
CI: [ 0, 1, 2, 3 ]
7974
env:
8075
CI: ${{ matrix.CI }}
8176
steps:
8277
- name: Git checkout
83-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
78+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
8479
- name: Install Node
85-
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
80+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
8681
with:
8782
node-version: 18
8883
cache: 'npm'
8984
- name: Install dependencies
9085
run: npm ci
9186
- name: Build
92-
run: npm run build
87+
run: npm run build-module
9388

9489
- name: === E2E testing ===
9590
run: npm run test-e2e
9691
- name: Upload output screenshots
97-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
92+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
9893
if: always()
9994
with:
100-
name: Output screenshots
95+
name: Output screenshots-${{ matrix.os }}-${{ matrix.CI }}
10196
path: test/e2e/output-screenshots
10297
if-no-files-found: ignore
10398

@@ -106,9 +101,9 @@ jobs:
106101
runs-on: ubuntu-latest
107102
steps:
108103
- name: Git checkout
109-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
104+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
110105
- name: Install Node
111-
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
106+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
112107
with:
113108
node-version: 18
114109
cache: 'npm'

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,20 +26,20 @@ jobs:
2626

2727
steps:
2828
- name: Checkout repository
29-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
29+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
3030

3131
# Initializes the CodeQL tools for scanning.
3232
- name: Initialize CodeQL
33-
uses: github/codeql-action/init@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2
33+
uses: github/codeql-action/init@2d790406f505036ef40ecba973cc774a50395aac # v3
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@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2
40+
uses: github/codeql-action/autobuild@2d790406f505036ef40ecba973cc774a50395aac # v3
4141

4242
- name: Perform CodeQL Analysis
43-
uses: github/codeql-action/analyze@74483a38d39275f33fcff5f35b679b5ca4a26a99 # v2
43+
uses: github/codeql-action/analyze@2d790406f505036ef40ecba973cc774a50395aac # v3
4444
with:
4545
category: "/language:${{matrix.language}}"

.github/workflows/read-size.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Git checkout
23-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
23+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2424
- name: Install Node
25-
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
25+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
2626
with:
2727
node-version: 18
2828
cache: 'npm'
@@ -46,7 +46,7 @@ jobs:
4646
# write the output in a json file to upload it as artifact
4747
node -pe "JSON.stringify({ filesize: $FILESIZE, gzip: $FILESIZE_GZIP, treeshaken: $TREESHAKEN, treeshakenGzip: $TREESHAKEN_GZIP, pr: $PR })" > sizes.json
4848
- name: Upload artifact
49-
uses: actions/upload-artifact@a8a3f3ad30e3422c9c7b888a15615d19a852ae32 # v3
49+
uses: actions/upload-artifact@0b2256b8c012f0828dc542b3febcab082c67f72b # v4
5050
with:
5151
name: sizes
5252
path: sizes.json

.github/workflows/report-size.yml

+5-5
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
# Using actions/download-artifact doesn't work here
3030
# https://github.com/actions/download-artifact/issues/60
3131
- name: Download artifact
32-
uses: actions/github-script@d7906e4ad0b1822421a7e6a35d5ca353c962f410 # v6
32+
uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
3333
id: download-artifact
3434
with:
3535
result-encoding: string
@@ -56,9 +56,9 @@ jobs:
5656
5757
# This runs on the base branch of the PR, meaning "dev"
5858
- name: Git checkout
59-
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4
59+
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
6060
- name: Install Node
61-
uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
61+
uses: actions/setup-node@1e60f620b9541d16bece96c5465dc8ee9832be0b # v4
6262
with:
6363
node-version: 18
6464
cache: 'npm'
@@ -126,14 +126,14 @@ jobs:
126126
echo "TREESHAKEN_DIFF=$TREESHAKEN_DIFF" >> $GITHUB_OUTPUT
127127
128128
- name: Find existing comment
129-
uses: peter-evans/find-comment@a54c31d7fa095754bfef525c0c8e5e5674c4b4b1 # v2
129+
uses: peter-evans/find-comment@3eae4d37986fb5a8592848f6a574fdf654e61f9e # v3
130130
id: find-comment
131131
with:
132132
issue-number: ${{ fromJSON(steps.download-artifact.outputs.result).pr }}
133133
comment-author: 'github-actions[bot]'
134134
body-includes: Bundle size
135135
- name: Comment on PR
136-
uses: peter-evans/create-or-update-comment@c6c9a1a66007646a28c153e2a8580a5bad27bcfa # v3
136+
uses: peter-evans/create-or-update-comment@71345be0265236311c031f5c7866368bd1eff043 # v4
137137
with:
138138
issue-number: ${{ fromJSON(steps.download-artifact.outputs.result).pr }}
139139
comment-id: ${{ steps.find-comment.outputs.comment-id }}

LICENSE

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright © 2010-2023 three.js authors
3+
Copyright © 2010-2024 three.js authors
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ scene.add( mesh );
4343

4444
const renderer = new THREE.WebGLRenderer( { antialias: true } );
4545
renderer.setSize( width, height );
46-
renderer.setAnimationLoop( animation );
46+
renderer.setAnimationLoop( animate );
4747
document.body.appendChild( renderer.domElement );
4848

4949
// animation
5050

51-
function animation( time ) {
51+
function animate( time ) {
5252

5353
mesh.rotation.x = time / 2000;
5454
mesh.rotation.y = time / 1000;
@@ -58,7 +58,7 @@ function animation( time ) {
5858
}
5959
```
6060

61-
If everything goes well, you should see [this](https://jsfiddle.net/2nyxkmco/).
61+
If everything goes well, you should see [this](https://jsfiddle.net/v98k6oze/).
6262

6363
### Cloning this repository
6464

0 commit comments

Comments
 (0)