mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-25 05:28:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

small fixes and polishing

Browse Source
This commit is contained in:
ElonOlsson
2021-09-22 16:14:07 -04:00
parent 890d0a7bab
commit f46d37e67b
9 changed files with 78 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/base/rendering/renderabletimevaryingsphere.cpp
+19 -20
View File
@@ -182,8 +182,8 @@ RenderableTimeVaryingSphere::RenderableTimeVaryingSphere(
, _useAdditiveBlending(UseAdditiveBlendingInfo, false)
, _disableFadeInDistance(DisableFadeInOutInfo, true)
, _backgroundRendering(BackgroundInfo, false)
, _fadeInThreshold(FadeInThresholdInfo, -1.f, 0.f, 1.f)
, _fadeOutThreshold(FadeOutThresholdInfo, -1.f, 0.f, 1.f)
, _fadeInThreshold(FadeInThresholdInfo, -1.f, -1.f, 1.f)
, _fadeOutThreshold(FadeOutThresholdInfo, -1.f, -1.f, 1.f)
{
const Parameters p = codegen::bake<Parameters>(dictionary);
@@ -220,7 +220,7 @@ RenderableTimeVaryingSphere::RenderableTimeVaryingSphere(
}
addProperty(_orientation);
_size.setViewOption(properties::Property::ViewOptions::MinMaxRange);
_size.setExponent(20.f);
_size.onChange([this]() {
setBoundingSphere(_size);
_sphereIsDirty = true;
@@ -431,23 +431,22 @@ void RenderableTimeVaryingSphere::extractMandatoryInfoFromSourceFolder() {
}
// Extract all file paths from the provided folder
_files.clear();
//_sourceFiles.clear();
namespace fs = std::filesystem;
for (const fs::directory_entry& e : fs::directory_iterator(sourceFolder)) {
if (e.is_regular_file()) {
std::string filePath = e.path().string();
double time = extractTriggerTimeFromFileName(filePath);
std::unique_ptr<ghoul::opengl::Texture> t =
ghoul::io::TextureReader::ref().loadTexture(filePath);
t->setInternalFormat(GL_COMPRESSED_RGBA);
t->uploadTexture();
t->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
t->purgeFromRAM();
_files.push_back({ filePath, time, std::move(t) });
if (!e.is_regular_file()) {
continue;
}
std::string filePath = e.path().string();
double time = extractTriggerTimeFromFileName(filePath);
std::unique_ptr<ghoul::opengl::Texture> t =
ghoul::io::TextureReader::ref().loadTexture(filePath);
t->setInternalFormat(GL_COMPRESSED_RGBA);
t->uploadTexture();
t->setFilter(ghoul::opengl::Texture::FilterMode::Linear);
t->purgeFromRAM();
_files.push_back({ filePath, time, std::move(t) });
}
std::sort(
@@ -485,7 +484,6 @@ void RenderableTimeVaryingSphere::update(const UpdateData& data) {
{
updateActiveTriggerTimeIndex(currentTime);
_sphereIsDirty = true;
} // else {we're still in same state as previous frame (no changes needed)}
}
else {
@@ -499,8 +497,9 @@ void RenderableTimeVaryingSphere::update(const UpdateData& data) {
_sphereIsDirty = false;
}
}
// Extract J2000 time from file names
// Requires files to be named as such: 'YYYY-MM-DDTHH-MM-SS-XXX.png'
// Extract J2000 time from file names
// Requires files to be named as such: 'YYYY-MM-DDTHH-MM-SS-XXX.png'
double extractTriggerTimeFromFileName(const std::string& filePath) {
// Extract the filename from the path (without extension)
std::string timeString = std::filesystem::path(filePath).stem().string();