Skip to content

Commit 0958e46

Browse files
committed
Merge remote-tracking branch 'mrdoob/dev' into gltf_loader_request_headers
2 parents 53ecf75 + b79dec9 commit 0958e46

File tree

1,156 files changed

+26242
-22354
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,156 files changed

+26242
-22354
lines changed

.github/ISSUE_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Please also include a live example if possible. You can start from these templat
1717
##### Three.js version
1818

1919
- [ ] Dev
20-
- [ ] r114
20+
- [ ] r116
2121
- [ ] ...
2222

2323
##### Browser

.github/workflows/ci.yml

Lines changed: 89 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
name: CI
2+
3+
on:
4+
pull_request:
5+
paths-ignore:
6+
- 'build/**'
7+
- 'docs/**'
8+
- 'files/**'
9+
push:
10+
paths-ignore:
11+
- 'build/**'
12+
- 'docs/**'
13+
- 'files/**'
14+
15+
jobs:
16+
17+
lint:
18+
name: "Linting"
19+
runs-on: ubuntu-latest
20+
steps:
21+
- name: Git checkout
22+
uses: actions/checkout@v2
23+
- name: Install node
24+
uses: actions/setup-node@v1
25+
with:
26+
node-version: 10
27+
- name: Install packages
28+
run: npm ci
29+
30+
- name: === Linting ===
31+
run: npm run test-lint
32+
33+
unit:
34+
name: "Unit testing"
35+
runs-on: ubuntu-latest
36+
steps:
37+
- name: Git checkout
38+
uses: actions/checkout@v2
39+
- name: Install node
40+
uses: actions/setup-node@v1
41+
with:
42+
node-version: 10
43+
- name: Install packages
44+
run: npm ci && npm ci --prefix test
45+
- name: Build
46+
run: npm run build
47+
48+
- name: === Unit testing ===
49+
run: npm run test-unit
50+
51+
e2e:
52+
name: "E2E testing"
53+
runs-on: ubuntu-latest
54+
strategy:
55+
matrix:
56+
CI: [ 0, 1, 2, 3 ]
57+
env:
58+
CI: ${{ matrix.CI }}
59+
FORCE_COLOR: 1
60+
steps:
61+
- name: Git checkout
62+
uses: actions/checkout@v2
63+
- name: Install node
64+
uses: actions/setup-node@v1
65+
with:
66+
node-version: 10
67+
- name: Install packages
68+
run: npm ci && npm ci --prefix test && sudo apt-get install xvfb
69+
- name: Build
70+
run: npm run build
71+
72+
- name: === E2E testing ===
73+
run: xvfb-run --auto-servernum npm run test-e2e
74+
75+
e2e-cov:
76+
name: "Ready for release"
77+
runs-on: ubuntu-latest
78+
steps:
79+
- name: Git checkout
80+
uses: actions/checkout@v2
81+
- name: Install node
82+
uses: actions/setup-node@v1
83+
with:
84+
node-version: 10
85+
- name: Install packages
86+
run: npm ci
87+
88+
- name: === Ready for release ===
89+
run: npm run test-e2e-cov

.gitignore

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
.DS_Store
22
*.swp
33
.project
4-
node_modules
54
.idea/
65
.vscode/
76
npm-debug.log
87
.jshintrc
98
.vs/
10-
test/unit/three.*.unit.js
9+
**/node_modules
10+
test/unit/build

.travis.yml

Lines changed: 0 additions & 30 deletions
This file was deleted.

README.md

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@ The aim of the project is to create an easy to use, lightweight, 3D library with
1717
[Migrating](https://github.com/mrdoob/three.js/wiki/Migration-Guide) —
1818
[Questions](http://stackoverflow.com/questions/tagged/three.js) —
1919
[Forum](https://discourse.threejs.org/) —
20-
[Slack](https://join.slack.com/t/threejs/shared_invite/enQtMzYxMzczODM2OTgxLTQ1YmY4YTQxOTFjNDAzYmQ4NjU2YzRhNzliY2RiNDEyYjU2MjhhODgyYWQ5Y2MyZTU3MWNkOGVmOGRhOTQzYTk)
20+
[Slack](https://join.slack.com/t/threejs/shared_invite/enQtMzYxMzczODM2OTgxLTQ1YmY4YTQxOTFjNDAzYmQ4NjU2YzRhNzliY2RiNDEyYjU2MjhhODgyYWQ5Y2MyZTU3MWNkOGVmOGRhOTQzYTk) —
21+
[Discord](https://discordapp.com/invite/HF4UdyF)
2122

2223
### Usage ###
2324

@@ -63,7 +64,15 @@ function animate() {
6364
}
6465
```
6566

66-
If everything went well you should see [this](https://jsfiddle.net/f2Lommf5/).
67+
If everything went well, you should see [this](https://jsfiddle.net/8kubjpL5/).
68+
69+
### Cloning this repository ###
70+
71+
Cloning the repo with all its history results in a ~2GB download. If you don't need the whole history you can use the `depth` parameter to significantly reduce download size.
72+
73+
```sh
74+
git clone --depth=1 https://github.com/mrdoob/three.js.git
75+
```
6776

6877
### Change log ###
6978

0 commit comments

Comments
 (0)