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

PBR Terrain Shader + Lighting Rewrite + Triplanar terrain #184

Merged
merged 42 commits into from
Jun 17, 2023
Merged

PBR Terrain Shader + Lighting Rewrite + Triplanar terrain #184

merged 42 commits into from
Jun 17, 2023

Commits on May 15, 2023

  1. Merge branch 'ramp-brush' into triplanar-terrain

    @JamesTKhan
    JamesTKhan committed May 15, 2023
    Configuration menu
    Copy the full SHA
    7967f9d View commit details
    Browse the repository at this point in the history

  2. Normal averaging and triplanar terrain

    @JamesTKhan
    JamesTKhan committed May 15, 2023
    Configuration menu
    Copy the full SHA
    bc39932 View commit details
    Browse the repository at this point in the history

Commits on May 16, 2023

  1. Add persistence and fix GWT

    @JamesTKhan
    JamesTKhan committed May 16, 2023
    Configuration menu
    Copy the full SHA
    4c77f21 View commit details
    Browse the repository at this point in the history

  2. Update label and UV scaling

    @JamesTKhan
    JamesTKhan committed May 16, 2023
    Configuration menu
    Copy the full SHA
    757b80f View commit details
    Browse the repository at this point in the history

  3. Update label and UV scaling

    @JamesTKhan
    JamesTKhan committed May 16, 2023
    Configuration menu
    Copy the full SHA
    10d63d6 View commit details
    Browse the repository at this point in the history

  4. Update CHANGES

    @JamesTKhan
    JamesTKhan committed May 16, 2023
    Configuration menu
    Copy the full SHA
    0868bed View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/triplanar-terrain' into triplana… 

    …r-terrain
    @JamesTKhan
    JamesTKhan committed May 16, 2023
    Configuration menu
    Copy the full SHA
    3d65b46 View commit details
    Browse the repository at this point in the history

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

    @JamesTKhan
    JamesTKhan committed May 16, 2023
    Configuration menu
    Copy the full SHA
    fe6cd5f View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2023

  1. Rewrite of terrain and lighting

    @JamesTKhan
    JamesTKhan committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    e8ba051 View commit details
    Browse the repository at this point in the history

  2. Add PICKER to PBR Terrain Shader

    @JamesTKhan
    JamesTKhan committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    31ff664 View commit details
    Browse the repository at this point in the history

  3. Fix NPE on scene switch

    @JamesTKhan
    JamesTKhan committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    0b7d6da View commit details
    Browse the repository at this point in the history

Commits on Jun 3, 2023

  1. Fix fog on triplanar

    @JamesTKhan
    JamesTKhan committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    2de2cbc View commit details
    Browse the repository at this point in the history

  2. Separate Material UI and add terrain material

    @JamesTKhan
    JamesTKhan committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    176c9dc View commit details
    Browse the repository at this point in the history

  3. Add transparent splat fix

    @JamesTKhan
    JamesTKhan committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    8cd0fec View commit details
    Browse the repository at this point in the history

  4. Deprecate non-pbr terrain shader

    @JamesTKhan
    JamesTKhan committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    42ac395 View commit details
    Browse the repository at this point in the history

  5. Add notes on mat widget

    @JamesTKhan
    JamesTKhan committed Jun 3, 2023
    Configuration menu
    Copy the full SHA
    2f4d7ab View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. Minor cleanup

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    c875411 View commit details
    Browse the repository at this point in the history

  2. Dipose old model batch

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    1444b5a View commit details
    Browse the repository at this point in the history

  3. Water shader gamma correction

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    27c38af View commit details
    Browse the repository at this point in the history

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

    # Conflicts:
#	commons/src/main/com/mbrlabs/mundus/commons/shaders/terrain.uber.frag.glsl
#	editor/CHANGES
    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    3bbc275 View commit details
    Browse the repository at this point in the history

  5. Water shader sRGB

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    52534d0 View commit details
    Browse the repository at this point in the history

  6. Fix base textures not appearing

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    8f0b7fd View commit details
    Browse the repository at this point in the history

  7. Fix uv scaled not applying

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    5529761 View commit details
    Browse the repository at this point in the history

  8. Remove uv scale slider

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    d3fc343 View commit details
    Browse the repository at this point in the history

  9. Remove the triplanar.gsl unused

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    2f83295 View commit details
    Browse the repository at this point in the history

  10. Update terrain settings UI

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    afda870 View commit details
    Browse the repository at this point in the history

  11. Update CHANGES

    @JamesTKhan
    JamesTKhan committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    4f940b6 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2023

  1. Fix reloading of missing standard assets

    @JamesTKhan
    JamesTKhan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    41053dc View commit details
    Browse the repository at this point in the history

  2. Add error logging for terrain mat

    @JamesTKhan
    JamesTKhan committed Jun 6, 2023
    Configuration menu
    Copy the full SHA
    609a165 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2023

  1. Pull rendering out of Scenegraph and GameObjects

    @JamesTKhan
    JamesTKhan committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    153b2fc View commit details
    Browse the repository at this point in the history

  2. Update CHANGES

    @JamesTKhan
    JamesTKhan committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    46d472a View commit details
    Browse the repository at this point in the history

  3. Add some comments

    @JamesTKhan
    JamesTKhan committed Jun 8, 2023
    Configuration menu
    Copy the full SHA
    a87dbe0 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2023

  1. Fix crash on asset cleanup

    @JamesTKhan
    JamesTKhan committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    6e3eb3b View commit details
    Browse the repository at this point in the history

  2. Merge branch 'rendering-refactoring' into terrain_lighting 

    # Conflicts:
#	commons/src/main/com/mbrlabs/mundus/commons/Scene.java
#	commons/src/main/com/mbrlabs/mundus/commons/scene3d/components/TerrainComponent.java
    @JamesTKhan
    JamesTKhan committed Jun 9, 2023
    Configuration menu
    Copy the full SHA
    733ff48 View commit details
    Browse the repository at this point in the history

Commits on Jun 10, 2023

  1. fix merge render refactoring

    @JamesTKhan
    JamesTKhan committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    2ac4e77 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into terrain_lighting 

    # Conflicts:
#	commons/src/main/com/mbrlabs/mundus/commons/Scene.java
    @JamesTKhan
    JamesTKhan committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    ade0b85 View commit details
    Browse the repository at this point in the history

  3. Merge in batch flushes

    @JamesTKhan
    JamesTKhan committed Jun 10, 2023
    Configuration menu
    Copy the full SHA
    3ee8ecc View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Merge remote-tracking branch 'origin/master' into terrain_lighting

    @JamesTKhan
    JamesTKhan committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    4cd2e8e View commit details
    Browse the repository at this point in the history

Commits on Jun 15, 2023

  1. Merge remote-tracking branch 'origin/master' into terrain_lighting

    @JamesTKhan
    JamesTKhan committed Jun 15, 2023
    Configuration menu
    Copy the full SHA
    0da54f3 View commit details
    Browse the repository at this point in the history

Commits on Jun 17, 2023

  1. increase default light intensity

    @JamesTKhan
    JamesTKhan committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    ed04313 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into terrain_lighting 

    # Conflicts:
#	commons/src/main/com/mbrlabs/mundus/commons/Scene.java
#	gdx-runtime/CHANGES
    @JamesTKhan
    JamesTKhan committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    70ac4c6 View commit details
    Browse the repository at this point in the history

  3. merge conflict fix

    @JamesTKhan
    JamesTKhan committed Jun 17, 2023
    Configuration menu
    Copy the full SHA
    8773984 View commit details
    Browse the repository at this point in the history