Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WIP: Added anisotropic roughness to mainline #17391

Closed
wants to merge 16 commits into from
Closed

WIP: Added anisotropic roughness to mainline #17391

wants to merge 16 commits into from

Commits on Aug 28, 2019

  1. Added anisotropic roughness 

    # Conflicts:
#	src/materials/MeshPhysicalMaterial.js
#	src/renderers/WebGLRenderer.js
#	src/renderers/shaders/ShaderChunk/common.glsl.js
#	src/renderers/shaders/ShaderChunk/envmap_physical_pars_fragment.glsl.js
#	src/renderers/shaders/ShaderChunk/lights_fragment_begin.glsl.js
#	src/renderers/shaders/ShaderChunk/lights_fragment_maps.glsl.js
#	src/renderers/shaders/ShaderChunk/uv_pars_fragment.glsl.js
#	src/renderers/shaders/ShaderChunk/uv_pars_vertex.glsl.js
#	src/renderers/shaders/ShaderChunk/uv_vertex.glsl.js
#	src/renderers/webgl/WebGLProgram.js
#	src/renderers/webgl/WebGLPrograms.js
    @DanielSturk
    DanielSturk committed Aug 28, 2019
    Configuration menu
    Copy the full SHA
    2714e67 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2019

  1. forgot to stage file

    @DanielSturk
    DanielSturk committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    ecabbfa View commit details
    Browse the repository at this point in the history

  2. Fixed envmap anisotropic roughness being perpendicular to direct ligh… 

    …t anisotropic roughness
    @DanielSturk
    DanielSturk committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    ffe6fd7 View commit details
    Browse the repository at this point in the history

  3. Added flatShading option to webgl_materials_envmaps_anisotropy.html 

    # Conflicts:
#	examples/webgl_materials_envmaps_anisotropy.html
    @DanielSturk
    DanielSturk committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    c498a47 View commit details
    Browse the repository at this point in the history

  4. Added anisotropic roughness to StandardNodeMaterial, fixed bug with f… 

    …latShading

# Conflicts:
#	examples/jsm/nodes/materials/nodes/StandardNode.js
#	examples/webgl_materials_envmaps_anisotropy.html
#	src/renderers/shaders/ShaderLib/meshphysical_frag.glsl.js
    @DanielSturk
    DanielSturk committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    48928e3 View commit details
    Browse the repository at this point in the history

  5. Moved anisotropy to Google's Filament, fixed envmap anisotropy on nod… 

    …e material

# Conflicts:
#	examples/jsm/nodes/accessors/ReflectNode.js
    @DanielSturk
    DanielSturk committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    e90a6bd View commit details
    Browse the repository at this point in the history

  6. Fixed anisotropic roughness crashing on StandardNode 

    # Conflicts:
#	examples/jsm/nodes/materials/nodes/StandardNode.js
    @DanielSturk
    DanielSturk committed Aug 29, 2019
    Configuration menu
    Copy the full SHA
    76e713f View commit details
    Browse the repository at this point in the history

Commits on Aug 30, 2019

  1. added ibl anisotropy to node material 

    Signed-off-by: Daniel Sturk <danielsturk1@gmail.com>
    @DanielSturk
    DanielSturk committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    e37dbab View commit details
    Browse the repository at this point in the history

  2. fixed anisotropy crashing node material, added "carbon fiber" to demo

    @DanielSturk
    DanielSturk committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    b55c6ff View commit details
    Browse the repository at this point in the history

  3. disabled normal map by default in demo

    @DanielSturk
    DanielSturk committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    120cd18 View commit details
    Browse the repository at this point in the history

  4. fixed formatting

    @DanielSturk
    DanielSturk committed Aug 30, 2019
    Configuration menu
    Copy the full SHA
    b2b9cb8 View commit details
    Browse the repository at this point in the history

  5. Merge pull request mrdoob#4 from DanielSturk/mainline-anisotropy 

    Mainline anisotropy
    @sunag
    sunag authored Aug 30, 2019
    Configuration menu
    Copy the full SHA
    5d94a3e View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2019

  1. nodematerial revision

    @sunag
    sunag committed Sep 1, 2019
    Configuration menu
    Copy the full SHA
    91b1864 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2019

  1. Merge pull request #1 from sunag/dev2-mainline-anisotropy 

    NodeMaterial Revision
    @DanielSturk
    DanielSturk authored Sep 16, 2019
    Configuration menu
    Copy the full SHA
    4b23aef View commit details
    Browse the repository at this point in the history

  2. made changes in response to Mugen87's review

    @DanielSturk
    DanielSturk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    c1a26a5 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'mrdoob/dev' into mainline-anisotropy 

    # Conflicts:
#	src/renderers/shaders/ShaderChunk/common.glsl.js
    @DanielSturk
    DanielSturk committed Sep 16, 2019
    Configuration menu
    Copy the full SHA
    78da06f View commit details
    Browse the repository at this point in the history