mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-23 20:50:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/globe-atmosphere' into feature/globebrowsing

Browse Source
This commit is contained in:
Erik Broberg
2016-06-09 19:59:52 -04:00
parent 2951df9653 f64998b517
commit 3cc2733aad
57 changed files with 5075 additions and 413 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/globebrowsing/globes/renderableglobe.cpp
+3
View File
@@ -68,6 +68,7 @@ namespace openspace {
, blendOverlay(properties::BoolProperty("blendOverlay", "blendOverlay", true))
, blendWaterMask(properties::BoolProperty("blendWaterMask", "blendWaterMask", true))
, atmosphereEnabled(properties::BoolProperty("atmosphereEnabled", "atmosphereEnabled", false))
, showChunkEdges(properties::BoolProperty("showChunkEdges", "showChunkEdges", false))
{
setName("RenderableGlobe");
@@ -86,6 +87,7 @@ namespace openspace {
addProperty(blendOverlay);
addProperty(blendWaterMask);
addProperty(atmosphereEnabled);
addProperty(showChunkEdges);
doFrustumCulling.setValue(true);
doHorizonCulling.setValue(true);
@@ -200,6 +202,7 @@ namespace openspace {
_chunkedLodGlobe->blendOverlay = blendOverlay.value();
_chunkedLodGlobe->blendWaterMask = blendWaterMask.value();
_chunkedLodGlobe->atmosphereEnabled = atmosphereEnabled.value();
_chunkedLodGlobe->showChunkEdges = showChunkEdges.value();
std::vector<TileProviderManager::TileProviderWithName>& colorTextureProviders =
_tileProviderManager->getLayerCategory("ColorTextures");