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

WebGLRenderer: Add support for multiple uv sets and transforms. #25721

Merged
merged 74 commits into from
Mar 30, 2023
Merged

WebGLRenderer: Add support for multiple uv sets and transforms. #25721

merged 74 commits into from
Mar 30, 2023

Commits on Mar 27, 2023

  1. WebGLRenderer: Refactor uv shaderchunks.

    @mrdoob
    mrdoob committed Mar 27, 2023
    Configuration menu
    Copy the full SHA
    bb33b29 View commit details
    Browse the repository at this point in the history

Commits on Mar 28, 2023

  1. GLTFLoader: Removed uv2 workaround.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    bb120b7 View commit details
    Browse the repository at this point in the history

  2. MeshGouraudMaterial: Clean up.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    c04f862 View commit details
    Browse the repository at this point in the history

  3. Texture: Renamed uvChannel to uvSet.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    433d660 View commit details
    Browse the repository at this point in the history

  4. ShaderChunks: Refactored back vUv code.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    08ebb83 View commit details
    Browse the repository at this point in the history

  5. WebGLProgram: Removed uvsVertexOnly flag.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    ff60a9c View commit details
    Browse the repository at this point in the history

  6. WebGLRenderer: Added uvSet support for map and emmisiveMap.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    17c4090 View commit details
    Browse the repository at this point in the history

  7. WebGLRenderer: Added uvSet support for lightMap and aoMap.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    2ee8adb View commit details
    Browse the repository at this point in the history

  8. Texture: Added uvSet to copy() and toJSON().

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    a53e9f9 View commit details
    Browse the repository at this point in the history

  9. ObjectLoader: Parse Texture uvSet.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    bdfe368 View commit details
    Browse the repository at this point in the history

  10. Examples: Fixed webgl_materials_lightmap.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    e47d5be View commit details
    Browse the repository at this point in the history

  11. Examples: Updated webgl_lines_dashed screenshot...

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    df778f1 View commit details
    Browse the repository at this point in the history

  12. WebGLRenderer: Added support for multiple transforms.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    d83626b View commit details
    Browse the repository at this point in the history

  13. UniformLib: Restored uvTransform.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    d1d77d1 View commit details
    Browse the repository at this point in the history

  14. WebGLRenderer: Fixed Sprites uniforms.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    9b7c369 View commit details
    Browse the repository at this point in the history

  15. Merge branch 'dev' into multi_uvs

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    f3aae72 View commit details
    Browse the repository at this point in the history

  16. WebGLRenderer: Added lightMap transform code.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    8a7816f View commit details
    Browse the repository at this point in the history

  17. Examples: Updated webgl_loader_gltf_sheen screenshot.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    5fef053 View commit details
    Browse the repository at this point in the history

  18. WebGLMaterials: Added refreshTransformUniform function.

    @mrdoob
    mrdoob committed Mar 28, 2023
    Configuration menu
    Copy the full SHA
    ee710e6 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2023

  1. WebGLProgram: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    dbf8cf5 View commit details
    Browse the repository at this point in the history

  2. OCD clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    22b4fcd View commit details
    Browse the repository at this point in the history

  3. WebGLMaterials: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    c48595f View commit details
    Browse the repository at this point in the history

  4. WebGLPrograms: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    8e9129c View commit details
    Browse the repository at this point in the history

  5. Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    2da76c4 View commit details
    Browse the repository at this point in the history

  6. WebGLMaterials: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    b399fa3 View commit details
    Browse the repository at this point in the history

  7. ShaderLib: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    f955984 View commit details
    Browse the repository at this point in the history

  8. WebGLRenderer: Added clearcoat transforms code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    0c4a439 View commit details
    Browse the repository at this point in the history

  9. Merge branch 'dev' into multi_uvs

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    8f49aa7 View commit details
    Browse the repository at this point in the history

  10. Revert "Examples: Updated webgl_lines_dashed screenshot..." 

    This reverts commit df778f1.
    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    f17f114 View commit details
    Browse the repository at this point in the history

  11. WebGLRenderer: Added bumpMap transforms code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    929770b View commit details
    Browse the repository at this point in the history

  12. More OCD clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    e4abb9e View commit details
    Browse the repository at this point in the history

  13. Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    9143ca4 View commit details
    Browse the repository at this point in the history

  14. WebGLRenderer: Added alphaMap transform code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    9e536c6 View commit details
    Browse the repository at this point in the history

  15. Examples: Fixed webgl_materials_physical_clearcoat transform.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    64bcc3d View commit details
    Browse the repository at this point in the history

  16. Examples: Fixed webgl_lines_dashed example.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    fa4d52c View commit details
    Browse the repository at this point in the history

  17. ShaderChunk: Rename uvs_* to uv_* back.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    4c8c82d View commit details
    Browse the repository at this point in the history

  18. Manual: Replaced vUv2 references.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    4e7c43c View commit details
    Browse the repository at this point in the history

  19. Examples: Updated ProgressiveLightMap code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    e622e8f View commit details
    Browse the repository at this point in the history

  20. ShaderChunk: Removed vUv2.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    60bf297 View commit details
    Browse the repository at this point in the history

  21. WebGLRenderer: Fixed normalMap and clearcoarNormalMap transforms.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    ab055ff View commit details
    Browse the repository at this point in the history

  22. Examples: Updated webgl_nodes_loader_gltf_sheen screenshot.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    2870e78 View commit details
    Browse the repository at this point in the history

  23. WebGLRenderer: Added displacementMap transform code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    e4a8cf7 View commit details
    Browse the repository at this point in the history

  24. WebGLProgram: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    68f5990 View commit details
    Browse the repository at this point in the history

  25. WebGLProgram/s: Yet more clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    b8f6bc7 View commit details
    Browse the repository at this point in the history

  26. WebGLProgram/s and ShaderChunk: More clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    e1e522b View commit details
    Browse the repository at this point in the history

  27. WebGLProgram/s: More clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    e57ae61 View commit details
    Browse the repository at this point in the history

  28. WebGLProgram: Check that there's a UV2 before trying to use it.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    fd4ad6c View commit details
    Browse the repository at this point in the history

  29. WebGLPrograms: More clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    22242e7 View commit details
    Browse the repository at this point in the history

  30. WebGLProgram: Fixed normalmap crash.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    e7d3f9e View commit details
    Browse the repository at this point in the history

  31. WebGLProgram/s: More clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    5c67747 View commit details
    Browse the repository at this point in the history

  32. WebGLPrograms: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    82d54ab View commit details
    Browse the repository at this point in the history

  33. WebGLProgram: Fixed depthPacking check.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    0af4ec8 View commit details
    Browse the repository at this point in the history

  34. WebGLRenderer: Added specular*Map transform code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    f0d3c49 View commit details
    Browse the repository at this point in the history

  35. WebGLPrograms: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    76a9ff8 View commit details
    Browse the repository at this point in the history

  36. WebGLPrograms: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    6b49ab8 View commit details
    Browse the repository at this point in the history

  37. WebGLProgram: Added specular*Map to cache key.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    fc6dfc3 View commit details
    Browse the repository at this point in the history

  38. WebGLRenderer: Added sheen*Map transform code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    cadd36f View commit details
    Browse the repository at this point in the history

  39. WebGLRenderer: Added iridescence*Map transforms code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    10a79bf View commit details
    Browse the repository at this point in the history

  40. WebGLRenderer: Added transmissionMap and thicknessMap transform code.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    31f27e2 View commit details
    Browse the repository at this point in the history

  41. WebGLMaterials: Use mapTransform in refreshUniformsLine.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    d5ef9fc View commit details
    Browse the repository at this point in the history

  42. ShaderChunks: Removed vUv and uvTransform.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    7e278a8 View commit details
    Browse the repository at this point in the history

  43. Examples: Updated advanced examples with USE_MAP and MAP_UV.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    f9b8c79 View commit details
    Browse the repository at this point in the history

  44. WebGLProgram/s: Clean up.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    89047d3 View commit details
    Browse the repository at this point in the history

  45. Docs: Added placeholder.

    @mrdoob
    mrdoob committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    1b67067 View commit details
    Browse the repository at this point in the history

  46. GLTFLoader: Clone texture before modifying .uvSet

    @donmccurdy
    donmccurdy committed Mar 29, 2023
    Configuration menu
    Copy the full SHA
    ef9cee5 View commit details
    Browse the repository at this point in the history

