Skip to content

Commit f8338e5

Browse files
authored
Merge branch 'dev' into dev51
2 parents 6ff1d1b + 46fd86f commit f8338e5

File tree

1,543 files changed

+33441
-46700
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,543 files changed

+33441
-46700
lines changed

.github/CONTRIBUTING.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Many linting errors can be fixed automatically by running
4040

4141
If you’d like to make a minified version of the build files i.e. ‘build/three.min.js’ run:
4242

43-
npm run-script build-closure
43+
npm run build
4444

4545
## Making changes
4646

@@ -65,7 +65,7 @@ When you’ve decided to make changes, start with the following:
6565

6666
* Don't include any build files to your commit.
6767
* Not all new features will need a new example. Simpler features could be incorporated into an existing example. Bigger features may be asked to add an example demonstrating the feature.
68-
* Making changes may require changes to the documentation. If so, please make a new PR for the appropriate doc changes. To update the Chinese docs, simply copy the English to begin with.
68+
* Making changes may require changes to the documentation. To update the docs in other languages, simply copy the English to begin with.
6969
* it's good to also add an example and screenshot for it, for showing how it's used and for end-to-end testing.
7070
* If you modify existing code, run relevant examples to check they didn't break and there wasn't performance regress.
7171
* If you add some assets for the examples (models, textures, sounds, etc), make sure they have a proper license allowing for their use here, less restrictive the better. It is unlikely for large assets to be accepted.
@@ -75,7 +75,6 @@ When you’ve decided to make changes, start with the following:
7575

7676
npm run make-screenshot <example_1_name> ...<example_N_name>
7777

78-
* Watch out for Closure compiler warnings when building the libs, there should not be any.
7978
* Once done with a patch / feature do not add more commits to a feature branch
8079
* Create separate branches per patch or feature.
8180
* If you make a PR but it is not actually ready to be pulled into the dev branch, add `[Draft]` into the PR title and/or convert it to a draft PR

.github/FUNDING.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These are supported funding model platforms
2+
3+
github: [mrdoob, HumanInteractive]

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright © 2010-2020 three.js authors
3+
Copyright © 2010-2021 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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ let camera, scene, renderer;
3131
let geometry, material, mesh;
3232

3333
init();
34-
animate();
3534

3635
function init() {
3736

@@ -48,23 +47,22 @@ function init() {
4847

4948
renderer = new THREE.WebGLRenderer( { antialias: true } );
5049
renderer.setSize( window.innerWidth, window.innerHeight );
50+
renderer.setAnimationLoop( animation );
5151
document.body.appendChild( renderer.domElement );
5252

5353
}
5454

55-
function animate() {
55+
function animation( time ) {
5656

57-
requestAnimationFrame( animate );
58-
59-
mesh.rotation.x += 0.01;
60-
mesh.rotation.y += 0.02;
57+
mesh.rotation.x = time / 2000;
58+
mesh.rotation.y = time / 1000;
6159

6260
renderer.render( scene, camera );
6361

6462
}
6563
```
6664

67-
If everything went well, you should see [this](https://jsfiddle.net/ruc3h17j/).
65+
If everything went well, you should see [this](https://jsfiddle.net/zdjankqw/).
6866

6967
### Cloning this repository ###
7068

0 commit comments

Comments
 (0)