Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mrdoob/three.js
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 4b186eb630834c288ee2ff73f57e41bbdf5536c4
Choose a base ref
...
head repository: mrdoob/three.js
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b11f897812a8a48bcd81e9bd46785d07939ec59e
Choose a head ref
28 contributors

Commits on Jan 7, 2020

  1. CurvePath_getPoint

    @gonnavis
    gonnavis committed Jan 7, 2020
    Copy the full SHA
    7ffc374 View commit details

Commits on Jan 8, 2020

  1. Examples: Introduce basic OBB implementation.

    @Mugen87
    Mugen87 committed Jan 8, 2020
    Copy the full SHA
    6f47e8f View commit details

Commits on Jan 10, 2020

  1. a

    @gonnavis
    gonnavis committed Jan 10, 2020
    Copy the full SHA
    d76778e View commit details

Commits on Jan 16, 2020

  1. WebGLProgram: detach shaders for deletion

    @sciecode
    sciecode committed Jan 16, 2020
    Copy the full SHA
    9d19bd9 View commit details

Commits on Jan 25, 2020

  1. CSM example

    @StrandedKitty
    StrandedKitty committed Jan 25, 2020
    Copy the full SHA
    e119831 View commit details

  2. Update modularize.js

    @StrandedKitty
    StrandedKitty committed Jan 25, 2020
    Copy the full SHA
    a55bed8 View commit details

  3. Use source files instead of bundle

    @StrandedKitty
    StrandedKitty committed Jan 25, 2020
    Copy the full SHA
    90b50ac View commit details

Commits on Jan 27, 2020

  1. Code style (automatically reformated using eslint config)

    @StrandedKitty
    StrandedKitty committed Jan 27, 2020
    Copy the full SHA
    6d7df38 View commit details

Commits on Jan 28, 2020

  1. Remove unused numXxxx members of WebGLLights

    @OndrejSpanel
    OndrejSpanel committed Jan 28, 2020
    Copy the full SHA
    e66acab View commit details

Commits on Jan 30, 2020

  1. OBB: Remove js file.

    @Mugen87
    Mugen87 committed Jan 30, 2020
    Copy the full SHA
    a984024 View commit details

Commits on Jan 31, 2020

  1. Updated package.json

    @mrdoob
    mrdoob committed Jan 31, 2020
    Copy the full SHA
    c23b245 View commit details

  2. Fix normal map handedness in a few examples 

    A few examples use normal maps that have not been authored with the OpenGL normal map handedness convention. In these cases the normal scale y needs to be negated to get the normal maps to display correctly.
    @Oletus
    Oletus committed Jan 31, 2020
    Copy the full SHA
    815fac2 View commit details

  3. Document handling normal map handedness

    @Oletus
    Oletus committed Jan 31, 2020
    Copy the full SHA
    07bb574 View commit details

  4. Merge pull request #18522 from higharc/fix-normal-map-handedness 

    Fix and document normal map handedness
    @mrdoob
    mrdoob authored Jan 31, 2020
    Copy the full SHA
    3cf17ee View commit details

  5. Merge pull request #18340 from Mugen87/dev26 

    Examples: Introduce basic OBB implementation.
    @mrdoob
    mrdoob authored Jan 31, 2020
    Copy the full SHA
    16d4a32 View commit details

Commits on Feb 1, 2020

  1. r114dev

    @mrdoob
    mrdoob committed Feb 1, 2020
    Copy the full SHA
    8abf67d View commit details

  2. CSS3DRenderer: Clean up.

    @mrdoob
    mrdoob committed Feb 1, 2020
    Copy the full SHA
    db5ab31 View commit details

  3. Updated builds.

    @mrdoob
    mrdoob committed Feb 1, 2020
    Copy the full SHA
    a6a9cc6 View commit details

  4. Matrix3: Rewrite .extractBasis().

    @Mugen87
    Mugen87 committed Feb 1, 2020
    Copy the full SHA
    6b674a8 View commit details

  5. OBB: Implement ray intersection test.

    @Mugen87
    Mugen87 committed Feb 1, 2020
    Copy the full SHA
    54d0aa4 View commit details

  6. Fixing Creating-Text link

    @SaFrMo
    SaFrMo authored Feb 1, 2020
    Copy the full SHA
    f85cd91 View commit details

  7. Merge pull request #18527 from Mugen87/dev32 

    Matrix3: Rewrite .extractBasis().
    @mrdoob
    mrdoob authored Feb 1, 2020
    Copy the full SHA
    f3162fe View commit details

