mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 20:39:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused GUI property chunkHeight

Browse Source
This commit is contained in:
Erik Broberg
2016-06-21 17:21:37 -04:00
parent 427cc0cc2b
commit c7ff3a4730
4 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/globebrowsing/chunk/chunk.cpp
View File

@@ -94,7 +94,7 @@ namespace openspace {
Chunk::BoundingHeights Chunk::getBoundingHeights() const {
BoundingHeights boundingHeights;
boundingHeights.max = _owner->chunkHeight;
boundingHeights.max = 0;
boundingHeights.min = 0;
boundingHeights.available = false;

1
modules/globebrowsing/chunk/chunkedlodglobe.h
View File

@@ -104,7 +104,6 @@ namespace openspace {
float lodScaleFactor;
bool initChunkVisible;
bool renderSmallChunksFirst = true;
float chunkHeight;
// Layered rendering
std::array<bool, LayeredTextures::NUM_TEXTURE_CATEGORIES> blendProperties;

3
modules/globebrowsing/globes/renderableglobe.cpp
View File

@@ -60,7 +60,6 @@ namespace openspace {
, lodScaleFactor(properties::FloatProperty("lodScaleFactor", "lodScaleFactor", 5.0f, 1.0f, 50.0f))
, initChunkVisible(properties::BoolProperty("initChunkVisible", "initChunkVisible", true))
, renderSmallChunksFirst(properties::BoolProperty("renderSmallChunksFirst", "renderSmallChunksFirst", true))
, chunkHeight(properties::FloatProperty("chunkHeight", "chunkHeight", 8700.0f, 0.0f, 8700.0f))
, debugSelection(ReferencedBoolSelection("Debug", "Debug"))
, atmosphereEnabled(properties::BoolProperty("atmosphereEnabled", "atmosphereEnabled", false))
, levelByProjArea(properties::BoolProperty("levelByProjArea", "levelByProjArea", true))
@@ -73,7 +72,6 @@ namespace openspace {
addProperty(lodScaleFactor);
addProperty(initChunkVisible);
addProperty(renderSmallChunksFirst);
addProperty(chunkHeight);
addProperty(atmosphereEnabled);
@@ -187,7 +185,6 @@ namespace openspace {
_chunkedLodGlobe->mergeInvisible = mergeInvisible.value();
_chunkedLodGlobe->lodScaleFactor = lodScaleFactor.value();
_chunkedLodGlobe->initChunkVisible = initChunkVisible.value();
_chunkedLodGlobe->chunkHeight = chunkHeight.value();
_chunkedLodGlobe->atmosphereEnabled = atmosphereEnabled.value();

2
modules/globebrowsing/globes/renderableglobe.h
View File

@@ -119,8 +119,6 @@ public:
properties::FloatProperty lodScaleFactor;
properties::BoolProperty initChunkVisible;
properties::BoolProperty renderSmallChunksFirst;
properties::FloatProperty chunkHeight;
std::vector<std::unique_ptr<ReferencedBoolSelection>> _categorySelections;