Commits on Mar 30, 2023

  1. Revert "ShaderChunks: Removed vUv and uvTransform." 

    This reverts commit 7e278a8.
    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    ea7c726 View commit details
    Browse the repository at this point in the history

  2. Revert "Examples: Updated advanced examples with USE_MAP and MAP_UV." 

    This reverts commit f9b8c79.
    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    508425a View commit details
    Browse the repository at this point in the history

  3. Examples: Fixed PackedPhongMaterial.

    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    4a3fdc7 View commit details
    Browse the repository at this point in the history

  4. ShaderChunks: Leaving vUv for backwards compatibility.

    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    2f54dc9 View commit details
    Browse the repository at this point in the history

  5. Texture: Renamed uvSet to channel.

    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    8c90da1 View commit details
    Browse the repository at this point in the history

  6. UniformsLib: Clean up.

    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    8ddb7a5 View commit details
    Browse the repository at this point in the history

  7. Docs: Updated offset and repeat details.

    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    7f433c4 View commit details
    Browse the repository at this point in the history

  8. Docs: Removed uv transforms call out from GLTFLoader.

    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    e4feace View commit details
    Browse the repository at this point in the history

  9. Docs: Added basic channel description.

    @mrdoob
    mrdoob committed Mar 30, 2023
    Configuration menu
    Copy the full SHA
    4d67bb1 View commit details
    Browse the repository at this point in the history