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

Fix loading multiple instruments + cleanup

Browse Source
This commit is contained in:
Andreas Engberg
2026-02-04 12:02:23 +01:00
parent 80dba5ccf3
commit 5113894ca4
6 changed files with 182 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
modules/solarbrowsing/rendering/renderablesolarimagery.cpp
View File

@@ -95,9 +95,9 @@ namespace {
};
struct [[codegen::Dictionary(RenderableSolarImagery)]] Parameters {
std::string rootPath;
std::filesystem::path rootDir [[codegen::directory()]];
std::string transferfunctionPath;
std::filesystem::path transferfunctionDir [[codegen::directory()]];
std::optional<std::string> startInstrument;
@@ -130,19 +130,16 @@ RenderableSolarImagery::RenderableSolarImagery(const ghoul::Dictionary& dictiona
{
const Parameters p = codegen::bake<Parameters>(dictionary);
std::string rootPath = p.rootPath;
SolarBrowsingModule* solarbrowsingModule =
global::moduleEngine->module<SolarBrowsingModule>();
SpacecraftImageryManager& spacecraftImageryManager =
solarbrowsingModule->spacecraftImageryManager();
std::string transferfunctionPath = p.transferfunctionPath;
spacecraftImageryManager.loadTransferFunctions(transferfunctionPath, _tfMap);
spacecraftImageryManager.loadTransferFunctions(p.transferfunctionDir, _tfMap);
spacecraftImageryManager.loadImageMetadata(rootPath, _imageMetadataMap);
spacecraftImageryManager.loadImageMetadata(p.rootDir, _imageMetadataMap);
// Add GUI names
unsigned int guiNameCount = 0;
@@ -287,7 +284,7 @@ void RenderableSolarImagery::updateTextureGPU(bool asyncUpload, bool resChanged)
_currentImage = &(keyframe->data);
_decodeBuffer.resize(_imageSize * _imageSize * sizeof(IMG_PRECISION));
decode(_decodeBuffer.data(), keyframe->data.filename);
decode(_decodeBuffer.data(), keyframe->data.filePath.string());
}
else {
if (_currentImage == nullptr) {

4
modules/solarbrowsing/rendering/renderablesolarimageryprojection.cpp
View File

@@ -121,13 +121,13 @@ bool RenderableSolarImageryProjection::isReady() const {
return _shader != nullptr;
}
void RenderableSolarImageryProjection::update(const UpdateData& data) {
void RenderableSolarImageryProjection::update(const UpdateData&) {
if (_shader->isDirty()) {
_shader->rebuildFromFile();
}
}
void RenderableSolarImageryProjection::render(const RenderData& data, RendererTasks& rendererTask) {
void RenderableSolarImageryProjection::render(const RenderData& data, RendererTasks&) {
glm::dmat4 modelTransform = calcModelTransform(data);
glm::dmat4 modelViewTransform = data.camera.combinedViewMatrix() * modelTransform;