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

Add Material Support to Globe #5919

Merged
merged 35 commits into from
Nov 25, 2017
Merged

Add Material Support to Globe #5919

merged 35 commits into from
Nov 25, 2017

Commits on Oct 20, 2017

  1. Added material support to the globe

    @jasonbeverage
    jasonbeverage committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    24ff46b View commit details
    Browse the repository at this point in the history

  2. Removed SlopeMaterial shader in favor of the SlopeRampMaterial which … 

    …now uses a color ramp image
    @jasonbeverage
    jasonbeverage committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    4e3ae37 View commit details
    Browse the repository at this point in the history

  3. Got rid of multiple enableLighting calls

    @jasonbeverage
    jasonbeverage committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    6c2d17c View commit details
    Browse the repository at this point in the history

  4. Unsetting uniformMap if there is no material

    @jasonbeverage
    jasonbeverage committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    ce71917 View commit details
    Browse the repository at this point in the history

  5. Updated CHANGES.md

    @jasonbeverage
    jasonbeverage committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    a2152cc View commit details
    Browse the repository at this point in the history

  6. Updated CHANGES.md with PR reference

    @jasonbeverage
    jasonbeverage committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    5139bad View commit details
    Browse the repository at this point in the history

  7. Fix eslint warning

    @jasonbeverage
    jasonbeverage committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    29d4ae2 View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'upstream/master' into globematerials 

    Properties.html
    @jasonbeverage
    jasonbeverage committed Oct 20, 2017
    Configuration menu
    Copy the full SHA
    11325f2 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2017

  1. Merge branch 'master' into globematerials

    @jasonbeverage
    jasonbeverage authored Nov 1, 2017
    Configuration menu
    Copy the full SHA
    9b7f7d9 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2017

  1. Style tweaks

    @lilleyse
    lilleyse committed Nov 3, 2017
    Configuration menu
    Copy the full SHA
    60c0121 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into globematerials

    @lilleyse
    lilleyse authored Nov 3, 2017
    Configuration menu
    Copy the full SHA
    46d1a17 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into globematerials

    @lilleyse
    lilleyse authored Nov 3, 2017
    Configuration menu
    Copy the full SHA
    3ba02db View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2017

  1. Setting initial time in Globe Materials demo to make lighting look de… 

    …cent on first view of Mt Everest
    @jasonbeverage
    jasonbeverage committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    cbcaea1 View commit details
    Browse the repository at this point in the history

  2. Using defined to check for material in Globe

    @jasonbeverage
    jasonbeverage committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    cff763d View commit details
    Browse the repository at this point in the history

  3. Using defined to check for uniformMap

    @jasonbeverage
    jasonbeverage committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    5c619a9 View commit details
    Browse the repository at this point in the history

  4. Wrapping slope and height and globe shaders with APPLY_MATERIAL ifdef.

    @jasonbeverage
    jasonbeverage committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    7493d7c View commit details
    Browse the repository at this point in the history

  5. Renamed minHeight/maxHeight => minimumHeight/maximumHeight in Elevati… 

    …onRampMaterial
    @jasonbeverage
    jasonbeverage committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    5e4aab6 View commit details
    Browse the repository at this point in the history

  6. Added lineThickness uniform to ElevationContourMaterial 

    Added implementation of screen space partial derivatives for contour
lines to make them look nicer.
Source/Shaders/Materials/ElevationContourMaterial.glsl
    @jasonbeverage
    jasonbeverage committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    c045a6c View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2017

  1. fancy sandcastle demo

    hpinkos committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    8f4a8a1 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2017

  1. Removed trailing whitespace to fix travis

    @jasonbeverage
    jasonbeverage committed Nov 21, 2017
    Configuration menu
    Copy the full SHA
    e8f9b04 View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2017

  1. Changed link in CHANGES.md to Globe Material sandcastle demo

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    8ca9ac9 View commit details
    Browse the repository at this point in the history

  2. Changed dirtyShaders to makeShadersDirty and made it a file level fun… 

    …ction intead of a private function
    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    0697c45 View commit details
    Browse the repository at this point in the history

  3. Remove comment

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    83dedf0 View commit details
    Browse the repository at this point in the history

  4. Formatting

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    a5fd43f View commit details
    Browse the repository at this point in the history

  5. Renamed lineThickness to width for ElevationContourMaterial

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    e469dd7 View commit details
    Browse the repository at this point in the history

  6. Clarification of height in materialInput

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    560caa5 View commit details
    Browse the repository at this point in the history

  7. Commenting slope in materialInput

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    cc77f3a View commit details
    Browse the repository at this point in the history

  8. Not normalizing v_normalMC in GlobeVS.glsl

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    8c30e90 View commit details
    Browse the repository at this point in the history

  9. Not reading varying values in GlobeVS

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    5bd104f View commit details
    Browse the repository at this point in the history

  10. Changed default viewpoint of GlobeMaterials to the Himalayas

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    a71d73a View commit details
    Browse the repository at this point in the history

  11. Added unit tests for rendering a globe with materials

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    b42d079 View commit details
    Browse the repository at this point in the history

  12. Added sets material test for Globe

    @jasonbeverage
    jasonbeverage committed Nov 25, 2017
    Configuration menu
    Copy the full SHA
    0264ab1 View commit details
    Browse the repository at this point in the history

  13. Tweak CHANGES.md

    @pjcozzi
    pjcozzi authored Nov 25, 2017
    Configuration menu
    Copy the full SHA
    8eb3bd4 View commit details
    Browse the repository at this point in the history

  14. Whitespace

    @pjcozzi
    pjcozzi authored Nov 25, 2017
    Configuration menu
    Copy the full SHA
    217ce3a View commit details
    Browse the repository at this point in the history

  15. Default Globe Material Sandcastle example to elevation shading

    @pjcozzi
    pjcozzi authored Nov 25, 2017
    Configuration menu
    Copy the full SHA
    fc88b02 View commit details
    Browse the repository at this point in the history