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: d1f94e361abe6b8bff27fb90c0b947d6e24b86bf
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: 7e0a78beb9317e580d7fa4da9b5b12be051c6feb
Choose a head ref
27 contributors

Commits on Apr 10, 2019

  1. Merge pull request #9 from mrdoob/dev 

    Merge upstream.
    @gogoend
    gogoend authored Apr 10, 2019

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    GPG key ID: B5690EEEBB952194
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2910a61 View commit details

Commits on May 9, 2019

  1. Merge branch 'dev' of https://github.com/mrdoob/three.js into zh_doc

    @gogoend
    gogoend committed May 9, 2019
    Copy the full SHA
    d9d4fa7 View commit details

Commits on May 25, 2019

  1. Merge branch 'dev' of https://github.com/mrdoob/three.js into zh_doc

    @gogoend
    gogoend committed May 25, 2019
    Copy the full SHA
    d237ade View commit details

Commits on Jun 29, 2019

  1. Examples: Remove CTMLoader.

    @Mugen87
    Mugen87 committed Jun 29, 2019
    Copy the full SHA
    9334977 View commit details

Commits on Jun 30, 2019

  1. Examples: Remove CTM models.

    @Mugen87
    Mugen87 committed Jun 30, 2019
    Copy the full SHA
    b5374bd View commit details

Commits on Jul 3, 2019

  1. Added sheen to physical material

    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    d268b80 View commit details

  2. Moved sheen to PhysicalMaterial struct

    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    9428b70 View commit details

  3. Fixed renaming mistake

    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    fcd8fda View commit details

  4. Added sheen to StandardNodeMaterial 

    # Conflicts:
#	examples/jsm/nodes/materials/nodes/StandardNode.js
#	examples/webgl_materials_nodes.html
    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    1ae0a65 View commit details

  5. Fixed node material crashing, added more options to sheen demo

    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    b728371 View commit details

  6. Fixed node material crashing, added more options to sheen demo

    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    ef38e81 View commit details

  7. Switched to Google's Filament sheen BDRF

    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    8597102 View commit details

  8. Fixed errors due to discrepancies between mainline and private three.… 

    …js repos
    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    79cd845 View commit details

  9. Removed (unused) inverted Guassian distribution from bsdfs

    @DanielSturk
    DanielSturk committed Jul 3, 2019
    Copy the full SHA
    350553d View commit details

Commits on Jul 5, 2019

  1. Added sheen to copy and toJSON functions

    @DanielSturk
    DanielSturk authored Jul 5, 2019
    Copy the full SHA
    59f5500 View commit details

Commits on Jul 9, 2019

  1. Fixed StandardNode.copy

    @DanielSturk
    DanielSturk committed Jul 9, 2019
    Copy the full SHA
    a9518cc View commit details

  2. Merge branch 'dev' into sheen

    @DanielSturk
    DanielSturk authored Jul 9, 2019
    Copy the full SHA
    4466b48 View commit details

Commits on Jul 10, 2019

  1. Added demonstration of inconsistent reflection in webgl_materials_nod… 

    …es.html
    @DanielSturk
    DanielSturk committed Jul 10, 2019
    Copy the full SHA
    0e3b061 View commit details

  2. Fixed inconsistency in CubeTextureNode

    @DanielSturk
    DanielSturk committed Jul 10, 2019
    Copy the full SHA
    cced580 View commit details

  3. Reverted prev changes, simplified bug fix by changing use of TEXTURE_… 

    …LOD_EXT
    @DanielSturk
    DanielSturk committed Jul 10, 2019
    Copy the full SHA
    6a69bb4 View commit details

Commits on Jul 11, 2019

  1. Made GL_EXT_shader_texture_lod extension declaration more concise

    @DanielSturk
    DanielSturk authored Jul 11, 2019
    Copy the full SHA
    7297cd9 View commit details

  2. Removed whitespace

    @DanielSturk
    DanielSturk authored Jul 11, 2019
    Copy the full SHA
    2325bf5 View commit details

Commits on Jul 22, 2019

  1. feature/upload-cubetexture-with-mipmaps

    tangyuan committed Jul 22, 2019
    Copy the full SHA
    e48d7cf View commit details

