Merge remote-tracking branch 'origin/master' into feature/volume-creation-task

This commit is contained in:
lundkvistarn
2025-06-12 14:31:29 -04:00
567 changed files with 8155 additions and 3629 deletions

View File

@@ -77,7 +77,7 @@ endif ()
#####
if (APPLE)
set(MACOSX_BUNDLE_ICON_FILE openspace.icns)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version" FORCE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "13.3" CACHE STRING "Minimum OS X deployment version" FORCE)
set(CMAKE_XCODE_ATTRIBUTE_OTHER_CODE_SIGN_FLAGS "--deep" CACHE STRING "Other Code Signing Flags" FORCE)
endif ()

View File

@@ -503,7 +503,7 @@ void LauncherWindow::editConfiguration() {
assert(cluster.generator);
std::string err = sgct::validateConfigAgainstSchema(
path,
std::filesystem::path(path),
_configPath / "schema/sgct.schema.json"
);
if (!err.empty()) {

View File

@@ -298,7 +298,9 @@ QVariant AssetTreeModel::data(const QModelIndex& index, int role) const {
}
if (role == Qt::ForegroundRole) {
return item->doesExistInFilesystem() ? QColor(Qt::black) : QColor(Qt::red);
// Returning an empty variant will cause Qt to use the theme-appropriate color for
// the item
return item->doesExistInFilesystem() ? QVariant() : QColor(Qt::red);
}
else if (role == Qt::DisplayRole) {
return item->data(index.column());

View File

@@ -68,6 +68,19 @@ namespace {
return false;
}
bool hasMultipleGuiWindows(const sgct::config::Cluster& cluster) {
bool foundGui = false;
for (const sgct::config::Window& window : cluster.nodes.front().windows) {
if (window.draw2D) {
if (foundGui) {
return true;
}
foundGui = true;
}
}
return false;
}
std::vector<QRect> createMonitorInfoSet() {
std::vector<QRect> monitorSizes;
for (QScreen* screen : qApp->screens()) {
@@ -317,6 +330,21 @@ void SgctEdit::saveCluster() {
}
}
if (hasMultipleGuiWindows(_cluster)) {
const int ret = QMessageBox::warning(
this,
"Multiple Windows with GUI Rendering",
"Multiple windows have 2D/GUI rendering enabled. Note that the interactable "
"user interface will only be shows on the first window with such a setting "
"if you proceed. Dashboards and other 2D elements will be shown on all "
"windows.\n\nAre you sure you want to continue?",
QMessageBox::StandardButtons(QMessageBox::Yes | QMessageBox::No)
);
if (ret == QMessageBox::No) {
return;
}
}
if (_configurationFilename.empty()) {
const QString fileName = QFileDialog::getSaveFileName(
this,

View File

@@ -56,7 +56,6 @@
#include <sgct/projection/nonlinearprojection.h>
#include <sgct/user.h>
#include <sgct/window.h>
#include <date/date.h>
#include <stb_image.h>
#include <tracy/Tracy.hpp>
#include <iostream>
@@ -747,6 +746,16 @@ void setSgctDelegateFunctions() {
return currentWindow->isWindowResized();
};
sgctDelegate.anyWindowHasResized = []() {
ZoneScoped;
for (const std::unique_ptr<Window>& window : Engine::instance().windows()) {
if (window->isWindowResized()) {
return true;
}
}
return false;
};
sgctDelegate.averageDeltaTime = []() {
ZoneScoped;
@@ -1480,7 +1489,10 @@ int main(int argc, char* argv[]) {
config = launcher.selectedWindowConfig();
if (config.find(labelFromCfgFile) != std::string::npos) {
if (config.find("sgct.config") == std::string::npos) {
config = config.substr(0, config.length() - labelFromCfgFile.length());
config = config.substr(
0,
config.length() - labelFromCfgFile.length()
);
}
else {
config = windowConfiguration;
@@ -1501,7 +1513,6 @@ int main(int argc, char* argv[]) {
{
openspace::Settings settings = loadSettings();
settings.hasStartedBefore = true;
const std::filesystem::path profile = global::configuration->profile;
@@ -1539,15 +1550,6 @@ int main(int argc, char* argv[]) {
settings.configuration =
isGeneratedWindowConfig ? "" : global::configuration->windowConfiguration;
const date::year_month_day now = date::year_month_day(
floor<date::days>(std::chrono::system_clock::now())
);
settings.lastStartedDate = std::format(
"{}-{:0>2}-{:0>2}",
static_cast<int>(now.year()),
static_cast<unsigned>(now.month()),
static_cast<unsigned>(now.day())
);
saveSettings(settings, findSettings());
}

View File

@@ -47,7 +47,20 @@ local ToggleRollFriction = {
local ToggleMainGui = {
Identifier = "os.ToggleMainGui",
Name = "Toggle main GUI",
Command = [[openspace.invertBooleanProperty("Modules.CefWebGui.Visible")]],
Command = [[
openspace.invertBooleanProperty("Modules.CefWebGui.Visible")
if not openspace.propertyValue("Modules.CefWebGui.Visible") then
local action_id = "os.ToggleMainGui"
local keys = openspace.keyBindingsForAction(action_id)
if #keys > 0 then
local key = keys[1]
openspace.printInfo(
"Hiding the user interface. You can restore it with the '" .. key .. "' key"
)
end
end
]],
Documentation = "Toggles the main GUI",
GuiPath = "/System/GUI",
IsLocal = true

View File

@@ -46,7 +46,7 @@ local HideAllMarkings = {
openspace.fadeOut("{nightsky_marking}")
openspace.fadeOut("{du_grid}")
openspace.fadeOut("{du_grid_labels}")
openspace.fadeOut("{ImageConstellation}")
openspace.fadeOut("{image_constellation}")
]],
Documentation = "Hides all markings in the night sky",
GuiPath = "/Night Sky/Markings",

View File

@@ -3,9 +3,9 @@ asset.export("webguiDevelopmentMode", false)
-- To make changes to the webgui:
-- 1) Set the above `webguiDevelopmentMode` to true
-- 2) Clone the repository: https://github.com/OpenSpace/OpenSpace-WebGuiFrontend
-- 2) Clone the repository: https://github.com/OpenSpace/OpenSpace-WebGui
-- 3) Install nodejs (including npm)
-- 4) Within the repository, run `npm install` and `npm start`
-- 4) Within the repository, run `npm install` and `npm run dev`
asset.meta = {

View File

@@ -42,6 +42,7 @@ local Object = {
GUI = {
Name = "2dF Galaxies",
Path = "/Universe/Deep Sky Surveys",
Focusable = false,
Description = [[The Two-degree Field (2dF) Survey was a project designed to map
portions of the extragalactic universe. The 2dF survey has three main components:
the North Galactic Pole strip, the South Galactic Pole strip, and the random fields

View File

@@ -43,6 +43,7 @@ local Object = {
GUI = {
Name = "2MASS Galaxies",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[The Two Micron All-Sky Survey (2MASS) is an infrared survey of the
sky published in 2003. Taken from two telescopes in Arizona and Chile, it offers an
all-sky view of galaxies beyond the Milky Way. Because it is infrared, the light

View File

@@ -43,6 +43,7 @@ local Object = {
GUI = {
Name = "6dF Galaxies",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[The Six-degree Field (6dF) Galaxy Survey mapped nearly half the sky
from the Anglo-Australian Observatory. Because it's a southern hemisphere survey,
there is no coverage in these data for the northern hemisphere's sky. As with all

View File

@@ -51,6 +51,7 @@ local Object = {
GUI = {
Name = "Abell Galaxy Clusters",
Path = "/Universe/Deep Sky Surveys",
Focusable = false,
Description = [[The Abell catalog includes all the nearby, and not so nearby, galaxy
clusters. The northern hemisphere survey, published in 1958, was compiled by George
Abell from the Palomar Sky Survey plates. A subsequent southern hemisphere catalog

View File

@@ -30,6 +30,7 @@ local Object = {
GUI = {
Name = "Hydrogen-alpha All-sky",
Path = "/Milky Way/All Sky Images",
Focusable = false,
Description = [[Hydrogen-alpha is a term that describes light from the ground state of
the hydrogen atom. When an electron in an atom moves from one energy level to a
higher one, we say the atom is excited. When the electron moves back down to the

View File

@@ -31,6 +31,7 @@ local Object = {
GUI = {
Name = "Visible All-sky",
Path = "/Milky Way/All Sky Images",
Focusable = false,
Description = [[An all-sky image of the night sky as our eye sees it (in the visible
spectrum), with the stars removed. You will see the brightest part of the Galaxy if
you look toward Galactic center toward the constellations Scorpius and Sagittarius.

View File

@@ -25,6 +25,7 @@ local Object = {
GUI = {
Name = "Stars Labels - Alternate",
Path = "/Milky Way/Stars",
Focusable = false,
Description = [[Alternate star labels for the stars. Priority goes to Bayer IDs
(Greek designations, like Alpha Orionis), then to Flamsteed numbers (like 1
Orionis).]]

View File

@@ -48,6 +48,7 @@ local Object = {
GUI = {
Name = "Brown Dwarfs",
Path = "/Milky Way/Substellar Objects",
Focusable = false,
Description = [[For decades it was believed that M stars were the coolest stars in
the Galaxy. Some M stars, called red dwarfs, make up 70% of the stars in the
Galaxy. However, a new class of objects, even cooler than M stars, was recently

View File

@@ -39,6 +39,7 @@ local Object = {
GUI = {
Name = "Constellation Boundaries",
Path = "/Milky Way/Constellations",
Focusable = false,
Description = [[As a continent is divided into countries, astronomers divide the sky
into 88 regions called constellations. Every object falls into one of these 88
regions. The boundaries of these regions are shown in this asset. Use these in

View File

@@ -56,6 +56,7 @@ local Constellations = {
GUI = {
Name = "Constellation Lines",
Path = "/Milky Way/Constellations",
Focusable = false,
Description = [[Lines connecting the stars that make up the constellation figures.
We represent the constellations by connecting the main stars that make up the
constellation "stick figures," as seen from Earth. Colors: most constellations

View File

@@ -15,6 +15,12 @@ local speck = asset.resource({
local DeepSkyObjects = {
Identifier = "DeepSkyObjects",
Transform = {
Rotation = {
Type = "StaticRotation",
Rotation = { 0, 0, math.pi }
}
},
Renderable = {
Type = "RenderablePointCloud",
Enabled = false,
@@ -41,21 +47,22 @@ local DeepSkyObjects = {
EnableMaxSizeControl = true
}
},
Transform = {
Rotation = {
Type = "StaticRotation",
Rotation = { 0, 0, math.pi }
}
},
GUI = {
Name = "Deep Sky Objects Points",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = "Point cloud and labels for Deep Sky Objects"
}
}
local DeepSkyObjectsImages = {
Identifier = "DeepSkyObjectsImages",
Transform = {
Rotation = {
Type = "StaticRotation",
Rotation = { math.pi, math.pi, 0 }
}
},
Renderable = {
Type = "RenderablePointCloud",
Enabled = false,
@@ -79,15 +86,10 @@ local DeepSkyObjectsImages = {
ScaleExponent = 0.0
}
},
Transform = {
Rotation = {
Type = "StaticRotation",
Rotation = { math.pi, math.pi, 0 }
}
},
GUI = {
Name = "Deep Sky Objects Images",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[Census: 63 images and labels. DU Version 1.3. <br> These data are
2-D images of Messier objects placed in 3-D space. Not only do we place these
images at the proper location and give them the correct orientation, we also

View File

@@ -40,6 +40,7 @@ local Object = {
GUI = {
Name = "Exoplanet Systems",
Path = "/Milky Way/Exoplanets",
Focusable = false,
Description = [[Extrasolar planets, or exoplanets, are a relatively new phenomenon in
astronomy - no observational evidence was available until 1995. To the eye,
exoplanets are lost in the glare of their host star. Unconventional techniques are

View File

@@ -42,6 +42,7 @@ local Object = {
GUI = {
Name = "Exoplanet Candidates",
Path = "/Milky Way/Exoplanets",
Focusable = false,
Description = [[The exoplanet candidate stars are likely hosts for exoplanets. These
are stars plucked from NASA's Kepler and TESS space telescopes. Further observations
are needed to confirm a planet's existence. Rather than represent them

View File

@@ -31,6 +31,7 @@ local Object = {
GUI = {
Name = "Galaxy Cluster Labels",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[The galaxy clusters dataset is a series of labels that mark where the
large clusters of galaxies are in the nearby universe. These labels must be used in
conjunction with the Tully galaxy group. Census: 15 galaxy cluster labels.]]

View File

@@ -31,6 +31,7 @@ local Object = {
GUI = {
Name = "Galaxy Group Labels",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[The Galaxy Groups data are a set of labels that mark the nearby
galaxy groups. The Milky Way is in the Local Group, and we are surrounded by
many other groups delineated by these labels. Census: 62 galaxy group labels.]]

View File

@@ -41,6 +41,7 @@ local Object = {
GUI = {
Name = "Globular Clusters",
Path = "/Milky Way/Star Clusters",
Focusable = false,
Description = [[Globular star clusters are gravitationally bound groups of 100,000
to 1 million stars. They are compact, spherical "balls" of stars with very high
stellar densities. These clusters are typically 30 to 100 light years in diameter.

View File

@@ -68,6 +68,7 @@ local RadioSphere = {
GUI = {
Name = "Radio Sphere",
Path = "/Milky Way/Grids",
Focusable = false,
Description = [[The radio sphere describes the theoretical extent of Earth's radio
signals in space. Before television carrier waves, early-warning radar first used
in World War II, and the detonation of atomic weapons, Earth was radio-quiet to the
@@ -110,6 +111,7 @@ local EquatorialSphere = {
GUI = {
Name = "Equatorial Coordinates",
Path = "/Night Sky/Coordinate Systems/Equatorial",
Focusable = false,
Description = [[An 80-light-year sphere representing equatorial coordinates (right
ascension and declination).]]
}
@@ -138,6 +140,7 @@ local EquatorialSphereLabels = {
GUI = {
Name = "Equatorial Coordinates Labels",
Path = "/Night Sky/Coordinate Systems/Equatorial",
Focusable = false,
Description = [[Labels on a sphere representing right ascension in hours and
declination in degrees.]]
}
@@ -167,6 +170,7 @@ local EclipticSphere = {
GUI = {
Name = "Ecliptic Coordinates",
Path = "/Night Sky/Coordinate Systems/Ecliptic",
Focusable = false,
Description = [[A 100-light-year sphere representing ecliptic coordinates (ecliptic
longitude and latitude).]]
}
@@ -195,6 +199,7 @@ local EclipticSphereLabels = {
GUI = {
Name = "Ecliptic Coordinates Labels",
Path = "/Night Sky/Coordinate Systems/Ecliptic",
Focusable = false,
Description = [[Labels on a sphere representing ecliptic longitude and latitude in
degrees.]]
}
@@ -220,6 +225,7 @@ local GalacticSphere = {
GUI = {
Name = "Galactic Coordinates",
Path = "/Night Sky/Coordinate Systems/Galactic",
Focusable = false,
Description = [[A 1000-light-year sphere representing galactic coordinates (galactic
longitude and latitude).]]
}
@@ -246,6 +252,7 @@ local GalacticSphereLabels = {
GUI = {
Name = "Galactic Coordinates Labels",
Path = "/Night Sky/Coordinate Systems/Galactic",
Focusable = false,
Description = [[Labels on a sphere representing galactic longitude and latitude in
degrees.]]
}
@@ -280,7 +287,9 @@ local Plane1lh = {
GUI = {
Name = "1-light-hour Grid",
Path = "/Solar System/Grids",
Description = [[A 1-light-hour Cartesian grid aligned on the plane of the Solar System.]],
Focusable = false,
Description = [[A 1-light-hour Cartesian grid aligned on the plane of the Solar
System.]],
OrderingNumber = LightHour
}
}
@@ -314,7 +323,9 @@ local Plane1ld = {
GUI = {
Name = "1-light-day Grid",
Path = "/Solar System/Grids",
Description = [[A 1-light-day Cartesian grid aligned on the plane of the Solar System.]],
Focusable = false,
Description = [[A 1-light-day Cartesian grid aligned on the plane of the Solar
System.]],
OrderingNumber = LightDay
}
}
@@ -348,7 +359,9 @@ local Plane1lm = {
GUI = {
Name = "1-light-month Grid",
Path = "/Solar System/Grids",
Description = [[A 1-light-month Cartesian grid aligned on the plane of the Solar System.]],
Focusable = false,
Description = [[A 1-light-month Cartesian grid aligned on the plane of the Solar
System.]],
OrderingNumber = LightMonth
}
}
@@ -382,7 +395,9 @@ local Plane1ly = {
GUI = {
Name = "1-light-year Grid",
Path = "/Solar System/Grids",
Description = [[A 1-light-year Cartesian grid aligned on the plane of the Solar System.]],
Focusable = false,
Description = [[A 1-light-year Cartesian grid aligned on the plane of the Solar
System.]],
OrderingNumber = LightYear
}
}
@@ -416,7 +431,9 @@ local Plane10ly = {
GUI = {
Name = "10-light-year Grid",
Path = "/Milky Way/Grids",
Description = [[A 10-light-year Cartesian grid aligned on the plane of the Solar System.]],
Focusable = false,
Description = [[A 10-light-year Cartesian grid aligned on the plane of the Solar
System.]],
OrderingNumber = 10 * LightYear
}
}
@@ -450,7 +467,9 @@ local Plane100ly = {
GUI = {
Name = "100-light-year Grid",
Path = "/Milky Way/Grids",
Description = [[A 100-light-year Cartesian grid aligned on the plane of the Solar System.]],
Focusable = false,
Description = [[A 100-light-year Cartesian grid aligned on the plane of the Solar
System.]],
OrderingNumber = 100 * LightYear
}
}
@@ -484,7 +503,9 @@ local Plane1kly = {
GUI = {
Name = "1,000-light-year Grid",
Path = "/Milky Way/Grids",
Description = [[A 1,000-light-year Cartesian grid aligned on the plane of the Solar System.]],
Focusable = false,
Description = [[A 1,000-light-year Cartesian grid aligned on the plane of the Solar
System.]],
OrderingNumber = 1000 * LightYear
}
}
@@ -518,7 +539,9 @@ local Plane10kly = {
GUI = {
Name = "10,000-light-year Grid",
Path = "/Milky Way/Grids",
Description = [[A 10,000-light-year Cartesian grid aligned on the plane of the Solar System.]],
Focusable = false,
Description = [[A 10,000-light-year Cartesian grid aligned on the plane of the Solar
System.]],
OrderingNumber = 10000 * LightYear
}
}
@@ -547,7 +570,9 @@ local Plane100kly = {
GUI = {
Name = "100,000-light-year Grid",
Path = "/Universe/Grids",
Description = [[A 100,000-light-year Cartesian grid aligned on the plane of the Milky Way.]],
Focusable = false,
Description = [[A 100,000-light-year Cartesian grid aligned on the plane of the Milky
Way.]],
OrderingNumber = 100000 * LightYear
}
}
@@ -576,7 +601,9 @@ local Plane1Mly = {
GUI = {
Name = "1-million-light-year Grid",
Path = "/Universe/Grids",
Description = [[A 1-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
Focusable = false,
Description = [[A 1-million-light-year Cartesian grid aligned on the plane of the
Milky Way.]],
OrderingNumber = 1E6 * LightYear
}
}
@@ -605,7 +632,9 @@ local Plane10Mly = {
GUI = {
Name = "10-million-light-year Grid",
Path = "/Universe/Grids",
Description = [[A 10-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
Focusable = false,
Description = [[A 10-million-light-year Cartesian grid aligned on the plane of the
Milky Way.]],
OrderingNumber = 10E6 * LightYear
}
}
@@ -634,7 +663,9 @@ local Plane100Mly = {
GUI = {
Name = "100-million-light-year Grid",
Path = "/Universe/Grids",
Description = [[A 100-million-light-year Cartesian grid aligned on the plane of the Milky Way.]],
Focusable = false,
Description = [[A 100-million-light-year Cartesian grid aligned on the plane of the
Milky Way.]],
OrderingNumber = 100E6 * LightYear
}
}
@@ -663,7 +694,9 @@ local Plane20Gly = {
GUI = {
Name = "20-billion-light-year Grid",
Path = "/Universe/Grids",
Description = [[A 20-billion-light-year Cartesian grid aligned on the plane of the Milky Way.]],
Focusable = false,
Description = [[A 20-billion-light-year Cartesian grid aligned on the plane of the
Milky Way.]],
OrderingNumber = 20E9 * LightYear
}
}

View File

@@ -41,6 +41,7 @@ local Object = {
GUI = {
Name = "HII Regions",
Path = "/Milky Way/Nebulae",
Focusable = false,
Description = [[HII (pronounced "H-two") regions are stellar nurseries for newborn
stars. Stars are born from condensing clouds of hydrogen gas. As these clouds
condense, the densities become high enough to form stars. An HII region is the

View File

@@ -43,6 +43,7 @@ local Object = {
GUI = {
Name = "Hubble Deep Field",
Path = "/Universe/Galaxies",
Focusable = false,
Description = [[
Hubble Ultra Deep Field galaxy survey <br><br>
Data Reference: Hubble Ultra Deep Field 2012 program (Ellis+, Koekemoer+, 2013)

View File

@@ -47,6 +47,7 @@ local Object = {
GUI = {
Name = "Local Group",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[A group of galaxies is typically composed of a small number of large
galaxies that are surrounded by a large number of small galaxies. The Milky Way
belongs to the Local Group, and is one of roughly 100 galaxies in that group. The

View File

@@ -40,6 +40,7 @@ local Object = {
GUI = {
Name = "Milky Way Image",
Path = "/Milky Way/Galaxy",
Focusable = false,
Description = [[The exterior view of the Milky Way is represented here by a
two-dimensional image. The image is that of NGC 1232, a galaxy thought to resemble
our Milky Way. The image has been properly sized and approximately oriented to

View File

@@ -41,6 +41,7 @@ local Object = {
GUI = {
Name = "Milky Way Arm Labels",
Path = "/Milky Way/Galaxy",
Focusable = false,
Description = [[This is an image that contains labels for the Milky Way's spiral
arms. We label them in this manner--"hard-coding" the labels into an image rather
than having native labels--so that they can retain their size, shape, and location

View File

@@ -28,8 +28,9 @@ local Object = {
GUI = {
Name = "Home Label",
Path = "/Universe/Nearby Surveys",
Description = [[Label for the Milky Way titled 'Home', sized for viewing outside
the Milky Way Galaxy.]]
Focusable = false,
Description = [[Label for the Milky Way titled 'Home', sized for viewing outside the
Milky Way Galaxy.]]
}
}

View File

@@ -49,6 +49,7 @@ local Object = {
GUI = {
Name = "OB Associations",
Path = "/Milky Way/Star Clusters",
Focusable = false,
Description = [[Stellar associations are loose agglomerations of stars that form from
the same gas cloud. OB associations typically have on the order of dozens of O and
B stars in them (hotter, massive, younger stars) in addition to cooler stars. Over

View File

@@ -40,6 +40,7 @@ local Object = {
GUI = {
Name = "Oort Sphere",
Path = "/Solar System/Comets/Oort Cloud",
Focusable = false,
Description = [[The Oort cloud is a region of space surrounding the Sun where comets
are believed to originate. It is believed to extend from 20,000-100,000 Astronomical
Units (AU), with its greatest concentration around 50,000 AU (1 AU is the average

View File

@@ -41,12 +41,13 @@ local Object = {
GUI = {
Name = "Open Star Clusters",
Path = "/Milky Way/Star Clusters",
Focusable = false,
Description = [[An open star cluster is a loose assemblage of stars numbering from
hundreds to thousands that are bound by their mutual gravitation. Because these are
young stars, we expect to see them in the star-forming regions of our Galaxy, namely
in the spiral arms. For this reason, open clusters exist, for the most part, in the
plane of the Galaxy and indicate relatively recent star formation. Census: 1,867 star
clusters.]]
plane of the Galaxy and indicate relatively recent star formation. Census: 1,867
star clusters.]]
}
}

View File

@@ -41,6 +41,7 @@ local Object = {
GUI = {
Name = "Planetary Nebulae",
Path = "/Milky Way/Nebulae",
Focusable = false,
Description = [[A planetary nebula is an expanding shell of gas ejected from an
average-sized star late in its life cycle. Appearing like greenish disks to a
telescopic observer, planetary nebulae received their name from their resemblance to

View File

@@ -41,6 +41,7 @@ local Object = {
GUI = {
Name = "Pulsars",
Path = "/Milky Way/Stellar Remnants",
Focusable = false,
Description = [[A pulsar is a spinning neutron star, an ultra-dense stellar remnant
resulting from a supernova-driven collapse of the stellar core. Upon death, stars
leave behind one of three possible remnants: a white dwarf, a neutron star, or a

View File

@@ -53,6 +53,7 @@ local Object = {
GUI = {
Name = "Quasars",
Path = "/Universe/Deep Sky Surveys",
Focusable = false,
Description = [[Quasars are the most distant objects we see. They are extremely
active galaxies that contain supermassive black holes which gobble up material at a
furious rate. As the material falls into the black hole, it forms a disk and emits

View File

@@ -45,6 +45,7 @@ local Object = {
GUI = {
Name = "Sloan Galaxies",
Path = "/Universe/Deep Sky Surveys",
Focusable = false,
Description = [[The Sloan Digital Sky Survey (SDSS) is an ambitious project to image
about 35% of the sky, deep into the universe. The SDSS galaxies form triangular
wedges, revealing those parts of the sky observed by the telescope. If the entire

View File

@@ -31,6 +31,7 @@ local Object = {
GUI = {
Name = "Star Distance Uncertainty",
Path = "/Milky Way/Stars",
Focusable = false,
Description = [[The uncertainty of a star's position is derived from the uncertainty
in its parallax measurement. This results in a range in distance where the star
could exist. Here we draw lines on top of select stars which give us a visual cue

View File

@@ -25,6 +25,7 @@ local Object = {
GUI = {
Name = "Stars Labels",
Path = "/Milky Way/Stars",
Focusable = false,
Description = [[Common name labels for nearby stars in the Milky Way. See 'Stars'
for more information.]]
}

View File

@@ -24,6 +24,7 @@ local SunOrbit = {
GUI = {
Name = "Sun Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
Focusable = false,
Description = [[Projected orbit of the Sun around the Milky Way over the next 1
billion years.]]
}
@@ -42,6 +43,7 @@ local BarnardsOrbit = {
GUI = {
Name = "Barnards Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
Focusable = false,
Description = [[Projected orbit of Barnard's Star around the Milky Way over the next
1 billion years.]]
}
@@ -60,6 +62,7 @@ local KapteynsOrbit = {
GUI = {
Name = "Kapteyns Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
Focusable = false,
Description = [[Projected orbit of Kapteyn's Star around the Milky Way over the next
1 billion years.]]
}
@@ -78,6 +81,7 @@ local Lacaille9352Orbit = {
GUI = {
Name = "Lacaille 9352 Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
Focusable = false,
Description = [[Projected orbit of Lacaille9352 around the Milky Way over the next
1 billion years.]]
}
@@ -96,6 +100,7 @@ local LSR1826Orbit = {
GUI = {
Name = "LSR1826+3014 Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
Focusable = false,
Description = [[Projected orbit of LSR1826+3014 around the Milky Way over the next 1
billion years.]]
}
@@ -114,6 +119,7 @@ local LSRJ0822Orbit = {
GUI = {
Name = "LSRJ0822+1700 Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
Focusable = false,
Description = [[Projected orbit of LSRJ0822+1700 around the Milky Way over the next 1
billion years.]]
}
@@ -132,6 +138,7 @@ local PM_J13420Orbit = {
GUI = {
Name = "PM_J13420-3415 Orbit",
Path = "/Milky Way/Stars/Stars Orbits",
Focusable = false,
Description = [[Projected orbit of PM_J13420-3415 around the Milky Way over the next
1 billion years.]]
}

View File

@@ -62,6 +62,7 @@ local Stars = {
GUI = {
Name = "Stars",
Path = "/Milky Way/Stars",
Focusable = false,
Description = [[These are the nearby stars that surround the Sun and are close enough
to get accurate distances. These include all the stars we see with the unaided eye
and many stars dimmer than that. Over the entire night sky, all year round, and in
@@ -107,6 +108,7 @@ local SunStar = {
GUI = {
Name = "Sun",
Path = "/Milky Way/Stars",
Focusable = false,
Description = [[Individual star to represent the Sun when outside of the Solar
System.]]
}

View File

@@ -42,6 +42,7 @@ local Object = {
GUI = {
Name = "Supercluster Labels",
Path = "/Universe/Deep Sky Surveys",
Focusable = false,
Description = [[The superclusters dataset is a set of labels that mark the major
galaxy superclusters in the local universe. They correspond to, and should be viewed
with, the Abell clusters. Astronomers estimate there are 10 million superclusters in

View File

@@ -41,6 +41,7 @@ local Object = {
GUI = {
Name = "Supernova Remnants",
Path = "/Milky Way/Nebulae",
Focusable = false,
Description = [[A supernova remnant is the nebulous gas left over from a supernova
explosion. This gas expands at great speeds and rams into the surrounding
interstellar gas. This excites the surrounding gas and causes it to glow, producing

View File

@@ -59,6 +59,7 @@ local TullyGalaxies = {
GUI = {
Name = "Tully Galaxies",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[The Tully Catalog is the most polished, accurate catalog of nearby
galaxies. It includes over 30,000 galaxies in the local universe that surround the
Milky Way. This catalog demonstrates the large-scale structure of the universe
@@ -104,6 +105,7 @@ local TullyGalaxiesImages = {
GUI = {
Name = "Tully Galaxy Images",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[Each Tully galaxy is represented by an image that represents its
morphological type (spiral, elliptical, etc.). Most of these come from The Galaxy
Catalog. A handful of nearby galaxies are represented by their actual images, which

View File

@@ -26,6 +26,7 @@ local Object = {
GUI = {
Name = "Voids",
Path = "/Universe/Nearby Surveys",
Focusable = false,
Description = [[Cosmic voids are vast, empty spaces where there are either no
galaxies, or very few galaxies. They are associated with cold spots in the cosmic
microwave background (CMB) light, the earliest picture we have of the universe.

View File

@@ -35,6 +35,7 @@ local Object = {
GUI = {
Name = "White Dwarfs",
Path = "/Milky Way/Stellar Remnants",
Focusable = false,
Description = [[A white dwarf is the core of a dying star. These are dim objects that
are roughly the size of Earth but with the desity of a sunlike star. Stars that are
not massive enough to end in a neutraon star or black hole will evolve into a white

View File

@@ -30,6 +30,7 @@ local BigDipper = {
GUI = {
Name = "Big Dipper",
Path = "/Milky Way/Constellations",
Focusable = false,
Description = [[This item only draws the big dipper, and not the rest of the
lines of the Ursa Major constellation.]]
}

View File

@@ -89,7 +89,7 @@ local function createConstellations(baseIdentifier, guiPath, constellationfile)
Opacity = 0.1,
DimInAtmosphere = true
},
Tag = { "ImageConstellation", group, "daytime_hidden" },
Tag = { "image_constellation", "zodiac_" .. group, "daytime_hidden" },
GUI = {
Name = name .. " Image",
Path = "/Milky Way/Constellations/" .. guiPath,

View File

@@ -53,6 +53,7 @@ local GaiaAbundanceApogee = {
GUI = {
Path = "/Milky Way/Gaia",
Name = "Gaia Abundance Apogee",
Focusable = false,
Description = "Data set of stars color coded by metallicity"
}
}

View File

@@ -60,6 +60,7 @@ local GaiaStars = {
GUI = {
Name = "Gaia Stars",
Path = "/Milky Way",
Focusable = false,
Description = "Radial Velocity subset of GaiaDR2"
}
}

View File

@@ -53,6 +53,7 @@ local GaiaAbundanceGalah = {
GUI = {
Path = "/Milky Way/Gaia",
Name = "Gaia Abundance Galah",
Focusable = false,
Description = "Data set of stars color coded by metallicity"
}
}

View File

@@ -29,6 +29,7 @@ local Object = {
GUI = {
Name = "Milky Way (ESO)",
Path = "/Milky Way/Milky Way",
Focusable = false,
Description = "Milky Way Galaxy image (alternate)"
}
}

View File

@@ -44,7 +44,8 @@ local Object = {
},
GUI = {
Name = "Stars (Denver)",
Path = "/Milky Way/Stars"
Path = "/Milky Way/Stars",
Focusable = false
}
}

View File

@@ -9,7 +9,7 @@ local Ceres = {
Type = "RenderableGlobe",
Radii = { 487300, 487300, 454700 }
},
Tag = { "planet_solarSystem", "planet_terrestrial", "dwarf_planet" },
Tag = { "planet_terrestrial", "dwarf_planet" },
GUI = {
Path = "/Solar System/Dwarf Planets/Ceres"
}
@@ -32,6 +32,7 @@ local CeresLabel = {
GUI = {
Name = "Ceres Label",
Path = "/Solar System/Dwarf Planets/Ceres",
Focusable = false,
Description = "Label for Ceres, visible at the solarsystem overview zoom level"
}
}

View File

@@ -18,10 +18,11 @@ local CeresTrail = {
Period = 1680,
Resolution = 1000
},
Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
Tag = { "planetTrail_dwarf" },
GUI = {
Name = "Ceres Trail",
Path = "/Solar System/Dwarf Planets/Ceres"
Path = "/Solar System/Dwarf Planets/Ceres",
Focusable = false
}
}

View File

@@ -22,6 +22,7 @@ local CeresPosition = {
GUI = {
Name = "Ceres Position",
Path = "/Solar System/Dwarf Planets/Ceres",
Focusable = false,
Hidden = true
}
}

View File

@@ -23,6 +23,7 @@ local Label = {
GUI = {
Name = "Eris Label",
Path = "/Solar System/Dwarf Planets/Eris",
Focusable = false,
Description = "Label for Eris, visible at the solarsystem overview zoom level"
}
}

View File

@@ -18,7 +18,8 @@ local Trail = {
Tag = { "planetTrail_dwarf" },
GUI = {
Name = "Eris Trail",
Path = "/Solar System/Dwarf Planets/Eris"
Path = "/Solar System/Dwarf Planets/Eris",
Focusable = false
}
}

View File

@@ -24,6 +24,7 @@ local Position = {
GUI = {
Name = "Eris Position",
Path = "/Solar System/Dwarf Planets/Eris",
Focusable = false,
Hidden = true
}
}

View File

@@ -23,6 +23,7 @@ local Label = {
GUI = {
Name = "Gonggong Label",
Path = "/Solar System/Dwarf Planets/Gonggong",
Focusable = false,
Description = "Label for Gonggong, visible at the solarsystem overview zoom level"
}
}

View File

@@ -18,7 +18,8 @@ local Trail = {
Tag = { "planetTrail_dwarf" },
GUI = {
Name = "Gonggong Trail",
Path = "/Solar System/Dwarf Planets/Gonggong"
Path = "/Solar System/Dwarf Planets/Gonggong",
Focusable = false
}
}

View File

@@ -24,6 +24,7 @@ local Position = {
GUI = {
Name = "Gonggong Position",
Path = "/Solar System/Dwarf Planets/Gonggong",
Focusable = false,
Hidden = true
}
}

View File

@@ -23,6 +23,7 @@ local Label = {
GUI = {
Name = "Haumea Label",
Path = "/Solar System/Dwarf Planets/Haumea",
Focusable = false,
Description = "Label for Haumea, visible at the solarsystem overview zoom level"
}
}

View File

@@ -19,6 +19,7 @@ local Trail = {
GUI = {
Name = "Haumea Trail",
Path = "/Solar System/Dwarf Planets/Haumea",
Focusable = false,
Description = "Trail of Haumea"
}
}

View File

@@ -25,6 +25,7 @@ local Position = {
GUI = {
Name = "Haumea Position",
Path = "/Solar System/Dwarf Planets/Haumea",
Focusable = false,
Hidden = true
}
}

View File

@@ -23,6 +23,7 @@ local Label = {
GUI = {
Name = "Makemake Label",
Path = "/Solar System/Dwarf Planets/Makemake",
Focusable = false,
Description = "Label for Makemake, visible at the solarsystem overview zoom level"
}
}

View File

@@ -18,7 +18,8 @@ local Trail = {
Tag = { "planetTrail_dwarf" },
GUI = {
Name = "Makemake Trail",
Path = "/Solar System/Dwarf Planets/Makemake"
Path = "/Solar System/Dwarf Planets/Makemake",
Focusable = false
}
}

View File

@@ -25,6 +25,7 @@ local Position = {
GUI = {
Name = "Makemake Position",
Path = "/Solar System/Dwarf Planets/Makemake",
Focusable = false,
Hidden = true
}
}

View File

@@ -23,6 +23,7 @@ local Label = {
GUI = {
Name = "Orcus Label",
Path = "/Solar System/Dwarf Planets/Orcus",
Focusable = false,
Description = "Label for Orcus, visible at the solarsystem overview zoom level"
}
}

View File

@@ -18,6 +18,7 @@ local Trail = {
Tag = { "planetTrail_dwarf" },
GUI = {
Name = "Orcus Trail",
Focusable = false,
Path = "/Solar System/Dwarf Planets/Orcus"
}
}

View File

@@ -25,6 +25,7 @@ local Position = {
GUI = {
Name = "Orcus Position",
Path = "/Solar System/Dwarf Planets/Orcus",
Focusable = false,
Hidden = true
}
}

View File

@@ -43,9 +43,16 @@ local Charon = {
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_major", "moon_major_pluto" },
Tag = {
"moon_solarSystem",
"moon_dwarf",
"moon_pluto",
"moon_major",
"moon_major_pluto"
},
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto/Charon"
Path = "/Solar System/Dwarf Planets/Pluto/Charon",
Focusable = false
}
}
@@ -70,6 +77,7 @@ local CharonLabel = {
GUI = {
Name = "Charon Label",
Path = "/Solar System/Dwarf Planets/Pluto/Charon",
Focusable = false,
Description = "Label for Pluto's moon Charon"
}
}

View File

@@ -25,7 +25,8 @@ local CharonBarycentricTrail = {
},
GUI = {
Name = "Charon Barycentric Trail",
Path = "/Solar System/Dwarf Planets/Pluto/Charon"
Path = "/Solar System/Dwarf Planets/Pluto/Charon",
Focusable = false
}
}

View File

@@ -46,7 +46,8 @@ local HydraTrail = {
},
GUI = {
Name = "Hydra Trail",
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Hydra"
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Hydra",
Focusable = false
}
}
@@ -71,6 +72,7 @@ local HydraLabel = {
GUI = {
Name = "Hydra Label",
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Hydra",
Focusable = false,
Description = "Label for Pluto's moon Hydra"
}
}

View File

@@ -17,7 +17,13 @@ local Kerberos = {
Type = "RenderableGlobe",
Radii = { 10000, 10000, 10000 }
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
Tag = {
"moon_solarSystem",
"moon_dwarf",
"moon_pluto",
"moon_minor",
"moon_minor_pluto"
},
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Kerberos"
}
@@ -46,7 +52,8 @@ local KerberosTrail = {
},
GUI = {
Name = "Kerberos Trail",
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Kerberos"
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Kerberos",
Focusable = false
}
}
@@ -71,6 +78,7 @@ local KerberosLabel = {
GUI = {
Name = "Kerberos Label",
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Kerberos",
Focusable = false,
Description = "Label for Pluto's moon Kerberos"
}
}

View File

@@ -17,7 +17,13 @@ local Nix = {
Type = "RenderableGlobe",
Radii = { 45000, 45000, 45000 }
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
Tag = {
"moon_solarSystem",
"moon_dwarf",
"moon_pluto",
"moon_minor",
"moon_minor_pluto"
},
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Nix"
}
@@ -46,7 +52,8 @@ local NixTrail = {
},
GUI = {
Name = "Nix Trail",
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Nix"
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Nix",
Focusable = false
}
}
@@ -71,6 +78,7 @@ local NixLabel = {
GUI = {
Name = "Nix Label",
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Nix",
Focusable = false,
Description = "Label for Pluto's moon Nix"
}
}

View File

@@ -17,7 +17,13 @@ local Styx = {
Type = "RenderableGlobe",
Radii = { 45000, 45000, 45000 }
},
Tag = { "moon_solarSystem", "moon_dwarf", "moon_pluto", "moon_minor", "moon_minor_pluto" },
Tag = {
"moon_solarSystem",
"moon_dwarf",
"moon_pluto",
"moon_minor",
"moon_minor_pluto"
},
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Styx"
}
@@ -46,7 +52,8 @@ local StyxTrail = {
},
GUI = {
Name = "Styx Trail",
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Styx"
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Styx",
Focusable = false
}
}
@@ -71,6 +78,7 @@ local StyxLabel = {
GUI = {
Name = "Styx Label",
Path = "/Solar System/Dwarf Planets/Pluto/Moons/Styx",
Focusable = false,
Description = "Label for Pluto's moon Styx"
}
}

View File

@@ -43,7 +43,7 @@ local Pluto = {
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "planet_solarSystem", "planet_terrestrial", "dwarf_planet" },
Tag = { "planet_terrestrial", "dwarf_planet" },
GUI = {
Path = "/Solar System/Dwarf Planets/Pluto"
}
@@ -70,6 +70,7 @@ local PlutoLabel = {
GUI = {
Name = "Pluto Label",
Path = "/Solar System/Dwarf Planets/Pluto",
Focusable = false,
Description = "Label for Pluto, visible at the solarsystem overview zoom level"
}
}

View File

@@ -17,10 +17,11 @@ local PlutoTrailBarycentric = {
Period = 6.38723,
Resolution = 1000
},
Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
Tag = { "planetTrail_dwarf" },
GUI = {
Name = "Pluto Barycentric Trail",
Path = "/Solar System/Dwarf Planets/Pluto",
Focusable = false,
Description = "Orbit of Pluto around its Barycenter"
}
}

View File

@@ -28,6 +28,7 @@ local PlutoKeplerianTrail = {
GUI = {
Name = "Pluto Keplerian Trail",
Path = "/Solar System/Dwarf Planets/Pluto",
Focusable = false,
Description = "Keplerian trail of Pluto. Contains full orbit"
}
}

View File

@@ -17,10 +17,11 @@ local PlutoBarycenterTrail = {
Period = 365.25,
Resolution = 1000
},
Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
Tag = { "planetTrail_dwarf" },
GUI = {
Name = "Pluto Barycenter Trail",
Path = "/Solar System/Dwarf Planets/Pluto",
Focusable = false,
Description = [[Precise trail of Pluto from NASA SPICE data. Not containing full
orbit]]
}

View File

@@ -23,6 +23,7 @@ local Label = {
GUI = {
Name = "Quaoar Label",
Path = "/Solar System/Dwarf Planets/Quaoar",
Focusable = false,
Description = "Label for Quaoar, visible at the solarsystem overview zoom level"
}
}

View File

@@ -19,6 +19,7 @@ local Trail = {
GUI = {
Name = "Quaoar Trail",
Path = "/Solar System/Dwarf Planets/Quaoar",
Focusable = false,
Description = "Trail of Quaoar"
}
}

View File

@@ -25,6 +25,7 @@ local Position = {
GUI = {
Name = "Quaoar Position",
Path = "/Solar System/Dwarf Planets/Quaoar",
Focusable = false,
Hidden = true
}
}

View File

@@ -23,6 +23,7 @@ local Label = {
GUI = {
Name = "Sedna Label",
Path = "/Solar System/Dwarf Planets/Sedna",
Focusable = false,
Description = "Label for Sedna, visible at the solarsystem overview zoom level"
}
}

View File

@@ -19,6 +19,7 @@ local Trail = {
GUI = {
Name = "Sedna Trail",
Path = "/Solar System/Dwarf Planets/Sedna",
Focusable = false,
Description = "Trail of Sedna"
}
}

View File

@@ -25,6 +25,7 @@ local Position = {
GUI = {
Name = "Sedna Position",
Path = "/Solar System/Dwarf Planets/Sedna",
Focusable = false,
Hidden = true
}
}

View File

@@ -23,6 +23,7 @@ local Label = {
GUI = {
Name = "Vesta Label",
Path = "/Solar System/Dwarf Planets/Vesta",
Focusable = false,
Description = "Label for Vesta, visible at the solarsystem overview zoom level"
}
}

View File

@@ -19,6 +19,7 @@ local Trail = {
GUI = {
Name = "Vesta Trail",
Path = "/Solar System/Dwarf Planets/Vesta",
Focusable = false,
Description = "Trail of Vesta"
}
}

View File

@@ -5,28 +5,29 @@ local transforms = asset.require("scene/solarsystem/sun/transforms")
local AU = 1.496e+8
local Translation = {
Type = "KeplerTranslation",
Eccentricity = 0.08875750498598881,
SemiMajorAxis = 2.363038212561438 * AU,
Inclination = 7.139257981928672,
AscendingNode = 103.7573001493549,
ArgumentOfPeriapsis = 151.5991639880173,
MeanAnomaly = 115.1329895974862,
Epoch = "2021 04 13 11:15:57",
Period = 1326.797192349944 * 60 * 60 * 24
Type = "KeplerTranslation",
Eccentricity = 0.08875750498598881,
SemiMajorAxis = 2.363038212561438 * AU,
Inclination = 7.139257981928672,
AscendingNode = 103.7573001493549,
ArgumentOfPeriapsis = 151.5991639880173,
MeanAnomaly = 115.1329895974862,
Epoch = "2021 04 13 11:15:57",
Period = 1326.797192349944 * 60 * 60 * 24
}
local Position = {
Identifier = "VestaPosition",
Parent = transforms.SunEclipJ2000.Identifier,
Transform = {
Translation = Translation
},
GUI = {
Name = "Vesta Position",
Path = "/Solar System/Dwarf Planets/Vesta",
Hidden = true
}
Identifier = "VestaPosition",
Parent = transforms.SunEclipJ2000.Identifier,
Transform = {
Translation = Translation
},
GUI = {
Name = "Vesta Position",
Path = "/Solar System/Dwarf Planets/Vesta",
Focusable = false,
Hidden = true
}
}

View File

@@ -65,8 +65,9 @@ local BatsrusJ12OpenClosed = {
Type = "RenderableFieldlinesSequence",
SourceFolder = unzippedDataDestination.openClosed,
InputFileType = "Osfls",
Color = { 0.7, 0.4, 0.0, 0.6 }, -- Default color
ColorMethod = "By Quantity", -- Color by Quantity
ShowAtAllTimes = false,
Color = { 0.7, 0.4, 0.0, 0.6 },
ColorMethod = "By Quantity",
ColorQuantity = 0, -- Temperature
ColorTablePaths = {
batsrusTemperatureColorTable,
@@ -78,7 +79,7 @@ local BatsrusJ12OpenClosed = {
ColorTableRanges = colorRanges,
MaskingEnabled = true,
MaskingQuantity = 4, -- Topology
MaskingRanges = { {2.5, 3.0} } -- Corresponds to closed fieldlines only
MaskingRanges = { { 2.5, 3.0 } } -- Corresponds to closed fieldlines only
},
GUI = {
Name = "Fieldlines BATSRUS J12 Open/Closed",
@@ -95,9 +96,10 @@ local BatsrusJ12FlowLines = {
Type = "RenderableFieldlinesSequence",
SourceFolder = unzippedDataDestination.velocityFlow,
InputFileType = "Osfls",
ColorMethod = "By Quantity", -- Color by Quantity
ShowAtAllTimes = false,
ColorMethod = "By Quantity",
ColorQuantity = 3, -- Velocity
Color = { 0.7, 0.4, 0.0, 0.12 }, -- Default color
Color = { 0.7, 0.4, 0.0, 0.12 },
ColorTablePaths = {
batsrusTemperatureColorTable,
batsrusDensityColorTable,
@@ -123,6 +125,7 @@ local BatsrusAsherStaticSeedsFlowLines = {
Enabled = false,
SourceFolder = unzippedDataDestination.asherStatic,
InputFileType = "Osfls",
ShowAtAllTimes = false,
ColorTablePaths = {
batsrusTemperatureColorTable,
batsrusDensityColorTable,

View File

@@ -1,5 +1,5 @@
asset.require("scene/solarsystem/heliosphere/2012/reset_loop_action")
local transforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
local transforms = asset.require("scene/solarsystem/heliosphere/transforms_heliosphere")
@@ -61,8 +61,9 @@ local ENLILSliceEqPlane11AU1 = {
Type = "RenderableFieldlinesSequence",
SourceFolder = unzippedDataDestination.EqPlane011AU1,
InputFileType = "Osfls",
ShowAtAllTimes = false,
Color = { 0.4, 0.15, 0.4, 0.6 },
ColorMethod = "By Quantity", -- Color by Quantity
ColorMethod = "By Quantity",
ColorQuantity = 1, -- Velocity
ColorTablePaths = {
enlilDensityColorTable,
@@ -84,8 +85,9 @@ local ENLILSliceEqPlane11AU2 = {
Type = "RenderableFieldlinesSequence",
SourceFolder = unzippedDataDestination.EqPlane011AU2,
InputFileType = "Osfls",
ShowAtAllTimes = false,
Color = { 0.4, 0.15, 0.4, 0.6 },
ColorMethod = "By Quantity", -- Color by Quantity
ColorMethod = "By Quantity",
ColorQuantity = 1, -- Velocity
ColorTablePaths = {
enlilDensityColorTable,
@@ -107,9 +109,9 @@ local ENLILSliceLat411AU1 = {
Type = "RenderableFieldlinesSequence",
SourceFolder = unzippedDataDestination.Lat4011AU1,
InputFileType = "Osfls",
ShowAtAllTimes = false,
Color = { 0.4, 0.15, 0.4, 0.6 },
ColorMethod = "By Quantity", -- Color by Quantity
ColorMethod = "By Quantity",
ColorQuantity = 1, -- Velocity
ColorTablePaths = {
enlilDensityColorTable,
@@ -131,9 +133,9 @@ local ENLILSliceLat411AU2 = {
Type = "RenderableFieldlinesSequence",
SourceFolder = unzippedDataDestination.Lat4011AU2,
InputFileType = "Osfls",
ShowAtAllTimes = false,
Color = { 0.4, 0.15, 0.4, 0.6 },
ColorMethod = "By Quantity", -- Color by Quantity
ColorMethod = "By Quantity",
ColorQuantity = 1, -- Velocity
ColorTablePaths = {
enlilDensityColorTable,
@@ -155,6 +157,7 @@ local ENLILEarth = {
Type = "RenderableFieldlinesSequence",
SourceFolder = unzippedDataDestination.Earth,
InputFileType = "Osfls",
ShowAtAllTimes = false,
Color = { 1.0, 1.0, 1.0, 0.6 },
ColorTablePaths = {
enlilDensityColorTable,
@@ -176,6 +179,7 @@ local ENLILStereoA = {
Type = "RenderableFieldlinesSequence",
SourceFolder = unzippedDataDestination.StereoA,
InputFileType = "Osfls",
ShowAtAllTimes = false,
Color = { 1.0, 1.0, 1.0, 0.6 },
ColorTablePaths = {
enlilDensityColorTable,

View File

@@ -1,4 +1,4 @@
local transforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
local transforms = asset.require("scene/solarsystem/heliosphere/transforms_heliosphere")
@@ -53,6 +53,7 @@ local PFSS = {
Type = "RenderableFieldlinesSequence",
SourceFolder = PFSSPaths.SolarSoft,
InputFileType = "Osfls",
ShowAtAllTimes = true,
Color = { 0.35, 0.51, 0.875, 0.22 },
FlowEnabled = true,
ReversedFlow = true,

View File

@@ -1,26 +0,0 @@
local CarringtonLongitudeToHEEQ180Rotation = {
-- This is a rotation matrix to go from the Carrington longitude reference frame to the
-- HEEQ180 reference frame. At the reference time, MAS_seq = 0, 2000-07-14T08:33:37.105
-- the Carrington longitude was 309.3 degrees.
-- Difference from HEEQ => 360-309.3=50.7 (or 0-309.3 = -309.3). However this leads to
-- the same rotation matrix in the end)
-- Since OpenSpace supports HEEQ180 and not HEEQ, 180 was added or subtracted
-- => a1 = -129.3 and a2 = 230.7
-- Rotation matrix: (cos a, -sin a, 0)(sin a, cos a, 0)(0, 0, 1) leads to the result.
Type = "FixedRotation",
XAxis = { -0.63338087262755016203262119192353, -0.77384020972650618518999944537717, 0.0 },
YAxis = { 0.77384020972650618518999944537717, -0.63338087262755016203262119192353, 0.0 },
ZAxis = { 0.0, 0.0, 1.0 }
}
asset.export("CarringtonLongitudeToHEEQ180Rotation", CarringtonLongitudeToHEEQ180Rotation)
asset.meta = {
Name = "Carrington Longitude To HEEQ180 Rotation",
Description = "Contains a rotation for HEEQ180 to be used by another file",
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}

View File

@@ -1,5 +1,4 @@
local heliosphereTransforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
local rot = asset.require("./carrington_to_heeq_rotation")
local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
@@ -16,12 +15,11 @@ local SunRadius = 695700000
-- Fieldlies from binaries
local Fieldlines = {
Identifier = "MAS-MHD-Fieldlines-bastille-day-2000",
Parent = heliosphereTransforms.HeliocentricEarthEquatorial180.Identifier,
Parent = sunTransforms.SunIAU.Identifier,
-- TODO Elon: 21 April 2022. Interaction sphere should not depend on the transform scale.
-- InteractionSphere = sunAsset.Sun.Renderable.Radii[1] * 1.05,
InteractionSphere = 1 / SunRadius,
Transform = {
Rotation = rot.CarringtonLongitudeToHEEQ180Rotation,
Scale = {
Type = "StaticScale",
Scale = SunRadius
@@ -30,17 +28,14 @@ local Fieldlines = {
Renderable = {
Type = "RenderableFieldlinesSequence",
SourceFolder = fieldlinesDirectory,
AlphaBlendlingEnabled = false,
InputFileType = "Osfls",
LineWidth = 1.0,
ShowAtAllTimes = false,
ColorQuantity = 0,
ColorTablePaths = {
asset.resource("transferfunctions/density-fieldlines.txt"),
asset.resource("transferfunctions/velocity-fieldlines.txt")
asset.resource("transferfunctions/density-fieldlines.txt")
},
ColorTableRanges = {
{ 0, 1000000 },
{ 100, 2000 }
},
SimulationModel = "mas"
ColorMinMaxRange = { 0, 1000000 }
},
GUI = {
Path = "/Solar System/Heliosphere/Bastille Day 2000",

View File

@@ -1,5 +1,4 @@
local heliosphereTransforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
local rot = asset.require("./carrington_to_heeq_rotation")
local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
@@ -14,13 +13,10 @@ local fluxNodesBinaries = asset.resource({
-- FluxNodes from binaries
local Fluxnodes = {
Identifier = "MAS-MHD-FluxNodes-bastille-day-2000",
Parent = heliosphereTransforms.HeliocentricEarthEquatorial180.Identifier,
Parent = sunTransforms.SunIAU.Identifier,
-- TODO Elon: 21 April 2022. Interaction sphere should not depend on the transform scale.
-- InteractionSphere = sunAsset.Sun.Renderable.Radii[1] * 1.05,
InteractionSphere = 695700000.0,
Transform = {
Rotation = rot.CarringtonLongitudeToHEEQ180Rotation
},
Renderable = {
Type = "RenderableFluxNodes",
SourceFolder = fluxNodesBinaries,

View File

@@ -1,5 +1,5 @@
local transforms = asset.require("scene/solarsystem/sun/transforms_heliosphere")
local rot = asset.require("./carrington_to_heeq_rotation")
local transforms = asset.require("scene/solarsystem/sun/transforms")
local transformsHelio = asset.require("scene/solarsystem/heliosphere/transforms_heliosphere")
@@ -20,13 +20,10 @@ local TexturesPathMeridial = asset.resource({
local EquatorialCutplane = {
Identifier = "EquatorialCutplane-bastille-day-2000",
Parent = transforms.HeliocentricEarthEquatorial180.Identifier,
Parent = transforms.SunIAU.Identifier,
-- TODO Elon: 21 April 2022. Interaction sphere should not depend on the transform scale.
-- InteractionSphere = sunAsset.Sun.Renderable.Radii[1] * 1.05,
InteractionSphere = 695700000.0,
Transform = {
Rotation = rot.CarringtonLongitudeToHEEQ180Rotation
},
Renderable = {
Type = "RenderablePlaneTimeVaryingImage",
Size = 157000000000,
@@ -46,7 +43,7 @@ local EquatorialCutplane = {
local MeridialCutplane = {
Identifier = "MeridialCutplane-bastille-day-2000",
Parent = transforms.HeliocentricEarthEquatorial180.Identifier,
Parent = transformsHelio.HeliocentricEarthEquatorial180.Identifier,
-- TODO Elon: 21 April 2022. Interaction sphere should not depend on the transform scale.
-- InteractionSphere = sunAsset.Sun.Renderable.Radii[1] * 1.05,
InteractionSphere = 695700000,

View File

@@ -0,0 +1,203 @@
local transforms = asset.require("scene/solarsystem/heliosphere/transforms_heliosphere")
local transferFunctions = asset.resource({
Type = "HttpSynchronization",
Name = "Today's Sun Transfer Functions",
Identifier = "todayssun_transferfunctions",
Version = 1
})
local windSpeedPolarityColorTable = transferFunctions .. "polarity_spec.txt"
local subEarthLevelColorTable = transferFunctions .. "subearth_spec.txt"
local currentSheetColorTable = transferFunctions .. "currentsheet_spec.txt"
local opennessColorTable = transferFunctions .."openness_spec.txt"
local infoURL = "https://iswaa-webservice1.ccmc.gsfc.nasa.gov/IswaSystemWebApp/DataInfoServlet?id="
local dataURL = "https://iswaa-webservice1.ccmc.gsfc.nasa.gov/IswaSystemWebApp/FilesInRangeServlet?dataID="
local sunRadius = 695700000.0
local fieldlinesSCS = {
Identifier = "WSA_54_Fieldlines_SCS_OI",
Parent = transforms.WSAOffset60.Identifier,
Transform = {
Scale = {
Type = "StaticScale",
Scale = sunRadius
},
},
Renderable = {
Type = "RenderableFieldlinesSequence",
InputFileType = "Osfls",
LoadingType = "DynamicDownloading",
InfoURL = infoURL,
DataURL = dataURL,
DataID = 2286,
ShowAtAllTimes = false,
ColorMethod = "By Quantity",
ColorQuantity = 0, -- Polarity & solar wind speed
ColorTablePaths = {
windSpeedPolarityColorTable,
currentSheetColorTable
},
ColorTableRanges = {
{ -1.0, 1.0 },
{ 0.0, 1.0 }
}
},
GUI = {
Name = "Fieldlines: Corona SCS (Out-In Tracing)",
Path = "/Solar System/Heliosphere/WSA Coronal Model",
Description = [[WSA 5.4 real-time output of the fieldline trace from the Schatten
Current Sheet model (SCS) outer boundary at 21.5 Rs to the source surface at 2.5 Rs
using GONGZ as input. SCS is the , a part of WSA.]],
Focusable = false
}
}
local fieldlinesOI = {
Identifier = "WSA_54_Fieldlines_PFSS_OI",
Parent = transforms.WSAOffset60.Identifier,
Transform = {
Scale = {
Type = "StaticScale",
Scale = sunRadius
},
},
Renderable = {
Type = "RenderableFieldlinesSequence",
InputFileType = "Osfls",
LoadingType = "DynamicDownloading",
InfoURL = infoURL,
DataURL = dataURL,
DataID = 2285,
ShowAtAllTimes = false,
ColorMethod = "By Quantity",
ColorQuantity = 0, -- Polarity & solar wind speed
ColorTablePaths = {
windSpeedPolarityColorTable,
currentSheetColorTable
},
ColorTableRanges = {
{ -1.0, 1.0 },
{ 0.0, 1.0 }
},
},
GUI = {
Name = "Fieldlines: Corona PFSS (Out-In Tracing)",
Path = "/Solar System/Heliosphere/WSA Coronal Model",
Description = [[WSA 5.4 real-time output of the fieldline trace from the source
surface to the solar surface using GONGZ as input. PFSS is the Potential Field
Source Surface model, a part of WSA.]],
Focusable = false
}
}
local fieldlinesIO = {
Identifier = "WSA_54_Fieldlines_PFSS_IO",
Parent = transforms.WSAOffset60.Identifier,
Transform = {
Scale = {
Type = "StaticScale",
Scale = sunRadius
},
},
Renderable = {
Type = "RenderableFieldlinesSequence",
InputFileType = "Osfls",
LoadingType = "DynamicDownloading",
InfoURL = infoURL,
DataURL = dataURL,
DataID = 2284,
ShowAtAllTimes = false,
ColorMethod = "By Quantity",
ColorQuantity = 0, -- Open/closed lines
ColorTablePaths = {
opennessColorTable
},
ColorTableRanges = {
{ 0.0, 2.0 }
},
},
GUI = {
Name = "Fieldlines: Corona PFSS (In-Out Tracing)",
Path = "/Solar System/Heliosphere/WSA Coronal Model",
Description = [[WSA 5.4 real-time output of the fieldline trace from the solar surface
outwards using GONGZ as input. PFSS is the Potential Field Source Surface model, a
part of WSA.]],
Focusable = false
}
}
local fieldlinesEarth = {
Identifier = "WSA_54_Fieldlines_Earth",
Parent = transforms.WSAOffset60.Identifier,
Transform = {
Scale = {
Type = "StaticScale",
Scale = sunRadius
},
},
Renderable = {
Type = "RenderableFieldlinesSequence",
InputFileType = "Osfls",
LoadingType = "DynamicDownloading",
InfoURL = infoURL,
DataURL = dataURL,
DataID = 2287,
ShowAtAllTimes = false,
ColorMethod = "By Quantity",
ColorQuantity = 0, -- Polarity
ColorTablePaths = {
windSpeedPolarityColorTable,
subEarthLevelColorTable
},
ColorTableRanges = {
{ 0.0, 1.0 },
{ 0.0, 2.0 }
},
},
GUI = {
Name = "Fieldlines: Tracing from Earth",
Path = "/Solar System/Heliosphere/WSA Coronal Model",
Description = [[WSA 5.4 real-time output of the field line trace from Earth using GONGZ
as input.]],
Focusable = false
}
}
asset.onInitialize(function()
openspace.addSceneGraphNode(fieldlinesSCS)
openspace.addSceneGraphNode(fieldlinesOI)
openspace.addSceneGraphNode(fieldlinesIO)
openspace.addSceneGraphNode(fieldlinesEarth)
end)
asset.onDeinitialize(function()
openspace.removeSceneGraphNode(fieldlinesEarth)
openspace.removeSceneGraphNode(fieldlinesIO)
openspace.removeSceneGraphNode(fieldlinesOI)
openspace.removeSceneGraphNode(fieldlinesSCS)
end)
asset.export(fieldlinesSCS)
asset.export(fieldlinesOI)
asset.export(fieldlinesIO)
asset.export(fieldlinesEarth)
asset.meta = {
Name = "WSA 5.4. Streaming Field Line Data Dynamically",
Version = "1.0",
Description = [[Downloading data from the WSA 5.4 simulation model, showing the dynamic
Sun at any point. It includes .osfls files (OpenSpace FieldLine Sequence) for field
lines.]],
Author = "CCMC",
URL = "http://openspaceproject.com",
License = "MIT license"
}

Some files were not shown because too many files have changed in this diff Show More