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: 70438028775dd4d539ebdfdaf1aafd6fbcac43c7
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: edaceba0481f8a4071c0236e930d951d333de805
Choose a head ref
28 contributors

Commits on May 23, 2018

  1. Add optimization and memory functions

    @gkjohnson
    gkjohnson committed May 23, 2018
    Copy the full SHA
    36aa5f4 View commit details

Commits on May 24, 2018

  1. Merge remote-tracking branch 'mrdoob-origin/dev' into optimize-buffer… 

    …-geometry-indices
    @gkjohnson
    gkjohnson committed May 24, 2018
    Copy the full SHA
    3c46c2f View commit details

  2. Rename function to 'mergeVertices', create new BufferAttribute object… 

    …s, make it work with interleavedAttributes
    @gkjohnson
    gkjohnson committed May 24, 2018
    Copy the full SHA
    b9951cc View commit details

  3. Add some utility functions to BufferGeometryUtils

    @gkjohnson
    gkjohnson committed May 24, 2018
    Copy the full SHA
    908fa73 View commit details

  4. Add missing clone and copy functions to InterleavedBufferAttribute

    @gkjohnson
    gkjohnson committed May 24, 2018
    Copy the full SHA
    523c340 View commit details

  5. Include InterleavedBufferAttribute cloning in a test

    @gkjohnson
    gkjohnson committed May 24, 2018
    Copy the full SHA
    7842eb7 View commit details

Commits on Jun 8, 2018

  1. Merge pull request #2 from mrdoob/dev 

    Merging master
    @gkjohnson
    gkjohnson authored Jun 8, 2018
    Copy the full SHA
    99438ae View commit details

  2. Merge remote-tracking branch 'origin/dev' into optimize-buffer-geomet… 

    …ry-indices
    @gkjohnson
    gkjohnson committed Jun 8, 2018
    Copy the full SHA
    73dba53 View commit details

Commits on Jun 22, 2018

  1. Change precision to tolerance, update memory function name

    @gkjohnson
    gkjohnson committed Jun 22, 2018
    Copy the full SHA
    814e782 View commit details

  2. Linting update

    @gkjohnson
    gkjohnson committed Jun 22, 2018
    Copy the full SHA
    516cf70 View commit details

Commits on Jul 25, 2018

  1. Make mergeVertices work if an index array already exists

    @gkjohnson
    gkjohnson committed Jul 25, 2018
    Copy the full SHA
    ee7c54a View commit details

Commits on Aug 20, 2018

  1. Merge remote-tracking branch 'mrdoob-origin/dev' into optimize-buffer… 

    …-geometry-indices
    @gkjohnson
    gkjohnson committed Aug 20, 2018
    Copy the full SHA
    64c4e2e View commit details

Commits on Aug 21, 2018

  1. Support merging morphAttributes

    @gkjohnson
    gkjohnson committed Aug 21, 2018
    Copy the full SHA
    86f1c64 View commit details

Commits on Oct 30, 2018

  1. Fix incorrect variable reference. "attribute" -> "oldAttribute"

    @gkjohnson
    gkjohnson authored Oct 30, 2018
    Copy the full SHA
    c20dff3 View commit details

Commits on Nov 20, 2018

  1. WebGLTextures: Introduce .resizeImage()

    @Mugen87
    Mugen87 committed Nov 20, 2018
    Copy the full SHA
    bb4da5a View commit details

Commits on Dec 11, 2018

  1. GLTFExporter: Support individual morph target animation. 

    - Adds AnimationUtils.insertKeyframe().
- Adds KeyframeTrack.clone().
- Enables GLTFExporter to automatically merge animation tracks affecting
individual morph targets.
    Don McCurdy committed Dec 11, 2018
    Copy the full SHA
    8f8daa1 View commit details

  2. AnimationUtils: Add mergeMorphTargetTracks().

    Don McCurdy committed Dec 11, 2018
    Copy the full SHA
    fe5d241 View commit details

  3. AnimationUtils: Fix bug with track merging.

    Don McCurdy committed Dec 11, 2018
    Copy the full SHA
    b70fc01 View commit details

  4. Fix tests.

    Don McCurdy committed Dec 11, 2018
    Copy the full SHA
    57a6b07 View commit details

  5. AnimationUtils: Update docs.

    Don McCurdy committed Dec 11, 2018
    Copy the full SHA
    215c631 View commit details

  6. AnimationUtils: Fix typo in docs.

    Don McCurdy committed Dec 11, 2018
    Copy the full SHA
    fe9fe5f View commit details

Commits on Dec 14, 2018

  1. AnimationUtils: Move new helpers into GLTFExporter.

    Don McCurdy committed Dec 14, 2018
    Copy the full SHA
    7303890 View commit details

Commits on Dec 27, 2018

  1. Examples: Fix some warnings

    @Mugen87
    Mugen87 committed Dec 27, 2018
    Copy the full SHA
    5b73e60 View commit details

  2. Examples: Removed unused shader chunks

    @Mugen87
    Mugen87 committed Dec 27, 2018
    Copy the full SHA
    8c2d93b View commit details

  3. ShaderSkin: Remove comment

    @Mugen87
    Mugen87 committed Dec 27, 2018
    Copy the full SHA
    daf1aa3 View commit details

Commits on Dec 28, 2018

  1. WebGLRenderer: Added ability to sort groups by renderOrder

    @Mugen87
    Mugen87 committed Dec 28, 2018
    Copy the full SHA
    3318a51 View commit details

