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

Replace Model Shader with PBR Shader from gdx-gltf #71

Merged
merged 58 commits into from
Jul 15, 2022
Merged

Replace Model Shader with PBR Shader from gdx-gltf #71

merged 58 commits into from
Jul 15, 2022

Commits on Jun 30, 2022

  1. Experimental changes adding pbr shader

    @JamesTKhan
    JamesTKhan committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    f248f2c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'normal_map' into pbr_shader

    @JamesTKhan
    JamesTKhan committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    780732f View commit details
    Browse the repository at this point in the history

  3. Update gltf version to fix normal maps

    @JamesTKhan
    JamesTKhan committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    82eca03 View commit details
    Browse the repository at this point in the history

  4. Update material attributes

    @JamesTKhan
    JamesTKhan committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    de5ccb3 View commit details
    Browse the repository at this point in the history

  5. Cubemaps and IBL

    @JamesTKhan
    JamesTKhan committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    89f520a View commit details
    Browse the repository at this point in the history

  6. Directional light sync

    @JamesTKhan
    JamesTKhan committed Jun 30, 2022
    Configuration menu
    Copy the full SHA
    fa53e49 View commit details
    Browse the repository at this point in the history

Commits on Jul 1, 2022

  1. Extend PBR Shader

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    a052142 View commit details
    Browse the repository at this point in the history

  2. Figuring out lights for PBR

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    14bf19d View commit details
    Browse the repository at this point in the history

  3. Update tool materials

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    32e9896 View commit details
    Browse the repository at this point in the history

  4. Update tool materials

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    a5836ad View commit details
    Browse the repository at this point in the history

  5. More updates on integrating PBR lighting

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    2622741 View commit details
    Browse the repository at this point in the history

  6. Metallic and roughness testing

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    90a1783 View commit details
    Browse the repository at this point in the history

  7. change Metallic and roughness to sliders

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    8209d78 View commit details
    Browse the repository at this point in the history

  8. Save props, merge shadows branch

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    39cdf64 View commit details
    Browse the repository at this point in the history

  9. Update to pbr color attribute

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    1dfd3c1 View commit details
    Browse the repository at this point in the history

  10. Add alpha test support to shadowmap shader

    @JamesTKhan
    JamesTKhan committed Jul 1, 2022
    Configuration menu
    Copy the full SHA
    03d4248 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2022

  1. Change slider layout, add normal scale

    @JamesTKhan
    JamesTKhan committed Jul 3, 2022
    Configuration menu
    Copy the full SHA
    77405a8 View commit details
    Browse the repository at this point in the history

  2. Remove old model shader

    @JamesTKhan
    JamesTKhan committed Jul 3, 2022
    Configuration menu
    Copy the full SHA
    0832dfe View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2022

  1. Update ambient light contribution

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    365ef81 View commit details
    Browse the repository at this point in the history

  2. Add UI and persist more PBR attributes

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    1e40b81 View commit details
    Browse the repository at this point in the history

  3. Add CullFace attribute, auto-texture import

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    e1f068a View commit details
    Browse the repository at this point in the history

  4. Clean up PBR config

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    bff4798 View commit details
    Browse the repository at this point in the history

  5. Clone materials on model clone

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    1dee85e View commit details
    Browse the repository at this point in the history

  6. Update comment

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    ba8d5b5 View commit details
    Browse the repository at this point in the history

  7. Point and spotlight for PBR

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    c044e5a View commit details
    Browse the repository at this point in the history

  8. Remove unused shader code

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    76a3dcd View commit details
    Browse the repository at this point in the history

  9. Merge remote-tracking branch 'origin/master' into pbr_shader

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    70c4fb2 View commit details
    Browse the repository at this point in the history

  10. Fog refactor

    @JamesTKhan
    JamesTKhan committed Jul 8, 2022
    Configuration menu
    Copy the full SHA
    e1849be View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2022

  1. Update terrain depthFunc, use SceneRenderableSorter

    @JamesTKhan
    JamesTKhan committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    1cda5b5 View commit details
    Browse the repository at this point in the history

  2. Fix runtime value

    @JamesTKhan
    JamesTKhan committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    95e29c1 View commit details
    Browse the repository at this point in the history

  3. Update ambient light factor for pbr

    @JamesTKhan
    JamesTKhan committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    1966b65 View commit details
    Browse the repository at this point in the history

  4. Fix converter

    @JamesTKhan
    JamesTKhan committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    535136f View commit details
    Browse the repository at this point in the history

  5. Update loadScene methods, batch param now not required

    @JamesTKhan
    JamesTKhan committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    c24881b View commit details
    Browse the repository at this point in the history

  6. Alter a comment

    @JamesTKhan
    JamesTKhan committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    bc89c08 View commit details
    Browse the repository at this point in the history

  7. Experiment with IBL and skybox

    @JamesTKhan
    JamesTKhan committed Jul 9, 2022
    Configuration menu
    Copy the full SHA
    54646ce View commit details
    Browse the repository at this point in the history