Commits on Feb 2, 2020

  1. Merge pull request #18528 from Mugen87/dev11 

    OBB: Implement ray intersection test.
    @mrdoob
    mrdoob authored Feb 2, 2020
    Copy the full SHA
    e851eaf View commit details

  2. Merge pull request #18529 from SaFrMo/patch-1 

    Fixing Creating-Text link
    @mrdoob
    mrdoob authored Feb 2, 2020
    Copy the full SHA
    ce686fd View commit details

  3. Update Face3.html 

    The face normal is wrong, which should points to the Z-direction.
    @feilin-flexcompute
    feilin-flexcompute authored Feb 2, 2020
    Copy the full SHA
    d9661de View commit details

  4. Update Face3.html

    @feilin-flexcompute
    feilin-flexcompute authored Feb 2, 2020
    Copy the full SHA
    639b180 View commit details

Commits on Feb 3, 2020

  1. Editor: Use PMREMGenerator and Scene.environment.

    @Mugen87
    Mugen87 committed Feb 3, 2020
    Copy the full SHA
    bbf158f View commit details

  2. Editor: Add support for equirect HDR textures.

    @Mugen87
    Mugen87 committed Feb 3, 2020
    Copy the full SHA
    7b917d7 View commit details

  3. Merge pull request #18402 from sciecode/dev-detach-shaders 

    WebGLProgram: detach shaders for deletion
    @mrdoob
    mrdoob authored Feb 3, 2020
    Copy the full SHA
    7433fe3 View commit details

Commits on Feb 4, 2020

  1. Merge pull request #18531 from feilin-flexcompute/patch-1 

    Update Face3.html
    @mrdoob
    mrdoob authored Feb 4, 2020
    Copy the full SHA
    66dda35 View commit details

  2. Merge pull request #18535 from Mugen87/dev19 

    Editor: Use PMREMGenerator and Scene.environment.
    @mrdoob
    mrdoob authored Feb 4, 2020
    Copy the full SHA
    daedccc View commit details

  3. Editor: Fixed History.fromJSON().

    @Mugen87
    Mugen87 committed Feb 4, 2020
    Copy the full SHA
    9cc2baf View commit details

  4. Editor: Add Commands to sw.js.

    @Mugen87
    Mugen87 committed Feb 4, 2020
    Copy the full SHA
    5bad424 View commit details

  5. LOD: Add ability to get current level 

    Sometimes it's useful to have the current LOD level. This is awkward to do outside of LOD as it involves duplicating the logic inside of LOD.

One use case is the loading of progressively larger textures when the LOD activates a certain level.
    @CreaticDD
    CreaticDD authored Feb 4, 2020
    Copy the full SHA
    ca3a8a2 View commit details

  6. Update LOD.html

    @CreaticDD
    CreaticDD authored Feb 4, 2020
    Copy the full SHA
    6e5ec8c View commit details

  7. Editor: Fix call of SkeletonHelper.update().

    @Mugen87
    Mugen87 committed Feb 4, 2020
    Copy the full SHA
    6c32b95 View commit details

  8. Merge pull request #18499 from OndrejSpanel/lightstate-remove-numXXX 

    Remove unused numXxxx members of WebGLLights
    @mrdoob
    mrdoob authored Feb 4, 2020
    Copy the full SHA
    e0dbc77 View commit details

  9. WebGLLights: Clean up.

    @mrdoob
    mrdoob committed Feb 4, 2020
    Copy the full SHA
    47968f3 View commit details

  10. Updated builds.

    @mrdoob
    mrdoob committed Feb 4, 2020
    4
    Copy the full SHA
    9e072aa View commit details

  11. Merge pull request #18539 from Mugen87/dev29 

    Editor: Fix call of SkeletonHelper.update().
    @mrdoob
    mrdoob authored Feb 4, 2020
    Copy the full SHA
    8b5b48a View commit details

  12. Merge pull request #18536 from Mugen87/dev19 

    Editor: Fixed History.fromJSON().
    @mrdoob
    mrdoob authored Feb 4, 2020
    Copy the full SHA
    814d8d7 View commit details