Commits on Dec 29, 2018

  1. Docs: Update Object3D to reflect new semantics for .renderOrder

    @Mugen87
    Mugen87 committed Dec 29, 2018
    Copy the full SHA
    7d584d9 View commit details

Commits on Jan 1, 2019

  1. Update Useful-links.html 

    Fixed some spelling mistakes.
    @brettkromkamp
    brettkromkamp authored Jan 1, 2019
    Copy the full SHA
    5fd51da View commit details

  2. Merge pull request #15495 from brettkromkamp/patch-1 

    Update Useful-links.html
    @mrdoob
    mrdoob authored Jan 1, 2019
    Copy the full SHA
    a48ecad View commit details

  3. Upgrade dev dependencies

    @Mugen87
    Mugen87 committed Jan 1, 2019
    Copy the full SHA
    a8794dc View commit details

  4. r101dev

    @mrdoob
    mrdoob committed Jan 1, 2019
    Copy the full SHA
    6f8fe9b View commit details

  5. Merge pull request #15496 from Mugen87/dev21 

    Upgrade dev dependencies
    @mrdoob
    mrdoob authored Jan 1, 2019
    Copy the full SHA
    0dde081 View commit details

  6. BufferGeometry: Support morph targets in .toNonIndexed()

    @Mugen87
    Mugen87 committed Jan 1, 2019
    Copy the full SHA
    58736b8 View commit details

  7. Docs: Move material browser to BufferGeometry.

    @Mugen87
    Mugen87 committed Jan 1, 2019
    Copy the full SHA
    40611c3 View commit details

  8. Add window resize support to god rays example 

    This adds window resizing support to the god rays example as well as refactoring some repeated code.
    @Oletus
    Oletus committed Jan 1, 2019
    Copy the full SHA
    27f51da View commit details

  9. Always use strings for uniform names in examples 

    Uniforms of materials should be set and accessed by indexing with a string rather than using the dot operator.

This makes the code more compatible with JavaScript tools such as Closure compiler. If the uniform names are not strings, Closure compiler might try to optimize the uniform names, which would create a mismatch between the shader code and the JS code.

This commit should fix the majority of instances where uniforms were being accessed using the dot operator.
    @Oletus
    Oletus committed Jan 1, 2019
    Copy the full SHA
    c3144a2 View commit details

Commits on Jan 2, 2019

  1. Update LICENSE

    @theo-armour
    theo-armour authored Jan 2, 2019
    Copy the full SHA
    3b38509 View commit details

  2. Merge pull request #15501 from theo-armour/patch-1 

    Update LICENSE
    @mrdoob
    mrdoob authored Jan 2, 2019
    Copy the full SHA
    f7d9d07 View commit details

  3. Merge pull request #15499 from Oletus/cleanup-godrays-example 

    Add window resize support to god rays example
    @mrdoob
    mrdoob authored Jan 2, 2019
    Copy the full SHA
    a6d7b3e View commit details

  4. Merge pull request #15500 from Oletus/cleanup-addressing-uniforms-in-… 

    …examples

Always use strings for uniform names in examples
    @mrdoob
    mrdoob authored Jan 2, 2019
    Copy the full SHA
    f62b2a8 View commit details

  5. WebGLTextures: Fix floating point textures with WebGL 2

    @Mugen87
    Mugen87 committed Jan 2, 2019
    1
    Copy the full SHA
    2bb512d View commit details

  6. Merge pull request #15502 from Mugen87/dev22 

    WebGLTextures: Fix floating point textures with WebGL 2
    @mrdoob
    mrdoob authored Jan 2, 2019
    Copy the full SHA
    3951190 View commit details

  7. Merge pull request #15497 from Mugen87/dev11 

    Docs: Move material browser to BufferGeometry
    @mrdoob
    mrdoob authored Jan 2, 2019
    Copy the full SHA
    fb6f745 View commit details

  8. Merge pull request #15484 from Mugen87/dev2 

    WebGLRenderer: Added ability to sort groups by renderOrder
    @mrdoob
    mrdoob authored Jan 2, 2019
    Copy the full SHA
    e5aa0f2 View commit details

  9. Merge pull request #10 from mrdoob/dev 

    merge
    @HypnosNova
    HypnosNova authored Jan 2, 2019
    Copy the full SHA
    a083aca View commit details

  10. Update docs/index.html

    sunxueqing committed Jan 2, 2019
    Copy the full SHA
    09ea0c4 View commit details

  11. fix code style

    @HypnosNova
    HypnosNova authored Jan 2, 2019
    Copy the full SHA
    9f73975 View commit details

  12. Docs: Ensure the geometry browser uses BufferGeometry

    @Mugen87
    Mugen87 committed Jan 2, 2019
    Copy the full SHA
    c330f7e View commit details

  13. Editor: Clean up

    @Mugen87
    Mugen87 committed Jan 2, 2019
    Copy the full SHA
    bde846d View commit details

Commits on Jan 3, 2019

  1. GLTFExporter: Implement KHR_texture_transform.

    @donmccurdy
    donmccurdy committed Jan 3, 2019
    Copy the full SHA
    b128d19 View commit details
Showing 450 changed files with 22,852 additions and 3,095 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE.md
View file
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ Please also include a live example if possible. You can start from these templat
##### Three.js version

- [ ] Dev
- [ ] r100
- [ ] r101
- [ ] ...

##### Browser
2 changes: 1 addition & 1 deletion LICENSE
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License

Copyright © 2010-2018 three.js authors
Copyright © 2010-2019 three.js authors

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