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

Fog #3154

Merged
merged 47 commits into from
Nov 9, 2015
Merged

Fog #3154

merged 47 commits into from
Nov 9, 2015

Commits on Oct 22, 2015

  1. Initial fog. WIP.

    @bagnell
    bagnell committed Oct 22, 2015
    Configuration menu
    Copy the full SHA
    e0efc3a View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2015

  1. Fog color WIP.

    @bagnell
    bagnell committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    7655844 View commit details
    Browse the repository at this point in the history

  2. Clean up different fog equations and remove uniform fog color.

    @bagnell
    bagnell committed Oct 23, 2015
    1 Configuration menu
    Copy the full SHA
    7e59d39 View commit details
    Browse the repository at this point in the history

  3. More clean up.

    @bagnell
    bagnell committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    60e8bd5 View commit details
    Browse the repository at this point in the history

  4. More fog color WIP.

    @bagnell
    bagnell committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    b05a074 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' into fog

    @bagnell
    bagnell committed Oct 23, 2015
    Configuration menu
    Copy the full SHA
    9b690c7 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2015

  1. Merge branch 'master' into fog

    @bagnell
    bagnell committed Oct 28, 2015
    Configuration menu
    Copy the full SHA
    7894da3 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2015

  1. Use atmosphere color for fog.

    @bagnell
    bagnell committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    d397e32 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into fog

    @bagnell
    bagnell committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    8fd263d View commit details
    Browse the repository at this point in the history

  3. Minor shader clean up.

    @bagnell
    bagnell committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    41b9330 View commit details
    Browse the repository at this point in the history

  4. Add fog parameters to frame state. Cull globe tiles based on fog WIP.

    @bagnell
    bagnell committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    bebe65c View commit details
    Browse the repository at this point in the history

  5. Update density from experimentation. Fog culling WIP.

    @bagnell
    bagnell committed Oct 29, 2015
    Configuration menu
    Copy the full SHA
    01f6a6c View commit details
    Browse the repository at this point in the history

Commits on Oct 30, 2015

  1. Interpolate fog density based on camera height.

    @bagnell
    bagnell committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    9d3b07a View commit details
    Browse the repository at this point in the history

  2. Use preprocessor to enable fog.

    @bagnell
    bagnell committed Oct 30, 2015
    Configuration menu
    Copy the full SHA
    ca742f9 View commit details
    Browse the repository at this point in the history

Commits on Nov 2, 2015

  1. Make scene.fog property. Factor out fog computations. When getting th… 

    …e atmosphere color, always align the position and sun vectors.
    @bagnell
    bagnell committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    9d6a8e6 View commit details
    Browse the repository at this point in the history

  2. Update Sandcastle example locations. Try new density function.

    @bagnell
    bagnell committed Nov 2, 2015
    Configuration menu
    Copy the full SHA
    80f3f28 View commit details
    Browse the repository at this point in the history

Commits on Nov 3, 2015

  1. Remove fog density function, use look up table.

    @bagnell
    bagnell committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    8a8c75d View commit details
    Browse the repository at this point in the history

  2. Remove fog after zooming out a certain distance.

    @bagnell
    bagnell committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    d2df9a1 View commit details
    Browse the repository at this point in the history

  3. Clean up unused code and Sandcastle example.

    @bagnell
    bagnell committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    d2c927b View commit details
    Browse the repository at this point in the history

  4. Increase SSE when tile is in fog.

    @bagnell
    bagnell committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    64a2be8 View commit details
    Browse the repository at this point in the history

  5. Swap shader when tile is in/out of fog.

    @bagnell
    bagnell committed Nov 3, 2015
    Configuration menu
    Copy the full SHA
    95048fd View commit details
    Browse the repository at this point in the history

