Skip to content

Commit e70c7f2

Browse files
authored
Merge pull request #1 from mrdoob/dev
Update dev to latest
2 parents c65fca6 + 2561e94 commit e70c7f2

File tree

1,989 files changed

+63608
-120247
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,989 files changed

+63608
-120247
lines changed

.github/CONTRIBUTING.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
# Help
2+
# Help
33
#### The issues section is for bug reports and feature requests only. If you need help, please use the [forum](http://discourse.threejs.org/) or [stackoverflow](http://stackoverflow.com/questions/tagged/three.js).
44
---
55
# Bugs
@@ -25,4 +25,5 @@
2525
2. Fork the repository on GitHub.
2626
3. Check the [Contribution Guidelines](https://github.com/mrdoob/three.js/wiki/How-to-contribute-to-three.js).
2727
4. Make changes to your clone of the repository.
28-
5. Submit a pull request. Don't include build files in the PR.
28+
5. If your changes leads to a change in examples, make a new screenshot with `npm run make-screenshot <example_name>`.
29+
6. Submit a pull request. Don't include build files in the PR.

.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-
- [ ] r110
20+
- [ ] r114
2121
- [ ] ...
2222

2323
##### Browser

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ node_modules
77
npm-debug.log
88
.jshintrc
99
.vs/
10-
test/unit/three.*.unit.js
10+
test/unit/three.*.unit.js

.travis.yml

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,27 @@
11
language: node_js
2-
node_js:
3-
- node
4-
script:
5-
- npm run travis
2+
node_js: node
3+
services: xvfb
4+
cache: bundler
5+
6+
jobs:
7+
include:
8+
9+
- &lint-n-unit
10+
stage: lint & unit
11+
name: lint
12+
script: npm run test-lint
13+
- <<: *lint-n-unit
14+
name: unit
15+
script: npm run test-unit
16+
17+
- &e2e
18+
stage: e2e
19+
name: e2e
20+
script: npm run test-e2e
21+
env: FORCE_COLOR=0 CI=0
22+
- <<: *e2e
23+
env: FORCE_COLOR=0 CI=1
24+
- <<: *e2e
25+
env: FORCE_COLOR=0 CI=2
26+
- <<: *e2e
27+
env: FORCE_COLOR=0 CI=3

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-2019 three.js authors
3+
Copyright © 2010-2020 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: 12 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
11
three.js
22
========
33

4-
[![NPM package][npm]][npm-url]
4+
[![NPM Package][npm]][npm-url]
55
[![Build Size][build-size]][build-size-url]
6-
[![Build Status][build-status]][build-status-url]
7-
[![Dependencies][dependencies]][dependencies-url]
6+
[![NPM Downloads][npm-downloads]][npmtrends-url]
87
[![Dev Dependencies][dev-dependencies]][dev-dependencies-url]
98
[![Language Grade][lgtm]][lgtm-url]
109

@@ -18,21 +17,16 @@ The aim of the project is to create an easy to use, lightweight, 3D library with
1817
[Migrating](https://github.com/mrdoob/three.js/wiki/Migration-Guide) &mdash;
1918
[Questions](http://stackoverflow.com/questions/tagged/three.js) &mdash;
2019
[Forum](https://discourse.threejs.org/) &mdash;
21-
[Gitter](https://gitter.im/mrdoob/three.js) &mdash;
22-
[Slack](https://join.slack.com/t/threejs/shared_invite/enQtMzYxMzczODM2OTgxLTQ1YmY4YTQxOTFjNDAzYmQ4NjU2YzRhNzliY2RiNDEyYjU2MjhhODgyYWQ5Y2MyZTU3MWNkOGVmOGRhOTQzYTk)
20+
[Slack](https://join.slack.com/t/threejs/shared_invite/enQtMzYxMzczODM2OTgxLTQ1YmY4YTQxOTFjNDAzYmQ4NjU2YzRhNzliY2RiNDEyYjU2MjhhODgyYWQ5Y2MyZTU3MWNkOGVmOGRhOTQzYTk) &mdash;
21+
[Discord](https://discordapp.com/invite/HF4UdyF)
2322

2423
### Usage ###
2524

26-
Download the [minified library](http://threejs.org/build/three.min.js) and include it in your HTML, or install and import it as a [module](http://threejs.org/docs/#manual/introduction/Import-via-modules),
27-
Alternatively, see [how to build the library yourself](https://github.com/mrdoob/three.js/wiki/Build-instructions).
28-
29-
```html
30-
<script src="js/three.min.js"></script>
31-
```
32-
3325
This code creates a scene, a camera, and a geometric cube, and it adds the cube to the scene. It then creates a `WebGL` renderer for the scene and camera, and it adds that viewport to the `document.body` element. Finally, it animates the cube within the scene for the camera.
3426

3527
```javascript
28+
import * as THREE from 'js/three.module.js';
29+
3630
var camera, scene, renderer;
3731
var geometry, material, mesh;
3832

@@ -70,22 +64,20 @@ function animate() {
7064
}
7165
```
7266

73-
If everything went well you should see [this](https://jsfiddle.net/f2Lommf5/).
67+
If everything went well you should see [this](https://jsfiddle.net/972m5cdx/).
7468

7569
### Change log ###
7670

7771
[Releases](https://github.com/mrdoob/three.js/releases)
7872

7973

80-
[npm]: https://img.shields.io/npm/v/three.svg
74+
[npm]: https://img.shields.io/npm/v/three
8175
[npm-url]: https://www.npmjs.com/package/three
8276
[build-size]: https://badgen.net/bundlephobia/minzip/three
8377
[build-size-url]: https://bundlephobia.com/result?p=three
84-
[build-status]: https://travis-ci.org/mrdoob/three.js.svg?branch=dev
85-
[build-status-url]: https://travis-ci.org/mrdoob/three.js
86-
[dependencies]: https://img.shields.io/david/mrdoob/three.js.svg
87-
[dependencies-url]: https://david-dm.org/mrdoob/three.js
88-
[dev-dependencies]: https://img.shields.io/david/dev/mrdoob/three.js.svg
78+
[npm-downloads]: https://img.shields.io/npm/dw/three
79+
[npmtrends-url]: https://www.npmtrends.com/three
80+
[dev-dependencies]: https://img.shields.io/david/dev/mrdoob/three.js
8981
[dev-dependencies-url]: https://david-dm.org/mrdoob/three.js#info=devDependencies
90-
[lgtm]: https://img.shields.io/lgtm/grade/javascript/g/mrdoob/three.js.svg?label=code%20quality
82+
[lgtm]: https://img.shields.io/lgtm/alerts/github/mrdoob/three.js
9183
[lgtm-url]: https://lgtm.com/projects/g/mrdoob/three.js/

0 commit comments

Comments
 (0)