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 ground atmosphere #6877

Merged
merged 39 commits into from
Sep 24, 2018
Merged

Add ground atmosphere #6877

Changes from 1 commit
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
b3aeee9
Add back ground atmosphere from space.
bagnell Jul 25, 2018
c052aa0
Fix fog.
bagnell Jul 25, 2018
381c0b2
Merge branch 'master' into atmosphere
bagnell Aug 1, 2018
75e14f7
Add option to enable disable ground atmosphere.
bagnell Aug 1, 2018
139a529
Fix sky atmosphere.
bagnell Aug 1, 2018
edc42fa
Revert sky atmosphere changes.
bagnell Aug 1, 2018
e642085
Remove unused code in sky atmosphere shader.
bagnell Aug 1, 2018
5f11c50
Fix night atmosphere color.
bagnell Aug 2, 2018
d3a9950
Use atmosphere with correct sun lighting.
bagnell Aug 2, 2018
bb402de
Make night fade in/out distances a uniform.
bagnell Aug 2, 2018
2e2b825
Update doc.
bagnell Aug 2, 2018
a708860
Fix 2D/CV.
bagnell Aug 2, 2018
31de234
Update CHANGES.md.
bagnell Aug 2, 2018
f6bf14c
Merge branch 'master' into atmosphere
bagnell Aug 3, 2018
dbccbd8
Merge branch 'master' into atmosphere
bagnell Aug 9, 2018
a7234d7
Merge branch 'master' into atmosphere
bagnell Aug 20, 2018
9d31730
Make ground atmosphere per-fragment for a smoother transition from ni…
bagnell Aug 20, 2018
2279eac
Only use per-fragment ground atmosphere when the camera is greater th…
bagnell Aug 20, 2018
f6a1522
Merge branch 'master' into atmosphere
bagnell Aug 23, 2018
1e6aafe
Merge branch 'master' into atmosphere
bagnell Aug 29, 2018
681fb0f
Merge branch 'master' into atmosphere
bagnell Sep 5, 2018
2225851
Update CHANGES.md after merge.
bagnell Sep 5, 2018
8da546f
Merge branch 'master' into atmosphere
bagnell Sep 6, 2018
fc3e0c7
Merge branch 'master' into atmosphere
bagnell Sep 11, 2018
4426bd2
Clean up globe shader parameters.
bagnell Sep 11, 2018
bfd11bd
More aggressive fade distances. Have enable lighting off by default.
bagnell Sep 11, 2018
7180803
Change water specular intensity when ground atmosphere is enabled.
bagnell Sep 11, 2018
80e591d
Fix day/night terrain shading.
bagnell Sep 11, 2018
e1005fe
Tweak params
lilleyse Sep 20, 2018
61cf20e
Merge branch 'master' into atmosphere
bagnell Sep 20, 2018
85b08e5
Fade water effect when zooming.
bagnell Sep 20, 2018
14e3114
Fix for when atmosphere is disabled.
bagnell Sep 20, 2018
3636dbb
Add atmosphere lighting example.
bagnell Sep 20, 2018
5e36c99
More tweaks
lilleyse Sep 21, 2018
a53cd15
Reset sliders and text box when the reset button is clicked in the at…
bagnell Sep 21, 2018
3fc5808
Update from review.
bagnell Sep 21, 2018
fe410fa
Remove input ids.
bagnell Sep 21, 2018
a623027
Fix fog.
bagnell Sep 21, 2018
b75d1cf
Update docs and changes a bit
lilleyse Sep 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 16 additions & 8 deletions Apps/Sandcastle/gallery/Atmosphere.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,29 @@
<tr>
<td>Lighting Fade Out Distance</td>
<td>
<input type="range" min="1e6" max="1e8" step="1e6" data-bind="value: lightingFadeOutDistance, valueUpdate: 'input'">
<input type="text" size="10" data-bind="value: lightingFadeOutDistance">
<input id="lightingFadeOutDistanceSlider" type="range" min="1e6" max="1e8" step="1e6" data-bind="value: lightingFadeOutDistance, valueUpdate: 'input'">
<input id="lightingFadeOutDistanceText" type="text" size="10" data-bind="value: lightingFadeOutDistance">
</td>
</tr>
<tr>
<td>Lighting Fade In Distance</td>
<td>
<input type="range" min="1e6" max="1e8" step="1e6" data-bind="value: lightingFadeInDistance, valueUpdate: 'input'">
<input type="text" size="10" data-bind="value: lightingFadeInDistance">
<input id="lightingFadeInDistanceSlider" type="range" min="1e6" max="1e8" step="1e6" data-bind="value: lightingFadeInDistance, valueUpdate: 'input'">
<input id="lightingFadeInDistanceText" type="text" size="10" data-bind="value: lightingFadeInDistance">
</td>
</tr>
<tr>
<td>Night Fade Out Distance</td>
<td>
<input type="range" min="1e6" max="1e8" step="1e6" data-bind="value: nightFadeOutDistance, valueUpdate: 'input'">
<input type="text" size="10" data-bind="value: nightFadeOutDistance">
<input id="nightFadeOutDistanceSlider" type="range" min="1e6" max="1e8" step="1e6" data-bind="value: nightFadeOutDistance, valueUpdate: 'input'">
<input id="nightFadeOutDistanceText" type="text" size="10" data-bind="value: nightFadeOutDistance">
</td>
</tr>
<tr>
<td>Night Fade In Distance</td>
<td>
<input type="range" min="1e6" max="1e8" step="1e6" data-bind="value: nightFadeInDistance, valueUpdate: 'input'">
<input type="text" size="10" data-bind="value: nightFadeInDistance">
<input id="nightFadeInDistanceSlider" type="range" min="1e6" max="1e8" step="1e6" data-bind="value: nightFadeInDistance, valueUpdate: 'input'">
<input id="nightFadeInDistanceText" type="text" size="10" data-bind="value: nightFadeInDistance">
</td>
</tr>
</tbody></table>
Expand Down Expand Up @@ -154,6 +154,14 @@
globe.lightingFadeInDistance = defaultLightFadeIn;
globe.nightFadeOutDistance = defaultNightFadeOut;
globe.nightFadeInDistance = defaultNightFadeIn;

document.getElementById('lightingFadeOutDistanceSlider').value = defaultLightFadeOut;
document.getElementById('lightingFadeOutDistanceText').value = defaultLightFadeOut;
document.getElementById('lightingFadeInDistanceSlider').value = defaultLightFadeIn;
document.getElementById('lightingFadeInDistanceText').value = defaultLightFadeIn;
document.getElementById('nightFadeOutDistanceSlider').value = defaultNightFadeOut;
document.getElementById('nightFadeOutDistanceText').value = defaultNightFadeOut;
document.getElementById('nightFadeInDistanceSlider').value = defaultNightFadeOut;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the proper way to do this in knockout is:

viewModel.lightingFadeOutDistance = defaultLightFadeOut;
viewModel.lightingFadeInDistance = defaultLightFadeIn;
viewModel.nightFadeOutDistance = defaultNightFadeOut;
viewModel.nightFadeInDistance = defaultNightFadeIn;

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. Updated.

});

//Sandcastle_End
Expand Down