Commits on Jul 23, 2019

  1. resolve package-lock.json changes

    tangyuan committed Jul 23, 2019
    Copy the full SHA
    b9a1f6d View commit details

  2. Conserve shadow map slots reserved for lights 

    Only shadow casting lights now get entries in the shadow maps arrays in shaders. Lights are sorted so that shadow casting lights come first, so the index of the light in the shadow maps array still matches the index in the normal light data array.

This conserves texture slots, enabling to use more lights in scenes where shadow maps are enabled. Uniform update performance and shader execution performance should also be a bit better when there's a mix of shadow casting and non-shadowed lights.
    @Oletus
    Oletus committed Jul 23, 2019
    Copy the full SHA
    541fea9 View commit details

  3. Add extra lights to the webgl_shadowmap_pointlight example 

    The extra point lights demonstrate that it's possible to have lots of non-shadow casting lights in the same scene as the shadow casting lights.
    @Oletus
    Oletus committed Jul 23, 2019
    Copy the full SHA
    7050105 View commit details

  4. Fix code style issues in WebGLLights

    @Oletus
    Oletus committed Jul 23, 2019
    Copy the full SHA
    8a7042f View commit details

  5. Bump

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    7187162 View commit details

  6. Merge branch 'dev' of github.com:mrdoob/three.js into dev

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    1d9f070 View commit details

  7. Logical separation of clearcoat normal from geometry normal 

    Added the option to use a clearcoat normal independent from the (maybe) perturbed geometry normal.
    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    ae37503 View commit details

  8. Working on CC normal impl 

    Created a separate variable for cc normal, independent perturb implementations
    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    1778a77 View commit details

  9. Created cc normal uniform

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    1da6ad4 View commit details

  10. (Mostly) Working independent scale 

    Scale is fine as long as cc scale <= normal scale
    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    244d91a View commit details

  11. Implemented normalmaps

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    cf95c7e View commit details

  12. Fixed irradiance bug

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    03e61e3 View commit details

  13. Pertubation code refactoring

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    695c084 View commit details

  14. Uber shader defines fixes

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    ce035ac View commit details

  15. Refactoring of cc normal code

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    b39e2c9 View commit details

  16. Beautyfied example and added to list

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    acf1b5a View commit details

  17. Fixed inline shader for parallax envmap example

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    87cb760 View commit details

  18. Reverted built files to originals

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    58f5ef7 View commit details

  19. Linting

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    8b9a444 View commit details

  20. fix error due to imprecise clamping at gimbal lock

    @TheophileMot
    TheophileMot committed Jul 23, 2019
    Copy the full SHA
    cc30de3 View commit details

  21. Merged node-clearcoat-normals into dev

    @arobertson0
    arobertson0 committed Jul 23, 2019
    Copy the full SHA
    bee7f0e View commit details

  22. move example to jsfiddle

    @TheophileMot
    TheophileMot committed Jul 23, 2019
    Copy the full SHA
    d42d3e4 View commit details

  23. mrdoob style

    @TheophileMot
    TheophileMot committed Jul 23, 2019
    Copy the full SHA
    a5d89ee View commit details

Commits on Jul 24, 2019

  1. revert code, included material.extensions in TEXTURE_LOD_EXT

    @DanielSturk
    DanielSturk committed Jul 24, 2019
    Copy the full SHA
    e3103f0 View commit details

Commits on Jul 25, 2019

  1. Merge branch 'dev' of https://github.com/mrdoob/three.js into sheen 

    # Conflicts:
#	examples/jsm/nodes/materials/nodes/StandardNode.js
    @DanielSturk
    DanielSturk committed Jul 25, 2019
    Copy the full SHA
    b81c8c4 View commit details

  2. Merge branch 'sheen' of https://github.com/DanielSturk/three.js into … 

    …sheen
    @DanielSturk
    DanielSturk committed Jul 25, 2019
    Copy the full SHA
    5bc5cdd View commit details

  3. updated sheen demo, added it to files.js

    @DanielSturk
    DanielSturk committed Jul 25, 2019
    Copy the full SHA
    9f395f8 View commit details
Showing 929 changed files with 18,298 additions and 18,356 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
- [ ] r107
- [ ] r108
- [ ] ...

##### Browser
Loading