Commits on Nov 4, 2015

  1. Explicitly tag CesiumMath.fog private

    @pjcozzi
    pjcozzi committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    582426a View commit details
    Browse the repository at this point in the history

  2. Doc tweak

    @pjcozzi
    pjcozzi committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    dd54283 View commit details
    Browse the repository at this point in the history

  3. Add comment

    @pjcozzi
    pjcozzi committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    1a194b7 View commit details
    Browse the repository at this point in the history

  4. Add comment

    @pjcozzi
    pjcozzi committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    d84186f View commit details
    Browse the repository at this point in the history

  5. Fix whitespace

    @pjcozzi
    pjcozzi committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    f07d538 View commit details
    Browse the repository at this point in the history

  6. Tweak density look up table.

    @bagnell
    bagnell committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    c5d7341 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into fog

    @bagnell
    bagnell committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    325d393 View commit details
    Browse the repository at this point in the history

  8. Exploit temporal coherence of zoom level in table look up.

    @bagnell
    bagnell committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    35295de View commit details
    Browse the repository at this point in the history

  9. Clean up searching for height interval.

    @bagnell
    bagnell committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    ff61da5 View commit details
    Browse the repository at this point in the history

  10. Only compute distance to tile once. Tweak frame state.

    @bagnell
    bagnell committed Nov 4, 2015
    Configuration menu
    Copy the full SHA
    d11c50b View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2015

  1. Re-add ability to change the density by scaling the table.

    @bagnell
    bagnell committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    85cc52b View commit details
    Browse the repository at this point in the history

  2. Fade fog in as the camera is tilted towards the horizon.

    @bagnell
    bagnell committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    7902c29 View commit details
    Browse the repository at this point in the history

  3. Fix tests.

    @bagnell
    bagnell committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    5420561 View commit details
    Browse the repository at this point in the history

  4. Add fog tests.

    @bagnell
    bagnell committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    64828bc View commit details
    Browse the repository at this point in the history

  5. Add fog documentation.

    @bagnell
    bagnell committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    22de5d1 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'master' into fog 

    Conflicts:
	CHANGES.md
    @bagnell
    bagnell committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    6f8fb41 View commit details
    Browse the repository at this point in the history

  7. Update fog Sandcastle example with positions that demonstrate perform… 

    …ance improvements.
    @bagnell
    bagnell committed Nov 5, 2015
    Configuration menu
    Copy the full SHA
    403b049 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2015

  1. Fix cracking between the globe and the atmosphere.

    @bagnell
    bagnell committed Nov 6, 2015
    Configuration menu
    Copy the full SHA
    10a3b97 View commit details
    Browse the repository at this point in the history

  2. Fix fog for views with negative altitude.

    @bagnell
    bagnell committed Nov 6, 2015
    Configuration menu
    Copy the full SHA
    c6ce4c2 View commit details
    Browse the repository at this point in the history

  3. Move fog code from scene to new Fog object.

    @bagnell
    bagnell committed Nov 6, 2015
    Configuration menu
    Copy the full SHA
    333c8f0 View commit details
    Browse the repository at this point in the history

  4. Enable fog in the tests.

    @bagnell
    bagnell committed Nov 6, 2015
    Configuration menu
    Copy the full SHA
    186c63f View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2015

  1. Tweak CHANGES.md

    @pjcozzi
    pjcozzi committed Nov 7, 2015
    Configuration menu
    Copy the full SHA
    7d7c3b2 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2015

  1. Merge branch 'master' into fog 

    Conflicts:
	CHANGES.md
    @bagnell
    bagnell committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    ed30aa0 View commit details
    Browse the repository at this point in the history

  2. Fix shader compile in Firefox/IE.

    @bagnell
    bagnell committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    28d15df View commit details
    Browse the repository at this point in the history

  3. Only render atmosphere when terrain tiles are rendered.

    @bagnell
    bagnell committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    4cccade View commit details
    Browse the repository at this point in the history

  4. Add checkbox to enable/disable fog in the terrain sandcastle example.

    @bagnell
    bagnell committed Nov 9, 2015
    Configuration menu
    Copy the full SHA
    3ba3717 View commit details
    Browse the repository at this point in the history