Commits on Feb 5, 2020

  1. Examples: Updated webxr_ar_hittest to latest version of the spec.

    @mrdoob
    mrdoob committed Feb 5, 2020
    Copy the full SHA
    ad2606b View commit details

  2. PropertyBinding: Remove check for "root" node name in findNode().

    @Mugen87
    Mugen87 committed Feb 5, 2020
    Copy the full SHA
    3da304a View commit details

  3. Editor: Add missing editor paramter to command creation.

    @Mugen87
    Mugen87 committed Feb 5, 2020
    Copy the full SHA
    1126953 View commit details

  4. Editor: Fix black textures when loading JSON scenes.

    @Mugen87
    Mugen87 committed Feb 5, 2020
    Copy the full SHA
    49b76eb View commit details

  5. Update LOD.js

    @CreaticDD
    CreaticDD authored Feb 5, 2020
    Copy the full SHA
    2415503 View commit details

  6. Update LOD.js

    @CreaticDD
    CreaticDD authored Feb 5, 2020
    Copy the full SHA
    80253e8 View commit details

  7. Update LOD.html

    @CreaticDD
    CreaticDD authored Feb 5, 2020
    Copy the full SHA
    44f0787 View commit details

  8. Update LOD.html

    @CreaticDD
    CreaticDD authored Feb 5, 2020
    Copy the full SHA
    5120250 View commit details

  9. Update LOD.html

    @CreaticDD
    CreaticDD authored Feb 5, 2020
    Copy the full SHA
    8901e54 View commit details
Showing 889 changed files with 22,524 additions and 5,040 deletions.
5 changes: 3 additions & 2 deletions .github/CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

# Help
# Help
#### 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).
---
# Bugs
@@ -25,4 +25,5 @@
2. Fork the repository on GitHub.
3. Check the [Contribution Guidelines](https://github.com/mrdoob/three.js/wiki/How-to-contribute-to-three.js).
4. Make changes to your clone of the repository.
5. Submit a pull request. Don't include build files in the PR.
5. If your changes leads to a change in examples, make a new screenshot with `npm run make-screenshot <example_name>`.
6. Submit a pull request. Don't include build files in the PR.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ Please also include a live example if possible. You can start from these templat
##### Three.js version

- [ ] Dev
- [ ] r113
- [ ] r114
- [ ] ...

##### Browser
30 changes: 26 additions & 4 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,27 @@
language: node_js
node_js:
- node
script:
- npm run travis
node_js: node
services: xvfb
cache: bundler

jobs:
include:

- &lint-n-unit
stage: lint & unit
name: lint
script: npm run test-lint
- <<: *lint-n-unit
name: unit
script: npm run test-unit

- &e2e
stage: e2e
name: e2e
script: npm run test-e2e
env: FORCE_COLOR=0 CI=0
- <<: *e2e
env: FORCE_COLOR=0 CI=1
- <<: *e2e
env: FORCE_COLOR=0 CI=2
- <<: *e2e
env: FORCE_COLOR=0 CI=3
18 changes: 7 additions & 11 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
three.js
========

[![NPM package][npm]][npm-url]
[![NPM Package][npm]][npm-url]
[![Build Size][build-size]][build-size-url]
[![Build Status][build-status]][build-status-url]
[![Dependencies][dependencies]][dependencies-url]
[![NPM Downloads][npm-downloads]][npmtrends-url]
[![Dev Dependencies][dev-dependencies]][dev-dependencies-url]
[![Language Grade][lgtm]][lgtm-url]

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

### Usage ###
@@ -72,15 +70,13 @@ If everything went well you should see [this](https://jsfiddle.net/f2Lommf5/).
[Releases](https://github.com/mrdoob/three.js/releases)


[npm]: https://img.shields.io/npm/v/three.svg
[npm]: https://img.shields.io/npm/v/three
[npm-url]: https://www.npmjs.com/package/three
[build-size]: https://badgen.net/bundlephobia/minzip/three
[build-size-url]: https://bundlephobia.com/result?p=three
[build-status]: https://travis-ci.org/mrdoob/three.js.svg?branch=dev
[build-status-url]: https://travis-ci.org/mrdoob/three.js
[dependencies]: https://img.shields.io/david/mrdoob/three.js.svg
[dependencies-url]: https://david-dm.org/mrdoob/three.js
[dev-dependencies]: https://img.shields.io/david/dev/mrdoob/three.js.svg
[npm-downloads]: https://img.shields.io/npm/dw/three
[npmtrends-url]: https://www.npmtrends.com/three
[dev-dependencies]: https://img.shields.io/david/dev/mrdoob/three.js
[dev-dependencies-url]: https://david-dm.org/mrdoob/three.js#info=devDependencies
[lgtm]: https://img.shields.io/lgtm/grade/javascript/g/mrdoob/three.js.svg?label=code%20quality
[lgtm]: https://img.shields.io/lgtm/alerts/github/mrdoob/three.js
[lgtm-url]: https://lgtm.com/projects/g/mrdoob/three.js/
Loading