mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-11 20:40:29 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix pr comments

Browse Source
This commit is contained in:
Andreas Engberg
2026-03-16 10:54:08 +01:00
parent 3e12163f31
commit 87405f33ed
12 changed files with 53 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
data/assets/scene/solarsystem/heliosphere/solarbrowsing/sdoimagery.asset
View File

@@ -53,7 +53,8 @@ local SolarImagery = {
(SDO). Images from multiple instruments can be browsed over time and are projected
onto a plane positioned relative to the Sun. Instrument-specific color mappings help
highlight different solar phenomena such as active regions, flares, and coronal
structures.]]
structures.]],
Focusable = false
}
}

6
data/assets/scene/solarsystem/heliosphere/solarbrowsing/solarprojection.asset
View File

@@ -17,8 +17,8 @@ local SolarImageryProjection = {
GUI = {
Name = "Sun Projection",
Path = "/Solar System/Sun/Solar Imagery",
Description = [[Projects solar imagery from spacecraft observatories such as SDO and
STEREO onto the surface of the Sun. Images are mapped from their observing
Description = [[Projects solar imagery from the spacecraft observatories SDO and
STEREO-A onto the surface of the Sun. Images are mapped from their observing
spacecraft perspectives, allowing solar features captured by different instruments
and viewpoints to be visualized directly on the solar sphere.]]
}
@@ -37,7 +37,7 @@ end)
asset.meta = {
Name = "Solar Imagery Projection",
Description = [[Projects solar imagery from spacecraft observatories such as SDO and
Description = [[Projects solar imagery from the spacecraft observatories SDO and
STEREO-A onto the surface of the Sun, mapping images from their observing viewpoints
onto the solar sphere.]],
Author = "OpenSpace Team",

5
data/assets/scene/solarsystem/heliosphere/solarbrowsing/stereoimagery.asset
View File

@@ -44,10 +44,11 @@ local SolarImagery = {
Name = "STEREO A Imagery",
Path = "/Solar System/Sun/Solar Imagery",
Description = [[Time-resolved solar imagery from NASA's Solar TErrestrial RElations
Obervatory (STEREO-A). Images from multiple instruments can be browsed over time and
Observatory (STEREO-A). Images from multiple instruments can be browsed over time and
are projected onto a plane positioned relative to the Sun. Instrument-specific color
mappings help highlight different solar phenomena such as active regions, flares,
and coronal structures.]]
and coronal structures.]],
Focusable = false
}
}

6
data/assets/scene/solarsystem/missions/sdo/sdo.asset
View File

@@ -32,7 +32,7 @@ local SdoPosition = {
GUI = {
Name = "SDO Position",
Path = "/Solar System/Missions/SDO",
Description = "The position of the SDO spacecraft",
Description = "The position of the SDO spacecraft.",
Hidden = true,
Focusable = false
}
@@ -66,7 +66,7 @@ local Sdo = {
GUI = {
Name = "SDO",
Path = "/Solar System/Missions/SDO",
Description = "The SDO (Solar Dynamics Observatory) spacecraft"
Description = "The SDO (Solar Dynamics Observatory) spacecraft."
}
}
@@ -94,7 +94,7 @@ local SdoTrail = {
GUI = {
Name = "SDO Trail",
Path = "/Solar System/Missions/SDO",
Description = "The trajectory of the SDO spacecraft"
Description = "The trajectory of the SDO spacecraft."
}
}

6
data/assets/scene/solarsystem/missions/soho/soho.asset
View File

@@ -28,7 +28,7 @@ local SohoPosition = {
GUI = {
Name = "SOHO Position",
Path = "/Solar System/Missions/SOHO",
Description = "The position of the SOHO spacecraft",
Description = "The position of the SOHO spacecraft.",
Hidden = true,
Focusable = false
}
@@ -64,7 +64,7 @@ local Soho = {
GUI = {
Name = "SOHO",
Path = "/Solar System/Missions/SOHO",
Description = "The SOHO (Solar and Heliospheric Observatory) spacecraft"
Description = "The SOHO (Solar and Heliospheric Observatory) spacecraft."
}
}
@@ -91,7 +91,7 @@ local SohoTrail = {
GUI = {
Name = "SOHO Trail",
Path = "/Solar System/Missions/SOHO",
Description = "The trajectory of the SOHO spacecraft"
Description = "The trajectory of the SOHO spacecraft."
}
}

6
data/assets/scene/solarsystem/missions/solarorbiter/solarorbiter.asset
View File

@@ -28,7 +28,7 @@ local SolarOrbiterPosition = {
GUI = {
Name = "Solar Orbiter Position",
Path = "/Solar System/Missions/Solar Orbiter",
Description = "The position of the Solar Orbiter spacecraft",
Description = "The position of the Solar Orbiter spacecraft.",
Hidden = true,
Focusable = false
}
@@ -61,7 +61,7 @@ local SolarOrbiter = {
GUI = {
Name = "Solar Orbiter",
Path = "/Solar System/Missions/Solar Orbiter",
Description = "The Solar Orbiter spacecraft"
Description = "The Solar Orbiter spacecraft."
}
}
@@ -88,7 +88,7 @@ local SolarOrbiterTrail = {
GUI = {
Name = "Solar Orbiter Trail",
Path = "/Solar System/Missions/Solar Orbiter",
Description = "The trajectory of the Solar Orbiter spacecraft"
Description = "The trajectory of the Solar Orbiter spacecraft."
}
}

12
data/assets/scene/solarsystem/missions/stereo/stereo_a.asset
View File

@@ -29,7 +29,7 @@ local StereoPosition = {
GUI = {
Name = "STEREO A Position",
Path = "/Solar System/Missions/STEREO A",
Description = "The position of the STEREO-A spacecraft",
Description = "The position of the STEREO-A spacecraft.",
Hidden = true,
Focusable = false
}
@@ -59,12 +59,12 @@ local StereoA = {
RotationVector = { 0.0, 260.0, 0.0 },
LightSources = { sunTransforms.LightSource },
AmbientIntensity = 0.2,
SpecularIntensity = 0.0,
SpecularIntensity = 0.0
},
GUI = {
Name = "STEREO A",
Path = "/Solar System/Missions/STEREO A",
Description = "The STEREO-A (Solar TErrestrial RElations Obervatory) spacecraft"
Description = "The STEREO-A (Solar TErrestrial RElations Observatory) spacecraft."
}
}
@@ -86,12 +86,12 @@ local StereoTrail = {
Color = { 0.33, 0.75, 0.52 },
Period = 346.0,
Resolution = 5000,
EnableFade = true,
EnableFade = true
},
GUI = {
Name = "STEREO A Trail",
Path = "/Solar System/Missions/STEREO A",
Description = "The trajectory of the STEREO-A spacecraft"
Description = "The trajectory of the STEREO-A spacecraft."
}
}
@@ -118,7 +118,7 @@ asset.export("MissionEnd", MissionEnd)
asset.meta = {
Name = "STEREO",
Description = [[This asset adds the STEREO-A (Solar TErrestrial RElations Obervatory)
Description = [[This asset adds the STEREO-A (Solar TErrestrial RElations Observatory)
model, including the trajectory for the entire duration of the STEREO mission.]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",

4
data/tasks/solarbrowsing/download_from_helioviewer.task
View File

@@ -48,7 +48,7 @@ return {{
ColorMap = savePathBase.. "AIA-171.txt",
StartTime = "2024-05-06T00:00:00.000Z",
EndTime = "2024-05-14T00:00:00.000Z",
TimeStep = 60*60, -- Download an image every hour
TimeStep = 60 * 60, -- Download an image every hour
OutputFolder = "${SYNC_DYNAMIC}/solarbrowsing/sdo/aia-171"
},
{
@@ -59,6 +59,6 @@ return {{
ColorMap = savePathBase .. "EUVI-A-171.txt",
StartTime = "2024-05-06T00:00:00.000Z",
EndTime = "2024-05-14T00:00:00.000Z",
TimeStep = 60*60, -- Download an image every hour
TimeStep = 60 * 60, -- Download an image every hour
OutputFolder = "${SYNC_DYNAMIC}/solarbrowsing/stereo/euvi-a-171"
}}

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

@@ -51,7 +51,7 @@
namespace {
using namespace openspace;
constexpr unsigned int DefaultTextureSize = 32;
constexpr size_t DefaultTextureSize = 32;
enum FaceMode {
FrontOnly = 0,
@@ -207,7 +207,7 @@ namespace {
namespace openspace {
openspace::Documentation RenderableSolarImagery::Documentation() {
return codegen::doc<Parameters>("solarbrowsing_renderablesolarimegary");
return codegen::doc<Parameters>("solarbrowsing_renderable_solarimegary");
}
RenderableSolarImagery::RenderableSolarImagery(const ghoul::Dictionary& dictionary)
@@ -240,9 +240,9 @@ RenderableSolarImagery::RenderableSolarImagery(const ghoul::Dictionary& dictiona
});
addProperty(_enableFrustum);
_faceMode.addOption(FaceMode::FrontOnly, "Front only");
_faceMode.addOption(FaceMode::SolidBack, "Solid back");
_faceMode.addOption(FaceMode::DoubleSided, "Double sided");
_faceMode.addOption(FaceMode::FrontOnly, "Front Only");
_faceMode.addOption(FaceMode::SolidBack, "Solid Back");
_faceMode.addOption(FaceMode::DoubleSided, "Double Sided");
_faceMode = FaceMode::SolidBack;
if (p.faceMode.has_value()) {
@@ -642,7 +642,8 @@ void RenderableSolarImagery::updateImageryTexture() {
// Create some dummy data that will be uploaded to the GPU to avoid UB
std::vector<unsigned char> buffer;
buffer.resize(static_cast<size_t>(DefaultTextureSize) * DefaultTextureSize *
buffer.resize(
DefaultTextureSize * DefaultTextureSize *
sizeof(ImagePrecision)
);
_imageryTexture->resize(

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

@@ -49,9 +49,23 @@ namespace {
// This number MUST match the constant specified in the shader
constexpr int MaxSpacecraftObservatories = 7;
// A RenderableSolarImageryProjection projects solar observations from spacecraft
// instruments onto the surface of the Sun. The renderable uses one or more
// RenderableSolarImagery nodes as input and maps their imagery onto a solar sphere
// from the observing spacecraft's perspective.
//
// Each dependent RenderableSolarImagery provides the image texture, spacecraft
// position, and viewing geometry needed for the projection. This allows imagery
// captured from different spacecraft and instruments (e.g., SDO or STEREO) to be
// visualized directly on the Sun simultaneously.
//
// Multiple observatories can be projected at once, allowing solar features
// observed from different viewpoints to be compared on the solar surface.
struct [[codegen::Dictionary(RenderableSolarImageryProjection)]] Parameters {
// List of spacecraft identifiers that will be projected on the sphere (Sun)
// surface.
// List of scene graph node identifiers that reference
// [RenderableSolarImagery](solarbrowsing_renderable_solarimegary) nodes. The
// imagery from these nodes is projected onto the solar surface from the
// perspective of the observing spacecraft.
std::vector<std::string> dependentNodes;
};
} // namespace
@@ -60,7 +74,7 @@ namespace {
namespace openspace {
openspace::Documentation RenderableSolarImageryProjection::Documentation() {
return codegen::doc<Parameters>("solarbrowsing_renderablesolarimageryprojection");
return codegen::doc<Parameters>("solarbrowsing_renderable_solarimageryprojection");
}
RenderableSolarImageryProjection::RenderableSolarImageryProjection(
@@ -90,6 +104,8 @@ RenderableSolarImageryProjection::RenderableSolarImageryProjection(
}
_solarImageryDependencyNames.push_back(nodeName);
}
setBoundingSphere(distanceconstants::SolarRadius);
}
void RenderableSolarImageryProjection::initializeGL() {

1
modules/solarbrowsing/rendering/renderablesolarimageryprojection.h
View File

@@ -36,7 +36,6 @@ namespace ghoul::opengl { class ProgramObject; }
namespace openspace {
class SceneGraphNode;
class RenderableSolarImageryProjection : public Renderable {

4
modules/solarbrowsing/tasks/helioviewerdownloadtask.cpp
View File

@@ -126,7 +126,7 @@ void HelioviewerDownloadTask::perform(const Task::ProgressCallback& progressCall
// @TODO (anden88 2026-03-05): Due to how the progress bar uses the '\r' carriage
// return, we do a new line before printing to the log so that we get slightly more
// readable and nicer output, this should be removed when progress bar is fixed
// readable and nicer output. This should be removed when the progress bar is fixed
LDEBUG("\nFetching Helioviewer JPX data");
LINFO(std::format("Requesting {}", jpxRequest));
@@ -205,7 +205,7 @@ void HelioviewerDownloadTask::perform(const Task::ProgressCallback& progressCall
// @TODO (anden88 2026-03-05): Due to how the progress bar uses the '\r' carriage
// return, we do a new line before printing to the log so that we get slightly more
// readable and nicer output, this should be removed when progress bar is fixed
// readable and nicer output. This should be removed when the progress bar is fixed
LDEBUG("\nDownloading image data from Helioviewer");
std::for_each(
std::execution::par,