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

Fix merge

Browse Source
This commit is contained in:
Jonathan Grangien
2018-05-09 14:48:58 -04:00
committed by Matthias Berg
parent 87e870b1a8
commit e23508cdce
1 changed files with 1 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -416,17 +416,6 @@ void RenderableTimeVaryingVolume::loadTimestepMetadata(const std::string& path)
Timestep t;
t.metadata = metadata;
t.baseName = ghoul::filesystem::File(path).baseName();
t.dimensions = dictionary.value<glm::vec3>(KeyDimensions);
t.lowerDomainBound = dictionary.value<glm::vec3>(KeyLowerDomainBound);
t.upperDomainBound = dictionary.value<glm::vec3>(KeyUpperDomainBound);
t.minValue = dictionary.value<float>(KeyMinValue);
t.maxValue = dictionary.value<float>(KeyMaxValue);
t.unit = dictionary.value<std::string>(KeyUnit);
std::string timeString = dictionary.value<std::string>(KeyTime);
t.time = Time::convertTime(timeString);
// t.time = Time::convertTime("2012-07-01T00:00:00.001");
t.inRam = false;
t.onGpu = false;
@@ -537,8 +526,7 @@ void RenderableTimeVaryingVolume::update(const UpdateData&) {
//_transferFunctionHandler->setUnit(t->metadata.valueUnit);
//_transferFunctionHandler->setMinAndMaxValue(
// t->metadata.minValue, t->metadata.maxValue);
//_transferFunctionHandler->setHistogramProperty(t->histogram);
} else {
_raycaster->setVolumeTexture(nullptr);
}