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

Comment out lowerValueBound/lowerUpperBound until further revision

Browse Source
This commit is contained in:
Jonathan Grangien
2018-05-16 14:55:03 -04:00
committed by Matthias Berg
parent abe5cf0fc5
commit c2fca8be46
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/volume/rendering/renderabletimevaryingvolume.cpp
View File

@@ -176,7 +176,6 @@ namespace openspace::volume {
};
}
//documentation::Documentation RenderableTimeVaryingVolume::TimestepDocumentation() {
// using namespace documentation;
// return {
@@ -235,8 +234,8 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
, _secondsAfter(SecondsAfterInfo, 0.f, 0.01f, SecondsInOneDay)
, _sourceDirectory(SourceDirectoryInfo)
, _transferFunctionPath(TransferFunctionInfo)
, _lowerValueBound(lowerValueBoundInfo, 0.f, 0.f, 1000000.f)
, _upperValueBound(upperValueBoundInfo, 0.f, 0.f, 1000000.f)
// , _lowerValueBound(lowerValueBoundInfo, 0.f, 0.f, 1000000.f)
// , _upperValueBound(upperValueBoundInfo, 0.f, 0.f, 1000000.f)
, _triggerTimeJump(TriggerTimeJumpInfo)
, _jumpToTimestep(JumpToTimestepInfo, 0, 0, 256)
, _currentTimestep(CurrentTimeStepInfo, 0, 0, 256)
@@ -248,8 +247,8 @@ RenderableTimeVaryingVolume::RenderableTimeVaryingVolume(
);
_sourceDirectory = absPath(dictionary.value<std::string>(KeySourceDirectory));
_lowerValueBound = dictionary.value<float>(KeyLowerValueBound);
_upperValueBound = dictionary.value<float>(KeyUpperValueBound);
// _lowerValueBound = dictionary.value<float>(KeyLowerValueBound);
// _upperValueBound = dictionary.value<float>(KeyUpperValueBound);
_transferFunctionPath = absPath(dictionary.value<std::string>(KeyTransferFunction));
_transferFunction = std::make_shared<openspace::TransferFunction>(
_transferFunctionPath,

4
modules/volume/rendering/renderabletimevaryingvolume.h
View File

@@ -95,8 +95,8 @@ private:
properties::FloatProperty _secondsAfter;
properties::StringProperty _sourceDirectory;
properties::StringProperty _transferFunctionPath;
properties::FloatProperty _lowerValueBound;
properties::FloatProperty _upperValueBound;
// properties::FloatProperty _lowerValueBound;
// properties::FloatProperty _upperValueBound;
properties::TriggerProperty _triggerTimeJump;
properties::IntProperty _jumpToTimestep;