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

#define out water effect code for tiles that are entirely land. #2261

Merged
merged 2 commits into from
Nov 7, 2014
Merged

#define out water effect code for tiles that are entirely land. #2261

merged 2 commits into from
Nov 7, 2014

Commits on Nov 6, 2014

  1. #define out water effect code for tiles that are entirely land. 

    `SHOW_REFLECTIVE_OCEAN` and `SHOW_OCEAN_WAVES` have moved into the `GlobeSurfaceShaderSet` so they can vary on a per-tile basis, rather than being set identically for all tiles.  Tiles that are entirely land now use `undefined` for their water mask texture instead of a shared "land" texture.
    @shunter
    shunter committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    7acade9 View commit details
    Browse the repository at this point in the history

  2. Cleanup now that shader defines are managed elsewhere.

    @shunter
    shunter committed Nov 6, 2014
    Configuration menu
    Copy the full SHA
    4f80225 View commit details
    Browse the repository at this point in the history