Commits on Jul 11, 2022

  1. Change default roughness

    @JamesTKhan
    JamesTKhan committed Jul 11, 2022
    Configuration menu
    Copy the full SHA
    18da9c7 View commit details
    Browse the repository at this point in the history

Commits on Jul 12, 2022

  1. Remove unused import

    @JamesTKhan
    JamesTKhan committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    245de88 View commit details
    Browse the repository at this point in the history

  2. Revert "Experiment with IBL and skybox" 

    This reverts commit 54646ce.
    @JamesTKhan
    JamesTKhan committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    10207d9 View commit details
    Browse the repository at this point in the history

  3. Refactor import code a bit

    @JamesTKhan
    JamesTKhan committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    8528a3d View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into pbr_shader

    @JamesTKhan
    JamesTKhan committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    e1469a5 View commit details
    Browse the repository at this point in the history

  5. Add message to import dialog

    @JamesTKhan
    JamesTKhan committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    13a4920 View commit details
    Browse the repository at this point in the history

  6. Prevent crash on preview, get maxBones

    @JamesTKhan
    JamesTKhan committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    1ef21ae View commit details
    Browse the repository at this point in the history

  7. Detect and store max bones of model, update shader provider

    @JamesTKhan
    JamesTKhan committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    523ef9a View commit details
    Browse the repository at this point in the history

  8. Use batch from central location instead of passing around

    @JamesTKhan
    JamesTKhan committed Jul 12, 2022
    Configuration menu
    Copy the full SHA
    da0eca7 View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2022

  1. Rebuild shaders on model import

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    a49b5ec View commit details
    Browse the repository at this point in the history

  2. Add clip plane to PBR shader

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    73b26c5 View commit details
    Browse the repository at this point in the history

  3. Change water render order to resolve opacity issue

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    9eff1d8 View commit details
    Browse the repository at this point in the history

  4. Use renderables to get bone count

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    c4a9f24 View commit details
    Browse the repository at this point in the history

  5. Update CHANGES and README.md

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    464f0b0 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' into pbr_shader

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    8bac283 View commit details
    Browse the repository at this point in the history

  7. Merge remote-tracking branch 'origin/master' into pbr_shader 

    # Conflicts:
#	commons/src/main/com/mbrlabs/mundus/commons/shaders/ModelShader.java
#	commons/src/main/com/mbrlabs/mundus/commons/shaders/model.vert.glsl
#	commons/src/main/com/mbrlabs/mundus/commons/shaders/shadowmap.frag.glsl
#	editor/src/main/com/mbrlabs/mundus/editor/ui/modules/dialogs/DirectionalLightsDialog.kt
    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    8ee75d5 View commit details
    Browse the repository at this point in the history

  8. send shadowmap to PBR shader

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    2c51e12 View commit details
    Browse the repository at this point in the history

  9. Add shadowBias to material widget

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    c10b827 View commit details
    Browse the repository at this point in the history

  10. Fix glsl int cast

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    6eb5656 View commit details
    Browse the repository at this point in the history

  11. Fix glsl int cast

    @JamesTKhan
    JamesTKhan committed Jul 13, 2022
    Configuration menu
    Copy the full SHA
    316a123 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2022

  1. Add some labels to material widget

    @JamesTKhan
    JamesTKhan committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    e5977fe View commit details
    Browse the repository at this point in the history

  2. Fix fog converter for runtime

    @JamesTKhan
    JamesTKhan committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    dc93b01 View commit details
    Browse the repository at this point in the history

  3. rename pbr shader, fix gwt

    @JamesTKhan
    JamesTKhan committed Jul 14, 2022
    Configuration menu
    Copy the full SHA
    b1d99b9 View commit details
    Browse the repository at this point in the history