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

Merge remote-tracking branch 'origin/master' into feature/documentation-overhaul

Browse Source 
# Conflicts:
#	src/scripting/scriptengine.cpp
This commit is contained in:
Ylva Selling
2023-04-12 17:37:28 -04:00
parent 4053243a14 19642e8120
commit 3ff6169771
1118 changed files with 8057 additions and 4956 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -25,6 +25,7 @@ Thumbs.db
/cache/
/cache-*/
/cache_gdal/
/mrf_cache/
/documentation/
/logs/
/screenshots/
@@ -39,3 +40,4 @@ COMMIT.md
*_codegen.cpp
# SkyBrowser Module downloaded data
/modules/skybrowser/wwtimagedata
doc

3
CMakeLists.txt
View File

@@ -163,7 +163,8 @@ add_custom_target(
add_dependencies(run_codegen codegen)
add_custom_command(
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/__codegen.h"
COMMAND codegen ARGS "${PROJECT_SOURCE_DIR}/modules" "${PROJECT_SOURCE_DIR}/src"
COMMAND codegen ARGS "modules" "src"
WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
VERBATIM
)
set_target_properties(codegen-lib PROPERTIES FOLDER "support")

2
CREDITS.md
View File

@@ -12,7 +12,7 @@ Jonas Strandstedt
Michal Marcinkowski
Joakim Kilby
Lovisa Hassler
Mikael Petterson
Mikael Petterson
Erik Sundén
Stefan Lindblad
Corrie Roe

2679
Doxyfile
View File

File diff suppressed because it is too large Load Diff

18
Jenkinsfile vendored
View File

@@ -16,7 +16,7 @@ if (env.CHANGE_BRANCH) {
def readDir() {
def dirsl = [];
new File("${workspace}").eachDir() {
dirs -> println dirs.getName()
dirs -> println dirs.getName()
if (!dirs.getName().startsWith('.')) {
dirsl.add(dirs.getName());
}
@@ -27,7 +27,7 @@ def readDir() {
def moduleCMakeFlags() {
def modules = [];
// using new File doesn't work as it is not allowed in the sandbox
if (isUnix()) {
modules = sh(returnStdout: true, script: 'ls -d modules/*').trim().split('\n');
};
@@ -61,8 +61,8 @@ parallel tools: {
recordIssues(
id: 'tools-cppcheck',
tool: cppCheck(pattern: 'build/cppcheck.xml')
)
}
)
}
cleanWs()
} // node('tools')
},
@@ -101,7 +101,7 @@ linux_gcc_make: {
testHelper.runUnitTests('bin/GhoulTest');
}
}
stage('linux-gcc-make/test-openspace') {
timeout(time: 2, unit: 'MINUTES') {
testHelper.runUnitTests('bin/OpenSpaceTest');
@@ -264,7 +264,7 @@ windows_msvc: {
testHelper.runUnitTests('bin\\Debug\\codegentest');
}
}
stage('windows-msvc/test-sgct') {
timeout(time: 2, unit: 'MINUTES') {
testHelper.runUnitTests('bin\\Debug\\SGCTTest');
@@ -282,7 +282,7 @@ windows_msvc: {
testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest');
}
}
}
}
cleanWs()
} // node('windows')
}
@@ -343,7 +343,7 @@ macos_make: {
testHelper.runUnitTests('bin/Debug/OpenSpaceTest');
}
}
}
}
cleanWs()
} // node('macos')
}
@@ -384,7 +384,7 @@ macos_xcode: {
testHelper.runUnitTests('bin/Debug/OpenSpaceTest');
}
}
}
}
cleanWs()
} // node('macos')
}

2
apps/OpenSpace/CMakeLists.txt
View File

@@ -141,7 +141,7 @@ if (WIN32)
find_program(WINDEPLOYQT_EXECUTABLE windeployqt HINTS "${_qt_bin_dir}")
add_custom_command(
TARGET OpenSpace POST_BUILD
COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" --verbose 0 --no-compiler-runtime \"$<TARGET_FILE:OpenSpace>\"
COMMAND "${CMAKE_COMMAND}" -E env PATH="${_qt_bin_dir}" "${WINDEPLOYQT_EXECUTABLE}" --verbose 0 --no-compiler-runtime --no-translations \"$<TARGET_FILE:OpenSpace>\"
COMMENT "Deploying Qt libraries"
)
endif ()

5
apps/OpenSpace/ext/launcher/CMakeLists.txt
View File

@@ -113,9 +113,6 @@ target_include_directories(
openspace-ui-launcher
PUBLIC
include
# @TODO: This should be handled in a better way
../sgct/include
../sgct/sgct/ext/glm
)
target_link_libraries(
openspace-ui-launcher
@@ -126,6 +123,8 @@ target_link_libraries(
Qt${QT_VERSION_MAJOR}::Gui
Qt${QT_VERSION_MAJOR}::Widgets
Qt${QT_VERSION_MAJOR}::Network
PRIVATE
sgct
)
target_precompile_headers(openspace-ui-launcher PRIVATE

4
apps/OpenSpace/ext/launcher/include/profile/deltatimesdialog.h
View File

@@ -63,7 +63,7 @@ public:
private:
void createWidgets();
void listItemSelected();
void valueChanged(const QString& text);
void saveDeltaTimeValue();
@@ -76,7 +76,7 @@ private:
* Called to transition to editing a particular dt value (gui settings)
*
* \param index index in dt list
* \param state \c true if the edit mode should be turned on, \c false otherwise
* \param state `true` if the edit mode should be turned on, `false` otherwise
*/
void transitionEditMode(int index, bool state);

2
apps/OpenSpace/ext/launcher/resources/qss/launcher.qss
View File

@@ -36,7 +36,7 @@ LauncherWindow QComboBox#config {
border-radius: 3px;
border-color: rgb(225, 225, 225);
padding: 1px 18px 1px 3px;
min-width: 6em;
min-width: 14em;
font-size: 10pt;
font-family: Segoe UI;
font-weight: bold;

30
apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
View File

@@ -31,6 +31,7 @@
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/fmt.h>
#include <ghoul/logging/logmanager.h>
#include <sgct/readconfig.h>
#include <QComboBox>
#include <QFile>
#include <QLabel>
@@ -41,7 +42,10 @@
#include <fstream>
#include <iostream>
#include <random>
#include <sgct/readconfig.h>
#ifdef WIN32
#include <Windows.h>
#endif // WIN32
using namespace openspace;
@@ -51,7 +55,7 @@ namespace {
constexpr int LeftRuler = 40;
constexpr int TopRuler = 80;
constexpr int ItemWidth = 240;
constexpr int ItemWidth = 260;
constexpr int ItemHeight = ItemWidth / 4;
constexpr int SmallItemWidth = 100;
constexpr int SmallItemHeight = SmallItemWidth / 4;
@@ -62,7 +66,7 @@ namespace {
constexpr QRect ChooseLabel(LeftRuler, TopRuler + 80, 151, 24);
constexpr QRect ProfileBox(LeftRuler, TopRuler + 110, ItemWidth, ItemHeight);
constexpr QRect NewProfileButton(
LeftRuler + 140, TopRuler + 180, SmallItemWidth, SmallItemHeight
LeftRuler + 160, TopRuler + 180, SmallItemWidth, SmallItemHeight
);
constexpr QRect EditProfileButton(
LeftRuler, TopRuler + 180, SmallItemWidth, SmallItemHeight
@@ -70,7 +74,7 @@ namespace {
constexpr QRect OptionsLabel(LeftRuler, TopRuler + 230, 151, 24);
constexpr QRect WindowConfigBox(LeftRuler, TopRuler + 260, ItemWidth, ItemHeight);
constexpr QRect NewWindowButton(
LeftRuler + 140, TopRuler + 330, SmallItemWidth, SmallItemHeight
LeftRuler + 160, TopRuler + 330, SmallItemWidth, SmallItemHeight
);
constexpr QRect EditWindowButton(
LeftRuler, TopRuler + 330, SmallItemWidth, SmallItemHeight
@@ -137,11 +141,29 @@ namespace {
void saveProfile(QWidget* parent, const std::string& path, const Profile& p) {
std::ofstream outFile;
outFile.exceptions(std::ofstream::badbit | std::ofstream::failbit);
try {
outFile.open(path, std::ofstream::out);
outFile << p.serialize();
}
catch (const std::ofstream::failure& e) {
#ifdef WIN32
if (std::filesystem::exists(path)) {
// Check if the file is hidden, since that causes ofstream to fail
DWORD res = GetFileAttributesA(path.c_str());
if (res & FILE_ATTRIBUTE_HIDDEN) {
QMessageBox::critical(
parent,
"Exception",
QString::fromStdString(fmt::format(
"Error writing data to file: '{}' as file is marked hidden",
path
))
);
return;
}
}
#endif // WIN32
QMessageBox::critical(
parent,
"Exception",

5
apps/OpenSpace/ext/launcher/src/profile/horizonsdialog.cpp
View File

@@ -734,9 +734,8 @@ bool HorizonsDialog::handleRequest() {
std::string newName = _horizonsFile.file().filename().stem().string();
std::filesystem::path oldFile = _horizonsFile.file();
std::filesystem::path newFile = _horizonsFile.file().replace_filename(
newName + "_error.txt"
);
std::filesystem::path newFile = oldFile;
newFile.replace_filename(newName + "_error.txt");
std::filesystem::rename(oldFile, newFile);

5
apps/OpenSpace/ext/launcher/src/sgctedit/sgctedit.cpp
View File

@@ -277,6 +277,11 @@ sgct::config::Cluster SgctEdit::generateConfiguration() const {
window.tags.push_back("GUI");
window.draw2D = true;
window.draw3D = false;
// Disable 2D rendering on all non-GUI windows
for (size_t w = 1; w < node.windows.size(); ++w) {
node.windows[w].draw2D = false;
}
}
cluster.nodes.push_back(node);

34
apps/OpenSpace/ext/launcher/src/sgctedit/windowcontrol.cpp
View File

@@ -36,6 +36,7 @@
#include <QLineEdit>
#include <QPushButton>
#include <QSpinBox>
#include <numbers>
namespace {
std::array<std::string, 4> MonitorNames = {
@@ -59,8 +60,8 @@ namespace {
};
constexpr int LineEditWidthFixedWindowSize = 50;
constexpr float DefaultFovH = 80.f;
constexpr float DefaultFovV = 50.534f;
constexpr float DefaultFovLongEdge = 80.f;
constexpr float DefaultFovShortEdge = 50.534f;
constexpr float DefaultHeightOffset = 0.f;
constexpr int MaxWindowSizePixels = 10000;
constexpr double FovEpsilon = 0.00001;
@@ -358,7 +359,7 @@ QWidget* WindowControl::createPlanarWidget() {
_planar.fovH = new QDoubleSpinBox;
_planar.fovH->setMinimum(FovEpsilon);
_planar.fovH->setMaximum(180.0 - FovEpsilon);
_planar.fovH->setValue(DefaultFovH);
_planar.fovH->setValue(DefaultFovLongEdge);
_planar.fovH->setEnabled(false);
_planar.fovH->setToolTip(hfovTip);
_planar.fovH->setSizePolicy(
@@ -376,7 +377,7 @@ QWidget* WindowControl::createPlanarWidget() {
_planar.fovV = new QDoubleSpinBox;
_planar.fovV->setMinimum(FovEpsilon);
_planar.fovV->setMaximum(180.0 - FovEpsilon);
_planar.fovV->setValue(DefaultFovV);
_planar.fovV->setValue(DefaultFovShortEdge);
_planar.fovV->setEnabled(false);
_planar.fovV->setToolTip(vfovTip);
_planar.fovV->setSizePolicy(
@@ -614,8 +615,8 @@ void WindowControl::resetToDefaults() {
_fisheye.spoutOutput->setChecked(false);
_equirectangular.spoutOutput->setChecked(false);
_projectionType->setCurrentIndex(static_cast<int>(ProjectionIndices::Planar));
_planar.fovV->setValue(DefaultFovH);
_planar.fovV->setValue(DefaultFovV);
_planar.fovV->setValue(DefaultFovLongEdge);
_planar.fovV->setValue(DefaultFovShortEdge);
_cylindrical.heightOffset->setValue(DefaultHeightOffset);
_fisheye.quality->setCurrentIndex(2);
_sphericalMirror.quality->setCurrentIndex(2);
@@ -816,14 +817,21 @@ void WindowControl::onFovLockClicked() {
}
void WindowControl::updatePlanarLockedFov() {
const float aspectRatio = _windowDimensions.width() / _windowDimensions.height();
const float ratio = aspectRatio / IdealAspectRatio;
if (ratio >= 1.f) {
_planar.fovH->setValue(std::min(DefaultFovH * ratio, 180.f));
_planar.fovV->setValue(DefaultFovV);
bool landscapeOrientation = (_windowDimensions.width() >= _windowDimensions.height());
float aspectRatio;
if (landscapeOrientation) {
aspectRatio = _windowDimensions.width() / _windowDimensions.height();
}
else {
_planar.fovH->setValue(DefaultFovH);
_planar.fovV->setValue(std::min(DefaultFovV / ratio, 180.f));
aspectRatio = _windowDimensions.height() / _windowDimensions.width();
}
float adjustedFov = 2.f * atan(aspectRatio * tan(DefaultFovShortEdge
* std::numbers::pi_v<float> / 180.f / 2.f));
// Convert to degrees and limit to 180°
adjustedFov *= 180.f / std::numbers::pi_v<float>;
adjustedFov = std::min(adjustedFov, 180.f);
_planar.fovH->setValue(landscapeOrientation ? adjustedFov : DefaultFovShortEdge);
_planar.fovV->setValue(landscapeOrientation ? DefaultFovShortEdge : adjustedFov);
}

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: d470316f85...05ed52d053

39
apps/OpenSpace/main.cpp
View File

@@ -80,6 +80,7 @@
#include <launcherwindow.h>
#include <QApplication>
#include <QMessageBox>
using namespace openspace;
using namespace sgct;
@@ -109,7 +110,7 @@ Window* FirstOpenVRWindow = nullptr;
/**
* This struct stores all information about a single render window. Depending on the
* frame setup, each window can be mono or stereo, the information of which is stored in
* the \c leftOrMain and \c right members respectively.
* the `leftOrMain` and `right` members respectively.
*/
struct SpoutWindow {
/// The left framebuffer (or main, if there is no stereo rendering)
@@ -1118,7 +1119,9 @@ int main(int argc, char* argv[]) {
"configuration file without editing the file on disk, for example in a "
"planetarium environment. Please not that the Lua script must not contain any - "
"or they will be interpreted as a new command. Similar, in Bash, ${...} will be "
"evaluated before it is passed to OpenSpace"
"evaluated before it is passed to OpenSpace. Windows does not approve of using \""
"either, so it is recommended to deliniate strings with [[ ]] instead. For "
"example: OpenSpace --config Profile=[[jwst]]"
));
// setCommandLine returns a reference to the vector that will be filled later
@@ -1126,10 +1129,16 @@ int main(int argc, char* argv[]) {
{ argv, argv + argc }
);
bool showHelp = parser.execute();
if (showHelp) {
std::cout << parser.helpText();
exit(EXIT_SUCCESS);
try {
bool showHelp = parser.execute();
if (showHelp) {
std::cout << parser.helpText();
exit(EXIT_SUCCESS);
}
}
catch (const ghoul::RuntimeError& e) {
LFATALC(e.component, e.message);
exit(EXIT_FAILURE);
}
// Take an actual copy of the arguments
std::vector<std::string> arguments = sgctArguments;
@@ -1250,6 +1259,19 @@ int main(int argc, char* argv[]) {
QApplication app(qac, nullptr);
#endif // __APPLE__
std::string pwd = std::filesystem::current_path().string();
if (size_t it = pwd.find_first_of("'\"[]"); it != std::string::npos) {
QMessageBox::warning(
nullptr,
"OpenSpace",
QString::fromStdString(fmt::format(
"The OpenSpace folder is started must not contain any of \"'\", "
"\"\"\", [, or ]. Path is: '{}'. Unexpected errors will occur when "
"proceeding to run the software", pwd
))
);
}
LauncherWindow win(
!hasProfile,
*global::configuration,
@@ -1272,11 +1294,12 @@ int main(int argc, char* argv[]) {
windowConfiguration,
labelFromCfgFile
);
} else {
}
else {
glfwInit();
}
if (global::configuration->profile.empty()) {
LFATAL("Cannot launch with an empty profile");
LFATAL("Cannot launch without a profile");
exit(EXIT_FAILURE);
}

3
config/gui_projector.json
View File

@@ -30,11 +30,10 @@
},
{
"fullscreen": true,
"monitor": 1,
"name": "OpenSpace",
"draw2d": false,
"stereo": "none",
"pos": { "x": 0, "y": 0 },
"pos": { "x": 1920, "y": 1080 },
"size": { "x": 1920, "y": 1080 },
"viewports": [
{

1
config/single.json
View File

@@ -18,6 +18,7 @@
"stereo": "none",
"pos": { "x": 50, "y": 50 },
"size": { "x": 1280, "y": 720 },
"res": { "x": 2560, "y": 1440 },
"viewports": [
{
"tracked": true,

10
config/spout_output_flat.json
View File

@@ -25,7 +25,8 @@
"pos": { "x": 0.0, "y": 0.0 },
"size": { "x": 1.0, "y": 1.0 },
"projection": {
"PlanarProjection": {
"type": "SpoutFlatProjection",
"planarprojection": {
"fov": {
"hfov": 80.0,
"vfov": 50.534015846724
@@ -38,11 +39,10 @@
"b": 0.1,
"a": 1.0
},
"drawMain": true,
"height": "1080",
"drawmain": true,
"height": 1080,
"mappingspoutname": "OS_FLAT",
"type": "SpoutFlatProjection",
"width": "1920"
"width": 1920
}
}
]

6
data/assets/actions/planets/mars_layers.asset
View File

@@ -13,7 +13,7 @@ asset.export("ctx_enable_action", ctx_enable_action.Identifier)
local ctx_disable_action = {
Identifier = "os.mars.ctx.fadedout",
Name = "Fade out CTX Layer",
Name = "Fade out CTX layer",
Command = [[openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.CTX_blended_01.Settings.Opacity", 0, 2.0)]],
Documentation = "Fade out CTX",
GuiPath = "/Solar System/Mars",
@@ -46,7 +46,7 @@ asset.export("hirise_disable_action", hirise_disable_action.Identifier)
local lshirise_enable_action = {
Identifier = "os.mars.lshirise.fadein",
Name = "Fade in HiRISE Local Set",
Name = "Fade in HiRISE local set",
Command = [[
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled", true)
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled", true)
@@ -60,7 +60,7 @@ asset.export("lshirise_enable_action", lshirise_enable_action.Identifier)
local lshirise_disable_action = {
Identifier = "os.mars.lshirise.fadedout",
Name = "Fade out HiRISE Local Set",
Name = "Fade out HiRISE local set",
Command = [[openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Settings.Opacity", 0, 2.0)
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled", false)]],
Documentation = "Fade out HiRISE local set layer for Mars",

6
data/assets/actions/planets/planet_lighting.asset
View File

@@ -28,7 +28,7 @@ local list = openspace.getProperty("Scene." .. node .. ".Renderable.Layers.Night
if (#list > 0) then
openspace.setPropertyValue(list[1], true)
else
openspace.setPropertyValueSingle("Scene." .. node .. ".Renderable.PerformShading", true)
openspace.setPropertyValueSingle("Scene." .. node .. ".Renderable.PerformShading", true)
end
if openspace.hasSceneGraphNode(node .. "Atmosphere") then
openspace.setPropertyValueSingle("Scene." .. node .. "Atmosphere.Renderable.SunFollowingCamera", false)
@@ -45,11 +45,11 @@ end
local function getIlluminationAction(node, node_lower, global)
local actionString = "_standard_illumination"
local actionName = "Standard Illumination"
local actionName = "standard illumination"
local actionCommand = getIlluminationCommand(node, global)
if (global) then
actionString = "_global_illumination"
actionName = "Global Illumination"
actionName = "global illumination"
actionCommand = getIlluminationCommand(node, global)
end

2
data/assets/actions/planets/scale_planets_and_moons.asset
View File

@@ -28,7 +28,7 @@ end
local function getToggleScaleAction(identifier, scale, name, speedup, speedown)
local action = {
Identifier = "os.toggle_" .. string.gsub(name, "%s+", "") .. "_scale",
Name = "Toggle " .. name .. " Scale",
Name = "Toggle " .. name .. " scale",
Command = [[
local list = openspace.getProperty("]] .. identifier .. [[.Scale.Scale");
if #list == 0 then

2
data/assets/actions/system/undo_event_fades.asset
View File

@@ -1,6 +1,6 @@
local undo_event_fade = {
Identifier = "os.undo_event_fade",
Name = "Undo All Event Fading",
Name = "Undo all event fading",
Command = [[
openspace.setPropertyValue("Scene.*.Renderable.Fade", 1.0, 0.5);
]],

18
data/assets/actions/trails/on_off_all_minor_moons.asset
View File

@@ -1,6 +1,6 @@
local minormoons_on = {
Identifier = "os_default.minormoons_on",
Name = "Turn ON minor moons and trails",
Name = "Turn on minor moons and trails",
Command = [[
local trails = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
local trails_fade = openspace.getProperty('{moonTrail_minor}.Renderable.Fade');
@@ -8,14 +8,14 @@ local minormoons_on = {
local moons = openspace.getProperty('{moon_minor}.Renderable.Enabled');
local moons_fade = openspace.getProperty('{moon_minor}.Renderable.Fade');
for i, v in pairs(trails_fade) do
for i, v in pairs(trails_fade) do
openspace.setPropertyValueSingle(trails[i], true)
openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
end
for i, v in pairs(moons_fade) do
for i, v in pairs(moons_fade) do
openspace.setPropertyValueSingle(moons[i], true)
openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
openspace.setPropertyValueSingle(v, 1, 2, 'Linear')
end
]],
Documentation = "Turn ON minor moons and their trails for all planets in the solar system",
@@ -25,7 +25,7 @@ local minormoons_on = {
local minormoons_off = {
Identifier = "os_default.minormoons_off",
Name = "Turn OFF minor moons and trails",
Name = "Turn off minor moons and trails",
Command = [[
local trails = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
local trails_fade = openspace.getProperty('{moonTrail_minor}.Renderable.Fade');
@@ -33,12 +33,12 @@ local minormoons_off = {
local moons = openspace.getProperty('{moon_minor}.Renderable.Enabled');
local moons_fade = openspace.getProperty('{moon_minor}.Renderable.Fade');
for i, v in pairs(trails_fade) do
openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" )
for i, v in pairs(trails_fade) do
openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. trails[i] .. "', false)" )
end
for i, v in pairs(moons_fade) do
openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" )
openspace.setPropertyValueSingle(v, 0, 2, 'Linear', "openspace.setPropertyValueSingle('" .. moons[i] .. "', false)" )
end
]],
Documentation = "Turn OFF minor moons and their trails for all planets in the solar system",

8
data/assets/actions/trails/toggle_all_minor_moon_trails.asset
View File

@@ -1,10 +1,10 @@
local toggle_minormoon_trails = {
Identifier = "os_default.toggle_minormoon_trails",
Name = "Toggle Minor Moon Trails",
Name = "Toggle minor moon trails",
Command = [[
local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggle on/off minor moon trails for all planets in the solar system",

6
data/assets/actions/trails/toggle_all_trails.asset
View File

@@ -1,6 +1,6 @@
local fade_up_trails = {
Identifier = "os.fade_up_trails",
Name = "Show All Trails",
Name = "Show all trails",
Command = [[
local capList = openspace.getProperty("Scene.*Trail.Renderable.Fade");
for _,v in ipairs(capList) do
@@ -19,7 +19,7 @@ asset.export("fade_up_trails", fade_up_trails.Identifier)
local fade_down_trails = {
Identifier = "os.fade_down_trails",
Name = "Hide All Trails",
Name = "Hide all trails",
Command = [[
local capList = openspace.getProperty("Scene.*Trail.Renderable.Fade");
for _,v in ipairs(capList) do
@@ -38,7 +38,7 @@ asset.export("fade_down_trails", fade_down_trails.Identifier)
local toggle_trails = {
Identifier = "os.toggle_trails",
Name = "Toggle All Trails",
Name = "Toggle all trails",
Command = [[
local capList = openspace.getProperty("*Trail.Renderable.Fade");
local list = openspace.getProperty("*trail.Renderable.Fade");

2
data/assets/actions/trails/toggle_all_trails_planets_moons_instant.asset
View File

@@ -1,6 +1,6 @@
local toggle_trails = {
Identifier = "os_default.toggle_trails",
Name = "Toggle Planet and Moon Trails (Instant)",
Name = "Toggle planet and moon trails (instant)",
Command = [[
local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled");
for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end

6
data/assets/actions/trails/toggle_trail.asset
View File

@@ -1,6 +1,6 @@
local toggle_trail = {
Identifier = "os.toggle_trail",
Name = "Toggle Trail",
Name = "Toggle trail",
Command = [[
local node
if is_declared("args") then
@@ -48,7 +48,7 @@ asset.export("toggle_trail", toggle_trail.Identifier)
local hide_trail = {
Identifier = "os.hide_trail",
Name = "Hide Trail",
Name = "Hide trail",
Command = [[
local node
if is_declared("args") then
@@ -73,7 +73,7 @@ asset.export("hide_trail", hide_trail.Identifier)
local show_trail = {
Identifier = "os.show_trail",
Name = "Show Trail",
Name = "Show trail",
Command = [[
local node
if is_declared("args") then

6
data/assets/actions/trails/toggle_trails_planets_moons.asset
View File

@@ -1,6 +1,6 @@
local fade_up_trails = {
Identifier = "os.fade_up_trails_planets_moon",
Name = "Show Planet and Moon Trails",
Name = "Show planet and moon trails",
Command = [[
openspace.setPropertyValue("{planetTrail_solarSystem}.Renderable.Fade", 1, 2);
openspace.setPropertyValue("{moonTrail_solarSystem}.Renderable.Fade", 1, 2);
@@ -13,7 +13,7 @@ asset.export("fade_up_trails", fade_up_trails.Identifier)
local fade_down_trails = {
Identifier = "os.fade_down_trails_planets_moon",
Name = "Hide Planet and Moon Trails",
Name = "Hide planet and moon trails",
Command = [[
openspace.setPropertyValue("{planetTrail_solarSystem}.Renderable.Fade", 0, 2);
openspace.setPropertyValue("{moonTrail_solarSystem}.Renderable.Fade", 0, 2);
@@ -26,7 +26,7 @@ asset.export("fade_down_trails", fade_down_trails.Identifier)
local toggle_trails = {
Identifier = "os.toggle_trails_planets_moon",
Name = "Toggle Planet and Moon Trails",
Name = "Toggle planet and moon trails",
Command = [[
local capList = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Fade");
local list = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Fade");

10
data/assets/actions/trails/trail_appearance.asset
View File

@@ -1,6 +1,6 @@
local enable_trail_fading = {
Identifier = "os.enable_trail_fading",
Name = "Enable Trail Fading",
Name = "Enable trail fading",
Command = [[
openspace.setPropertyValue("Scene.*Trail.Renderable.Appearance.EnableFade", true);
openspace.setPropertyValue("Scene.*trail.Renderable.Appearance.EnableFade", true);
@@ -13,7 +13,7 @@ asset.export("enable_trail_fading", enable_trail_fading.Identifier)
local disable_trail_fading = {
Identifier = "os.disable_trail_fading",
Name = "Disable Trail Fading",
Name = "Disable trail fading",
Command = [[
openspace.setPropertyValue("Scene.*Trail.Renderable.Appearance.EnableFade", false);
openspace.setPropertyValue("Scene.*trail.Renderable.Appearance.EnableFade", false);
@@ -26,7 +26,7 @@ asset.export("disable_trail_fading", disable_trail_fading.Identifier)
local toggle_trail_fading = {
Identifier = "os.toggle_trail_fading",
Name = "Toggle Trail Fading",
Name = "Toggle trail fading",
Command = [[
local capList = openspace.getProperty("*Trail.Renderable.Appearance.EnableFade")
local list = openspace.getProperty("*trail.Renderable.Appearance.EnableFade")
@@ -69,7 +69,7 @@ local function getHighlightAction(identifierString, value, nameString)
end
local action = {
Identifier = "os." .. actionString .. identifierString .. "_trail",
Name = actionString .. " " .. nameString .. " Trail",
Name = actionString .. " " .. nameString .. " trail",
Command = getHightlightCommand(identifierString, value),
Documentation = "Animates the trail fade of " .. nameString .. "'s Trail",
GuiPath = "/Trails/Appearance",
@@ -81,7 +81,7 @@ end
local function getToggleHighlightAction(identifierString, value, nameString)
local action = {
Identifier = "os.toggle_" .. identifierString .. "_trail_highlight",
Name = "Toggle " .. nameString .. " Trail Highlight",
Name = "Toggle " .. nameString .. " trail highlight",
Command = [[
local list = openspace.getProperty("]] .. identifierString .. [[.Renderable.Appearance.Fade");
if #list == 0 then

44
data/assets/base.asset
View File

@@ -57,53 +57,9 @@ asset.require("scene/digitaluniverse/voids")
asset.require("customization/globebrowsing")
asset.require("util/default_actions")
local toggle_trails = {
Identifier = "os_default.toggle_trails",
Name = "Toggle Trails",
Command = [[
local list = openspace.getProperty("{planetTrail_solarSystem}.Renderable.Enabled");
for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
local moonlist = openspace.getProperty("{moonTrail_solarSystem}.Renderable.Enabled");
for _,v in pairs(moonlist) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
]],
Documentation = "Toggles the visibility of planet and moon trails",
GuiPath = "/Rendering",
IsLocal = false,
Key = "h"
}
local toggle_planet_labels = {
Identifier = "os_default.toggle_planet_labels",
Name = "Toggle planet labels",
Command = [[
local list = openspace.getProperty("{solarsystem_labels}.Renderable.Enabled");
for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
]],
Documentation = "Turns on visibility for all solar system labels",
GuiPath = "/Rendering",
IsLocal = false,
Key = "l"
}
local trailAction = asset.require("actions/trails/toggle_trails_planets_moons").toggle_trails
asset.onInitialize(function ()
openspace.bindKey("h", trailAction.Identifier)
openspace.action.registerAction(toggle_planet_labels)
openspace.bindKey(toggle_planet_labels.Key, toggle_planet_labels.Identifier)
openspace.globebrowsing.loadWMSServersFromFile(
openspace.absPath("${DATA}/globebrowsing_servers.lua")
)
end)
asset.onDeinitialize(function ()
openspace.clearKey(toggle_trails.Key)
openspace.action.removeAction(toggle_planet_labels)
openspace.clearKey(toggle_planet_labels.Key)
end)

30
data/assets/base_keybindings.asset Normal file
View File

@@ -0,0 +1,30 @@
asset.require("./base")
local trailAction = asset.require("actions/trails/toggle_trails_planets_moons").toggle_trails
local toggle_planet_labels = {
Identifier = "os_default.toggle_planet_labels",
Name = "Toggle planet labels",
Command = [[
local list = openspace.getProperty("{solarsystem_labels}.Renderable.Enabled");
for _,v in pairs(list) do openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v)) end
]],
Documentation = "Turns on visibility for all solar system labels",
GuiPath = "/Solar System",
IsLocal = false,
Key = "l"
}
asset.onInitialize(function ()
openspace.action.registerAction(toggle_planet_labels)
openspace.bindKey(toggle_planet_labels.Key, toggle_planet_labels.Identifier)
openspace.bindKey("h", trailAction.Identifier)
end)
asset.onDeinitialize(function ()
openspace.clearKey("h")
openspace.action.removeAction(toggle_planet_labels)
openspace.clearKey(toggle_planet_labels.Key)
end)

2
data/assets/customization/globebrowsing.asset
View File

@@ -23,7 +23,7 @@ local vrt_folders = {
-- if areas overlap (for example CTX and HiRISE) and CTX is specified *after* HiRISE,
-- CTX will stomp over the HiRISE.
-- tl;dr: Specify CTX folders first, then HiRISE
-- tl;dr: Specify CTX folders first, then HiRISE
-- example: "C:/OpenSpace/GlobeBrowsingData/Mars/CTX"
-- We recommend using this folder for CTX

4
data/assets/educational/scale/eiffeltower.asset
View File

@@ -48,7 +48,7 @@ local eiffelTower = {
local updatePositionAction = {
Identifier = "os.drop_eiffel_tower",
Name = "Drop Eiffel Tower under camera",
Name = "Drop Eiffel tower under camera",
Command = [[
local lat, lon, alt = openspace.globebrowsing.getGeoPositionForCamera();
local camera = openspace.navigation.getNavigationState();
@@ -67,7 +67,7 @@ local updatePositionAction = {
local resetPositionAction = {
Identifier = "os.reset_eiffel_tower",
Name = "Reset Eiffel Tower position",
Name = "Reset Eiffel tower position",
Command = [[
-- same position as above
local lat = 48.85824

2
data/assets/events/toggle_sun.asset
View File

@@ -19,7 +19,7 @@ local toggle_sun = {
openspace.setPropertyValueSingle("Scene.Sun.Renderable.Fade", 0.0, 1.0)
end
]],
Documentation = [[Toggles the visibility of the Sun glare and the Sun globe when the
Documentation = [[Toggles the visibility of the Sun glare and the Sun globe when the
camera is approaching either so that from far away the Sun Glare is rendered and when
close up, the globe is rendered instead]],
GuiPath = "/Solar System/Sun",

2
data/assets/examples/approachevents.asset
View File

@@ -3,7 +3,7 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
local generic_action = {
Identifier = "os.example.generic",
Name = "Generic Example",
Name = "Generic example",
Command = [[
openspace.printInfo("Node: " .. args.Node)
openspace.printInfo("Transition: " .. args.Transition)

4
data/assets/modules/exoplanets/exoplanets_data.asset
View File

@@ -2,7 +2,7 @@ local DataPath = asset.syncedResource({
Name = "Exoplanet Data Files",
Type = "HttpSynchronization",
Identifier = "exoplanets_data",
Version = 3
Version = 4
})
local colormaps = asset.syncedResource({
@@ -30,7 +30,7 @@ asset.export("DataPath", DataPath)
asset.meta = {
Name = "Exoplanet Data",
Version = "3.0",
Version = "4.0",
Description = [[The data that is used for the exoplanet systems. The data has been
derived from the 'Planetary Systems Composite Data' dataset from the NASA Exoplanet
Archive]],

5
data/assets/modules/touch/default_settings.asset
View File

@@ -1,4 +1,9 @@
asset.onInitialize(function ()
-- Avoid errors for developers when building without the touch module
if not openspace.modules.isLoaded("Touch") then
return
end
openspace.setPropertyValueSingle("Modules.Touch.EnableTouchInteraction", true)
-- A list of renderable types that apply the "direct manipulation". Works best for

4
data/assets/scene/digitaluniverse/alternatestarlabels.asset
View File

@@ -11,6 +11,7 @@ local object = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "stars-altlbl.label",
Color = { 0.4, 0.4, 0.4 },
Size = 14.7,
@@ -19,8 +20,7 @@ local object = {
},
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
Unit = "pc",
DrawLabels = true
Unit = "pc"
},
GUI = {
Name = "Stars Labels - Alternate",

4
data/assets/scene/digitaluniverse/backgroundradiation.asset
View File

@@ -29,7 +29,6 @@ local wmap = {
Texture = textures .. "wmap_ilc_7yr_v4_200uK_RGB_sos.png",
Orientation = "Both",
MirrorTexture = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -55,7 +54,6 @@ local cbe = {
Texture = textures .. "COBErect.png",
Orientation = "Both",
MirrorTexture = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -81,7 +79,6 @@ local planck = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -107,7 +104,6 @@ local Halpha = {
Opacity = 0.4,
Texture = textures .. "mwHalpha-f.png",
Orientation = "Inside",
RenderBinMode = "PreDeferredTransparent",
MirrorTexture = true,
FadeOutThreshold = 0.025,
Background = true

4
data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset
View File

@@ -26,7 +26,6 @@ local multiverse_planck_1 = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -56,7 +55,6 @@ local multiverse_planck_2 = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -86,7 +84,6 @@ local multiverse_planck_3 = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {
@@ -116,7 +113,6 @@ local multiverse_planck_4 = {
Texture = textures .. "cmb4k.jpg",
Orientation = "Both",
MirrorTexture = true,
RenderBinMode = "PreDeferredTransparent",
FadeInThreshold = 0.4
},
GUI = {

4
data/assets/scene/digitaluniverse/clusters.asset
View File

@@ -11,6 +11,7 @@ local object = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "galclust.label",
Color = { 1.0, 0.44, 0.0 },
Size = 22,
@@ -20,13 +21,12 @@ local object = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
Unit = "Mpc",
DrawLabels = true,
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,
-0.074553778365, -0.080991471307, 0.9939225904, 0.0,
0.67314530211, 0.73127116582, 0.11008126223, 0.0,
0.0, 0.0, 0.0, 1.0
},
}
},
GUI = {
Name = "Galaxy Cluster Labels",

42
data/assets/scene/digitaluniverse/grids.asset
View File

@@ -7,12 +7,26 @@ local equatorialRotationMatrix = {
-0.483835 , 0.7469823, 0.4559838
}
local equatorialTransformationMatrix = {
-0.05487554, 0.4941095, -0.8676661, 0.0,
-0.8734371 , -0.4448296, -0.1980764, 0.0,
-0.483835 , 0.7469823, 0.4559838, 0.0,
0.0 , 0.0 , 0.0 , 1.0
}
local eclipticRotationMatrix = {
-0.05487554, 0.4941095, -0.8676661,
-0.9938214 , -0.1109906, -0.0003515167,
-0.09647644, 0.8622859, 0.4971472
}
local eclipticTransformationMatrix = {
-0.05487554, 0.4941095, -0.8676661, 0.0,
-0.9938214 , -0.1109906, -0.0003515167, 0.0,
-0.09647644, 0.8622859, 0.4971472, 0.0,
0.0 , 0.0 , 0.0 , 1.0
}
local speck = asset.syncedResource({
Name = "Grids Speck Files",
Type = "HttpSynchronization",
@@ -112,22 +126,18 @@ local eclipticLabels = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "eclip.label",
Color = { 0.5, 0.5, 0.5 },
Size = 14.75,
MinMaxSize = { 1, 50 },
Unit = "pc"
Unit = "pc",
TransformationMatrix = eclipticTransformationMatrix
},
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
Unit = "pc",
DrawLabels = true,
TransformationMatrix = {
-0.05487554, 0.4941095, -0.8676661, 0.0,
-0.9938214 , -0.1109906, -0.0003515167, 0.0,
-0.09647644, 0.8622859, 0.4971472, 0.0,
0.0, 0.0, 0.0, 1.0
}
TransformationMatrix = eclipticTransformationMatrix
},
GUI = {
Name = "Ecliptic Sphere Labels",
@@ -168,22 +178,18 @@ local equatorialLabels = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "radec.label",
Color = { 0.5, 0.5, 0.5 },
Size = 14.5,
MinMaxSize = { 2, 70 },
Unit = "pc"
Unit = "pc",
TransformationMatrix = equatorialTransformationMatrix
},
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
Unit = "pc",
DrawLabels = true,
TransformationMatrix = {
-0.05487554, 0.4941095, -0.8676661, 0.0,
-0.8734371 , -0.4448296, -0.1980764, 0.0,
-0.483835 , 0.7469823, 0.4559838, 0.0,
0.0 , 0.0 , 0.0 , 1.0
}
TransformationMatrix = equatorialTransformationMatrix
},
GUI = {
Name = "Equatorial Sphere Labels",
@@ -220,6 +226,7 @@ local galacticLabels = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "galac.label",
Color = { 0.5, 0.5, 0.5 },
Size = 15.8,
@@ -228,8 +235,7 @@ local galacticLabels = {
},
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
Unit = "pc",
DrawLabels = true
Unit = "pc"
},
GUI = {
Name = "Galactic Sphere Labels",

2
data/assets/scene/digitaluniverse/groups.asset
View File

@@ -11,6 +11,7 @@ local object = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "groups.label",
Color = { 0.1, 0.6, 0.2 },
Size = 21.5,
@@ -21,7 +22,6 @@ local object = {
Opacity = 0.65,
--ScaleFactor = 10.0,
Unit = "Mpc",
DrawLabels = true,
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,
-0.074553778365, -0.080991471307, 0.9939225904, 0.0,

2
data/assets/scene/digitaluniverse/milkyway_label.asset
View File

@@ -11,6 +11,7 @@ local homeLabel = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = homespeck .. "home.label",
Color = { 0.8, 0.8, 0.8 },
Size = 20.50,
@@ -20,7 +21,6 @@ local homeLabel = {
Color = { 1.0, 0.4, 0.2 },
Opacity = 0.99,
ScaleFactor = 500.0,
DrawLabels = true,
Unit = "Mpc",
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,

1
data/assets/scene/digitaluniverse/milkyway_sphere.asset
View File

@@ -21,7 +21,6 @@ local sphere = {
Opacity = 0.35,
Texture = sphereTextures .. "DarkUniverse_mellinger_4k.jpg",
Orientation = "Inside",
RenderBinMode = "PreDeferredTransparent",
MirrorTexture = true,
FadeOutThreshold = 0.0015,
Background = true,

4
data/assets/scene/digitaluniverse/starlabels.asset
View File

@@ -11,6 +11,7 @@ local object = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "stars.label",
Color = { 0.4, 0.4, 0.4 },
Size = 14.7,
@@ -19,8 +20,7 @@ local object = {
},
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
Unit = "pc",
DrawLabels = true
Unit = "pc"
},
GUI = {
Name = "Stars Labels",

2
data/assets/scene/digitaluniverse/starorbits.asset
View File

@@ -191,7 +191,7 @@ asset.meta = {
Version = "1.1",
Description = [[Select Star Orbital paths that delineate their trajectory around the
Milky Way over 1 billion years into the future. Included: Sun, Barnards, Kapteyns,
Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415. <br><br> Data
Lacaille 9352, LSR1826+3014, LSRJ0822+1700, PM_J13420-3415. <br><br> Data
Reference: Sebastien Lepine (AMNH)]],
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",

2
data/assets/scene/digitaluniverse/superclusters.asset
View File

@@ -18,6 +18,7 @@ local object = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "superclust.label",
Color = { 0.9, 0.9, 0.9 },
Size = 22.44,
@@ -31,7 +32,6 @@ local object = {
Texture = textures .. "point3A.png",
Unit = "Mpc",
ScaleFactor = 531.0,
DrawLabels = true,
-- BillboardMinMaxSize = { 0.0, 7.2 },
EnablePixelSizeControl = true
},

1
data/assets/scene/digitaluniverse/tully.asset
View File

@@ -34,7 +34,6 @@ local tullyPoints = {
--ColorOption = { "proximity" },
ColorOption = { "prox5Mpc" },
ColorRange = { { 1.0, 30.0 } },
DrawLabels = false,
Unit = "Mpc",
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,

2
data/assets/scene/digitaluniverse/voids.asset
View File

@@ -11,6 +11,7 @@ local object = {
Type = "RenderableBillboardsCloud",
Enabled = false,
Labels = {
Enabled = true,
File = speck .. "voids.label",
Color = { 0.296, 0.629, 1.0 },
Size = 20.9,
@@ -18,7 +19,6 @@ local object = {
Unit = "Mpc"
},
DrawElements = false,
DrawLabels = true,
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
Unit = "Mpc"

10
data/assets/scene/milkyway/constellations/constellation_art.asset
View File

@@ -124,7 +124,7 @@ end
local show_art = {
Identifier = "constellation_art.show_art",
Name = "Show Constellation Art",
Name = "Show constellation art",
Command = [[
openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0);
openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Enabled", true);
@@ -138,7 +138,7 @@ asset.export("ShowArtAction", show_art)
local hide_art = {
Identifier = "constellation_art.hide_art",
Name = "Hide Constellation Art",
Name = "Hide constellation art",
Command = [[openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0, 2)]],
Documentation = "Fades out constellation artwork",
GuiPath = "/Rendering",
@@ -148,7 +148,7 @@ asset.export("HideArtAction", hide_art)
local disable_art = {
Identifier = "constellation_art.disable_art",
Name = "Disable Constellation Art",
Name = "Disable constellation art",
Command = [[openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Enabled", false)]],
Documentation = "Disable constellation artwork",
GuiPath = "/Rendering",
@@ -158,7 +158,7 @@ asset.export("DisableArtAction", disable_art)
local show_zodiac_art = {
Identifier = "constellation_art.show_zodiac_art",
Name = "Show Zodiac Art",
Name = "Show zodiac art",
Command = [[
openspace.setPropertyValue("Scene.ImageConstellation*.Renderable.Opacity", 0);
openspace.setPropertyValue("{zodiac}.Renderable.Enabled",true);
@@ -172,7 +172,7 @@ asset.export("ShowZodiacArt", show_zodiac_art)
local hide_zodiac_art = {
Identifier = "constellation_art.hide_zodiac_art",
Name = "Hide Zodiac Art",
Name = "Hide zodiac art",
Command = [[openspace.setPropertyValue("{zodiac}.Renderable.Opacity", 0, 2)]],
Documentation = "fades down zodiac art work",
GuiPath = "/Rendering",

3
data/assets/scene/milkyway/milkyway/eso.asset
View File

@@ -19,7 +19,6 @@ local object = {
Segments = 40,
Opacity = 0.4,
Texture = textures .. "eso0932a_blend.png",
RenderBinMode = "PreDeferredTransparent",
Orientation = "Inside",
MirrorTexture = true,
FadeOutThreshold = 0.01,
@@ -48,7 +47,7 @@ asset.export(object)
asset.meta = {
Name = "MilkyWay Galaxy (ESO)",
Version = "1.0",
Description = [[This asset contains an alternate to the Digital Universe image for the
Description = [[This asset contains an alternate to the Digital Universe image for the
Milky Way from ESO]],
Author = "ESO/S. Brunier",
URL = "https://www.eso.org/public/usa/images/eso0932a/",

20
data/assets/scene/milkyway/objects/orionnebula/cluster.asset
View File

@@ -36,16 +36,16 @@ local OrionClusterStars = {
Path = "/Milky Way/Orion",
Description = [[In order to have an accurate depiction of the Orion nebula, we
need to include the star cluster that was birthed from it. We turned to a study of the
cluster's stellar population by Lynne Hillenbrand, who was working at the University of
California, Berkeley at the time. The catalog from her paper contains more than 1500
stars, about half the stars in the actual cluster. The cluster is very crowded, with a
peak density of 10000 stars per cubic parsec over a wide range of masses from a tenth the
sun's mass up to 50 times its mass. We were presented with one problem: there are no
distances. For the stellar distances, we needed to deduce them by statistical methods.
Knowing the size of the cluster and approximating the shape to be roughly spherical, we
placed each star along a line of sight through this imaginary sphere centered on the
cluster. In this sense, these data are observed data and the view from Earth is accurate.
But the distance of each star has been derived from this educated-guess approach for the
cluster's stellar population by Lynne Hillenbrand, who was working at the University of
California, Berkeley at the time. The catalog from her paper contains more than 1500
stars, about half the stars in the actual cluster. The cluster is very crowded, with a
peak density of 10000 stars per cubic parsec over a wide range of masses from a tenth the
sun's mass up to 50 times its mass. We were presented with one problem: there are no
distances. For the stellar distances, we needed to deduce them by statistical methods.
Knowing the size of the cluster and approximating the shape to be roughly spherical, we
placed each star along a line of sight through this imaginary sphere centered on the
cluster. In this sense, these data are observed data and the view from Earth is accurate.
But the distance of each star has been derived from this educated-guess approach for the
cluster distribution]]
}
}

22
data/assets/scene/milkyway/objects/orionnebula/nebula.asset
View File

@@ -28,18 +28,18 @@ local NebulaHolder = {
GUI = {
Name = "Orion Nebula",
Path = "/Milky Way/Orion",
Description = [[In the Digital Universe model of the Orion Nebula, we depict the
ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped
Description = [[In the Digital Universe model of the Orion Nebula, we depict the
ionization front effectively as a terrain, with a flat Hubble image of the nebula mapped
on the undulating surface. In reality, the ionization front has a slight thickness to
it - about a third of a light year - but is quite thin compared to the overall size of
the nebula, which stretches about ten light years from side to side.<br><br>Close into
the center, we see small teardrop-shaped structures with their narrow ends pointing away
from the bright star: these are protoplanetary disks, or proplyds, of dense gas and dust
surrounding young stars. The larger formations that one sees farther away from the center
of the nebula take on a cup-like shape, with the narrow end pointing away from the
nebulas center. These enormous structures are bow shocks that delineate the region where
highspeed winds from the central star slow from supersonic to subsonic speeds. You can
think of an HII region as a sort of tremendous explosion, taking place over millennia,
it - about a third of a light year - but is quite thin compared to the overall size of
the nebula, which stretches about ten light years from side to side.<br><br>Close into
the center, we see small teardrop-shaped structures with their narrow ends pointing away
from the bright star: these are protoplanetary disks, or proplyds, of dense gas and dust
surrounding young stars. The larger formations that one sees farther away from the center
of the nebula take on a cup-like shape, with the narrow end pointing away from the
nebulas center. These enormous structures are bow shocks that delineate the region where
highspeed winds from the central star slow from supersonic to subsonic speeds. You can
think of an HII region as a sort of tremendous explosion, taking place over millennia,
and the bow shocks are part of the outward rush of material]]
}
}

2
data/assets/scene/solarsystem/heliosphere/bastille_day/fieldlines.asset
View File

@@ -49,7 +49,7 @@ local fieldlines = {
local toggle_fieldlines = {
Identifier = "os.events.bastilleday.fieldlines.togglefieldlines",
Name = "Toggle Fieldlines",
Name = "Toggle fieldlines",
Command = propertyHelper.invert("Scene.MAS-MHD-Fieldlines-bastille-day-2000.Renderable.Enabled"),
Documentation = "Toggle fieldline rendering of CME",
GuiPath = "/Bastille-Day 2000",

2
data/assets/scene/solarsystem/heliosphere/bastille_day/magnetogram_textures.asset
View File

@@ -61,7 +61,7 @@ asset.meta = {
Name = "Bastille Day magnetogram textures",
Version = "1.1",
Description = [[This asset adds multiple magnetogram textures to the Sun. In addition
it provides an action to cycle through the textures. See magnetogram.asset for details
it provides an action to cycle through the textures. See magnetogram.asset for details
of the textures]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",

14
data/assets/scene/solarsystem/missions/apollo/11/actions.asset
View File

@@ -4,13 +4,13 @@ local apollo11_setup_landingsite = {
Identifier = "os.missions.apollo11.setup.landingsite",
Name = "Setup Apollo 11 landing site",
Command = [[
openspace.time.setTime('1969 JUL 20 20:17:40');
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.TargetLodScaleFactor', 20.11);
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo11LemPosition');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', true);
openspace.time.setTime('1969 JUL 20 20:17:40');
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.TargetLodScaleFactor', 20.11);
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo11LemPosition');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', true);
openspace.setPropertyValueSingle('Scene.Apollo11LemTrail.Renderable.Enabled', true);
]],
Documentation = "Setup for Apollo 11 landing site",

4
data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
View File

@@ -23,7 +23,7 @@ asset.onInitialize(function ()
rawset(_G, "nextFlip", function() helper.nextFlipbookPage(flipbook) end)
openspace.action.registerAction({
Identifier = "lem_flipbook.next_flip",
Name = "Next A11 flip",
Name = "Next Apollo 11 flip",
Command = "nextFlip()",
Documentation = "Show the next Apollo 11 flipbook image",
GuiPath = "/Missions/Apollo/11",
@@ -33,7 +33,7 @@ asset.onInitialize(function ()
rawset(_G, "previousFlip", function() helper.previousFlipbookPage(flipbook) end)
openspace.action.registerAction({
Identifier = "lem_flipbook.prev_flip",
Name = "Prev A11 flip",
Name = "Prev Apollo 11 flip",
Command = "previousFlip()",
Documentation = "Show the previous Apollo 11 flipbook image",
GuiPath = "/Missions/Apollo/11",

20
data/assets/scene/solarsystem/missions/apollo/17/actions.asset
View File

@@ -4,17 +4,17 @@ local apollo17_setup_landingsite = {
Identifier = "os.missions.apollo17.setup.landingsite",
Name = "Setup for Apollo 17 landing site",
Command = [[
openspace.time.setTime('1972 DEC 12 19:47:11');
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.BlendMode', 0.000000);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_17.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.BlendMode', 0.000000);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_NAC_Alt_p.Enabled', true);
openspace.time.setTime('1972 DEC 12 19:47:11');
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.BlendMode', 0.000000);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_travmap.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_17.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_LEM.BlendMode', 0.000000);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_NAC_Alt_p.Enabled', true);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_NAC_Alt_p.BlendMode', 0.000000);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.TargetLodScaleFactor', 20.17);
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo17LemModel');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.TargetLodScaleFactor', 20.17);
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Apollo17LemModel');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A17_station7.BlendMode', 0.000000);
]],
Documentation = "Setup for Apollo 17 landing site",

10
data/assets/scene/solarsystem/missions/apollo/8/actions.asset
View File

@@ -2,10 +2,10 @@ local apollo8_setup_earthrise = {
Identifier = "os.missions.apollo8.setup.earthrise",
Name = "Set Earthrise time",
Command = [[
openspace.time.setPause(true);
openspace.time.setDeltaTime(1);
openspace.time.setTime('1968 DEC 24 16:37:31');
openspace.navigation.setNavigationState({Anchor = 'Apollo8', Position = { 1.494592E1, 3.236777E1, -4.171296E1 }, ReferenceFrame = 'Root', Up = { 0.960608E0, -0.212013E0, 0.179675E0 }});
openspace.time.setPause(true);
openspace.time.setDeltaTime(1);
openspace.time.setTime('1968 DEC 24 16:37:31');
openspace.navigation.setNavigationState({Anchor = 'Apollo8', Position = { 1.494592E1, 3.236777E1, -4.171296E1 }, ReferenceFrame = 'Root', Up = { 0.960608E0, -0.212013E0, 0.179675E0 }});
openspace.setPropertyValue('*Trail.Renderable.Enabled', false);
]],
Documentation = "Jump to right before the earthrise photo",
@@ -17,7 +17,7 @@ local apollo8_setup_launch = {
Identifier = "os.missions.apollo8.setup.launch",
Name = "Set Apollo 8 launch time",
Command = [[
openspace.time.setTime('1968-12-21T12:51:37.00');
openspace.time.setTime('1968-12-21T12:51:37.00');
openspace.setPropertyValueSingle('Scene.Apollo8LaunchTrail.Renderable.Enabled', true);
]],
Documentation = "Jump to time right before Apollo 8 liftoff, with its trail enabled",

10
data/assets/scene/solarsystem/missions/apollo/actions.asset
View File

@@ -13,8 +13,8 @@ local focus_moon = {
Identifier = "os.missions.apollo.moon.focus",
Name = "Focus on Moon",
Command = [[
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Moon');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
]],
Documentation = "Set camera focus on the Moon",
@@ -26,8 +26,8 @@ local focus_earth = {
Identifier = "os.missions.apollo.earth.focus",
Name = "Focus on Earth",
Command = [[
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
]],
Documentation = "Set camera focus on the Earth",
@@ -38,7 +38,7 @@ local focus_earth = {
asset.onInitialize(function()
openspace.action.registerAction(toggle_moon_shading)
openspace.action.registerAction(focus_moon)
openspace.action.registerAction(focus_earth)
openspace.action.registerAction(focus_earth)
end)
asset.onDeinitialize(function()

12
data/assets/scene/solarsystem/missions/apollo/apollo_globebrowsing.asset
View File

@@ -44,17 +44,17 @@ local apollo_moon_disableapollosites= {
Identifier = "os.missions.apollo.moon.disableapollosites",
Name = "Disable Apollo sites",
Command = [[
openspace.setPropertyValue('Scene.Moon.Renderable.Layers.ColorLayers.A17_*.Enabled', false);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', false);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', false);
openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', false);
openspace.setPropertyValueSingle('Scene.Apollo11LemTrail.Renderable.Enabled', false);
openspace.setPropertyValue('Scene.Moon.Renderable.Layers.ColorLayers.A17_*.Enabled', false);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_11.Enabled', false);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.ColorLayers.A11_M177481212_p_longlat.Enabled', false);
openspace.setPropertyValueSingle('Scene.Apollo11MoonTrail.Renderable.Enabled', false);
openspace.setPropertyValueSingle('Scene.Apollo11LemTrail.Renderable.Enabled', false);
openspace.setPropertyValueSingle('Scene.Moon.Renderable.Layers.HeightLayers.LRO_NAC_Apollo_17.Enabled', false);
]],
Documentation = "Disable apollo site on moon when leaving",
GuiPath = "/Missions/Apollo",
IsLocal = false
}
}
asset.onInitialize(function ()
openspace.globebrowsing.addBlendingLayersFromDirectory(heightmaps, moon_transforms.Moon.Identifier)

4
data/assets/scene/solarsystem/missions/apollo/insignias_map.asset
View File

@@ -85,7 +85,7 @@ end
local show_apollo_labels = {
Identifier = "apollo_insignias.show_insignias",
Name = "Show Apollo Landing Labels",
Name = "Show Apollo landing labels",
Command = [[openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 1, 0.5)]],
Documentation = "Show patches of the Apollo missions on their respective landing sites",
GuiPath = "/Missions/Apollo",
@@ -94,7 +94,7 @@ local show_apollo_labels = {
local hide_apollo_labels = {
Identifier = "apollo_insignias.hide_insignias",
Name = "Hide Apollo Landing Labels",
Name = "Hide Apollo landing labels",
Command = [[openspace.setPropertyValue("Scene.Apollo*Insignia.Renderable.Opacity", 0, 0.5)]],
Documentation = "Hide patches of the Apollo missions on their respective landing sites",
GuiPath = "/Missions/Apollo",

4
data/assets/scene/solarsystem/missions/insight/shortcuts.asset
View File

@@ -16,7 +16,7 @@ local insightNavigationState = [[
local Shortcuts = {
{
Command = [[
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset", -469.300000);
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset", -469.300000);
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset", -470.800006);
]],
Documentation = "Enable Insight landing height layer offset",
@@ -26,7 +26,7 @@ local Shortcuts = {
},
{
Command = [[
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset", 0);
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset", 0);
openspace.setPropertyValueSingle("Scene.Mars.Renderable.Layers.HeightLayers.OnMarsHiRISELS.Settings.Offset", 0);
]],
Documentation = "Disable Insight landing height layer offset",

2
data/assets/scene/solarsystem/missions/juice/kernels.asset
View File

@@ -76,7 +76,7 @@ asset.meta = {
Version = "1.0",
Description = [[
Kernels were acquired from the official Juice mailing list and extended with the
GPHIO kernel provided by Ronan Modolo for the fieldline and plane data visualization
GPHIO kernel provided by Ronan Modolo for the fieldline and plane data visualization
]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",

4
data/assets/scene/solarsystem/missions/juice/plane.asset
View File

@@ -58,7 +58,7 @@ local xy_u = {
GUI = {
Name = "Ganymede XY Plane U",
Path = "/Solar System/Missions/Juice/Plane",
Description = [[A cut plane in Ganymede's XY plane showing the strength of the
Description = [[A cut plane in Ganymede's XY plane showing the strength of the
magnetic field]]
}
}
@@ -193,7 +193,7 @@ local xz_u = {
GUI = {
Name = "Ganymede XZ Plane U",
Path = "/Solar System/Missions/Juice/Plane",
Description = [[A cut plane in Ganymede's XZ plane showing the strength of the
Description = [[A cut plane in Ganymede's XZ plane showing the strength of the
magnetic field]]
}
}

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

@@ -14,7 +14,7 @@ local kernels = asset.syncedResource({
Name = "Juno Kernels",
Type = "HttpSynchronization",
Identifier = "juno_kernels",
Version = 2
Version = 3
})
local JunoKernels = {
@@ -198,11 +198,11 @@ asset.onInitialize(function()
openspace.addSceneGraphNode(Juno)
openspace.addSceneGraphNode(JunoTrail)
end)
asset.onDeinitialize(function()
openspace.removeSceneGraphNode(JunoTrail)
openspace.removeSceneGraphNode(Juno)
end)
asset.export(Juno)
asset.export(JunoTrail)

52
data/assets/scene/solarsystem/missions/jwst/actions.asset
View File

@@ -2,9 +2,9 @@ local toggle_lagrangian_points = {
Identifier = "os.missions.jwst.togglelagrangianpoints",
Name = "Toggle Lagrangian points",
Command = [[
local list = openspace.getProperty('{lagrange_points_earth}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = openspace.getProperty('{lagrange_points_earth}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggle points and labels for the Lagrangian points for Earth Sun system",
@@ -16,9 +16,9 @@ local toggle_hudf = {
Identifier = "os.missions.jwst.togglehudf",
Name = "Toggle Hubble Ultra Deep Field",
Command = [[
local list = openspace.getProperty('{mission_jwst_hudf}.*.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = openspace.getProperty('{mission_jwst_hudf}.*.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggle Hubble Ultra Deep Field image and line towards its coordinate",
@@ -30,9 +30,9 @@ local toggle_l2 = {
Identifier = "os.missions.jwst.togglel2",
Name = "Toggle L2 line and small L2 label",
Command = [[
local list = openspace.getProperty('{lagrange_points_earth_l2_small}.*.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = openspace.getProperty('{lagrange_points_earth_l2_small}.*.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggle L2 label, point and line",
@@ -44,9 +44,9 @@ local toggle_fov = {
Identifier = "os.missions.jwst.togglefov",
Name = "Toggle JWST field of view and view band",
Command = [[
local list = openspace.getProperty('{mission_jwst_fov}.*.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = openspace.getProperty('{mission_jwst_fov}.*.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggle James Webb Space Telecope field of view and view band",
@@ -58,7 +58,7 @@ local setup_launch = {
Identifier = "os.missoins.jwst.setup.launch",
Name = "Set to JWST launch time",
Command = [[
openspace.time.setDeltaTime(1);
openspace.time.setDeltaTime(1);
openspace.time.setTime('2021-12-25T12:20:01');
]],
Documentation = "Set the time to the launch time of JWST",
@@ -70,7 +70,7 @@ local setup_detach = {
Identifier = "os.missions.jwst.setup.detach",
Name = "Set to JWST detach time",
Command = [[
openspace.time.setDeltaTime(1);
openspace.time.setDeltaTime(1);
openspace.time.setTime('2021-12-25T12:50:00');
]],
Documentation = "Set the time to the detach time of JWST",
@@ -82,7 +82,7 @@ local toggle_sun_trail = {
Identifier = "os.missions.jwst.togglesuntrail",
Name = "Toggle JWST Sun trail",
Command = [[
local value = openspace.getPropertyValue('Scene.JWSTSunTrail.Renderable.Enabled');
local value = openspace.getPropertyValue('Scene.JWSTSunTrail.Renderable.Enabled');
openspace.setPropertyValueSingle('Scene.JWSTSunTrail.Renderable.Enabled', not value);
]],
Documentation = "Toggle JWST trail relative to the Sun",
@@ -94,14 +94,14 @@ local toggle_trails_except_moon = {
Identifier = "os.missions.jwst.toggletrialsexceptmoon",
Name = "Toggle trails (except Moon)",
Command = [[
local list = openspace.getProperty('{planetTrail_solarSystem}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
local moonlist = openspace.getProperty('{moonTrail_solarSystem}.Renderable.Enabled')
for _,v in pairs(moonlist) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
local list = openspace.getProperty('{planetTrail_solarSystem}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
local moonlist = openspace.getProperty('{moonTrail_solarSystem}.Renderable.Enabled')
for _,v in pairs(moonlist) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
openspace.setPropertyValueSingle('Scene.MoonTrail.Renderable.Enabled', true)
]],
Documentation = "Toggle all planet and moon trails, except the Moon",
@@ -113,9 +113,9 @@ local toggle_jwst_trail = {
Identifier = "os.missions.jwst.togglejwsttrails",
Name = "Toggle JWST trail",
Command = [[
local list = {'Scene.JWSTTrailLaunch.Renderable.Enabled', 'Scene.JWSTTrailCruise.Renderable.Enabled', 'Scene.JWSTTrailCoRevOrbit.Renderable.Enabled'};
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v));
local list = {'Scene.JWSTTrailLaunch.Renderable.Enabled', 'Scene.JWSTTrailCruise.Renderable.Enabled', 'Scene.JWSTTrailCoRevOrbit.Renderable.Enabled'};
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v));
end
]],
Documentation = "Toggle JWST launch, cruise and L2 co-revolving orbit trails, not the Sun trail",

3
data/assets/scene/solarsystem/missions/jwst/jwst.asset
View File

@@ -48,8 +48,7 @@ local JWSTBand = {
Segments = 50,
DisableFadeInOut = true,
Orientation = "Inside",
Opacity = 0.05,
RenderBinMode = "PreDeferredTransparent",
Opacity = 0.05
},
Tag = { "mission_jwst_fov" },
GUI = {

2
data/assets/scene/solarsystem/missions/jwst/toggle_trail.asset
View File

@@ -1,6 +1,6 @@
local toggle_trail = {
Identifier = "event.jwst.toggle_trail",
Name = "Toggle JWST Trail (Auto)",
Name = "Toggle JWST trail (auto)",
Command = [[
local node
if is_declared("args") then

5
data/assets/scene/solarsystem/missions/messenger/messengerSC.asset
View File

@@ -198,7 +198,7 @@ local MessengerTrail = {
Identifier = "MessengerTrail",
Parent = mercuryTransforms.MercuryBarycenter.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Type = "RenderableTrailTrajectory",
Translation = {
Type = "SpiceTranslation",
Target = "MESSENGER",
@@ -209,8 +209,7 @@ local MessengerTrail = {
EnableFade = false,
StartTime = "2011 MARCH 01 12:00:00",
EndTime = "2011 MAY 30 12:00:00",
Period = 12,
Resolution = 10000
SampleInterval = 360
},
GUI = {
Name = "Messenger Trail",

40
data/assets/scene/solarsystem/missions/newhorizons/actions.asset
View File

@@ -13,7 +13,7 @@ local focus_newhorizons = {
local anchor_nh_aim_pluto = {
Identifier = "os.missions.newhorizons.aimpluto",
Name = "Anchor NH, Aim Pluto",
Name = "Anchor NH, Aim Pluto",
Command = [[
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'NewHorizons');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', 'Pluto');
@@ -29,7 +29,7 @@ local focus_pluto = {
Name = "Focus on Pluto",
Command = [[
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'PlutoProjection');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
]],
Documentation = "Sets the focus of the camera on 'Pluto'",
@@ -52,7 +52,7 @@ local focus_charon = {
local toggle_nh_imageprojection = {
Identifier = "os.missions.newhorizons.toggleimageprojection",
Name = "Toggle NH Image Projection",
Name = "Toggle NH image projection",
Command = [[
local enabled = openspace.getPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection');
openspace.setPropertyValue('Scene.PlutoProjection.Renderable.ProjectionComponent.PerformProjection', not enabled);
@@ -90,7 +90,7 @@ local approach_time_and_projections = {
local increase_hightmap_pluto = {
Identifier = "os.missions.newhorizons.pluto.increasehightmap",
Name = "Pluto HeightExaggeration +",
Name = "Pluto height exaggeration +",
Command = [[
openspace.setPropertyValueSingle("Scene.PlutoProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") + 5000);
]],
@@ -101,7 +101,7 @@ local increase_hightmap_pluto = {
local decrease_hightmap_pluto = {
Identifier = "os.missions.newhorizons.pluto.decreasehightmap",
Name = "Pluto HeightExaggeration -",
Name = "Pluto height exaggeration -",
Command = [[
openspace.setPropertyValueSingle("Scene.PlutoProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.PlutoProjection.Renderable.HeightExaggeration") - 5000);
]],
@@ -112,7 +112,7 @@ local decrease_hightmap_pluto = {
local increase_hightmap_charon = {
Identifier = "os.missions.newhorizons.charon.increasehightmap",
Name = "Charon HeightExaggeration +",
Name = "Charon height exaggeration +",
Command = [[
openspace.setPropertyValueSingle("Scene.CharonProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") + 5000);
]],
@@ -123,7 +123,7 @@ local increase_hightmap_charon = {
local decrease_hightmap_charon = {
Identifier = "os.missions.newhorizons.charon.decreasehightmap",
Name = "Charon HeightExaggeration -",
Name = "Charon height exaggeration -",
Command = [[
openspace.setPropertyValueSingle("Scene.CharonProjection.Renderable.HeightExaggeration", openspace.getPropertyValue("Scene.CharonProjection.Renderable.HeightExaggeration") - 5000);
]],
@@ -134,7 +134,7 @@ local decrease_hightmap_charon = {
local toggle_pluto_trail = {
Identifier = "os.missions.newhorizons.pluto.toggletrail",
Name = "Toggle Pluto Trail",
Name = "Toggle Pluto trail",
Command = [[
openspace.setPropertyValueSingle('Scene.PlutoBarycentricTrail.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoBarycentricTrail.Renderable.Enabled'));
]],
@@ -145,11 +145,11 @@ local toggle_pluto_trail = {
local toggle_pluto_labels = {
Identifier = "os.missions.newhorizons.pluto.togglelabels",
Name = "Toggle Pluto Labels",
Name = "Toggle Pluto labels",
Command = [[
local list = {"Scene.PlutoText.Renderable.Enabled", "Scene.CharonText.Renderable.Enabled", "Scene.HydraText.Renderable.Enabled", "Scene.NixText.Renderable.Enabled", "Scene.KerberosText.Renderable.Enabled", "Scene.StyxText.Renderable.Enabled"};
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = {"Scene.PlutoText.Renderable.Enabled", "Scene.CharonText.Renderable.Enabled", "Scene.HydraText.Renderable.Enabled", "Scene.NixText.Renderable.Enabled", "Scene.KerberosText.Renderable.Enabled", "Scene.StyxText.Renderable.Enabled"};
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggles the visibility of the text labels of Pluto, Charon, Hydra, Nix, Kerberos, and Styx",
@@ -159,13 +159,13 @@ local toggle_pluto_labels = {
local toggle_nh_labels = {
Identifier = "os.missions.newhorizons.togglelabels",
Name = "Toggle New Horizons Labels",
Name = "Toggle New Horizons labels",
Command = [[
local v = openspace.getPropertyValue("Scene.Labels.Renderable.Opacity");
if v <= 0.5 then
openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity",1.0,2.0)
else
openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity",0.0,2.0)
local v = openspace.getPropertyValue("Scene.Labels.Renderable.Opacity");
if v <= 0.5 then
openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity",1.0,2.0)
else
openspace.setPropertyValueSingle("Scene.Labels.Renderable.Opacity",0.0,2.0)
end
]],
Documentation = "Toggles the visibility of the labels for the New Horizons instruments",
@@ -175,7 +175,7 @@ local toggle_nh_labels = {
local toggle_shadows = {
Identifier = "os.missions.newhorizons.toggleshadows",
Name = "Toggle Shadows",
Name = "Toggle shadows",
Command = [[
openspace.setPropertyValueSingle('Scene.PlutoShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.PlutoShadow.Renderable.Enabled'));
openspace.setPropertyValueSingle('Scene.CharonShadow.Renderable.Enabled', not openspace.getPropertyValue('Scene.CharonShadow.Renderable.Enabled'));
@@ -187,7 +187,7 @@ local toggle_shadows = {
local toggle_nh_trail = {
Identifier = "os.missions.newhorizons.toggletrail",
Name = "Toggle NH Trail",
Name = "Toggle New Horizons trail",
Command = [[
openspace.setPropertyValueSingle('Scene.NewHorizonsTrailPluto.Renderable.Enabled', not openspace.getPropertyValue('Scene.NewHorizonsTrailPluto.Renderable.Enabled'));
]],

16
data/assets/scene/solarsystem/missions/osirisrex/actions.asset
View File

@@ -1,9 +1,9 @@
local focus_osirisrex = {
Identifier = "os.missions.osirisrex.focus",
Name = "Focus on OsirisRex",
Name = "Focus on OsirisREx",
Command = [[
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'OsirisRex');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'OsirisRex');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
]],
Documentation = "Sets the focus of the camera on 'OsirisRex'",
@@ -15,8 +15,8 @@ local focus_bennu = {
Identifier = "os.missions.osirisrex.bennu.focus",
Name = "Focus on Bennu",
Command = [[
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'BennuBarycenter');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'BennuBarycenter');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
]],
Documentation = "Sets the focus of the camera on 'Bennu'",
@@ -40,7 +40,7 @@ local bennu_survey_time = {
Identifier = "os.missions.osirisrex.setup.bennusurvey",
Name = "Set Bennu survey time",
Command = [[
openspace.printInfo('Set time: Preliminary Survey');
openspace.printInfo('Set time: Preliminary Survey');
openspace.time.setTime('2018-NOV-20 01:13:12.183');
]],
Documentation = "Sets the time to the preliminary survey of Bennu",
@@ -52,7 +52,7 @@ local bennu_event_b = {
Identifier = "os.missions.osirisrex.setup.bennueventb",
Name = "Set orbital B event time",
Command = [[
openspace.printInfo('Set time: Orbital B');
openspace.printInfo('Set time: Orbital B');
openspace.time.setTime('2019-APR-08 10:35:27.186');
]],
Documentation = "Sets the time to the orbital B event",
@@ -64,7 +64,7 @@ local bennu_recon_event = {
Identifier = "os.missions.osirisrex.setup.bennureconevent",
Name = "Set recon event time",
Command = [[
openspace.printInfo('Set time: Recon');
openspace.printInfo('Set time: Recon');
openspace.time.setTime('2019-MAY-25 03:50:31.195');
]],
Documentation = "Sets the time to the recon event",

6
data/assets/scene/solarsystem/missions/perseverance/actions.asset
View File

@@ -1,6 +1,6 @@
local setup_perseverance = {
Identifier = "os.missions.perseverance.setup",
Name = "Setup and Goto Perseverance",
Name = "Setup and go to Perseverance",
Command = [[
openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1685.5);
openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -1686.0);
@@ -21,7 +21,7 @@ asset.onInitialize(function()
end)
asset.onDeinitialize(function()
openspace.action.removeAction(setup_perseverance)
openspace.action.removeAction(setup_perseverance)
end)
asset.meta = {
@@ -31,4 +31,4 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}
}

9
data/assets/scene/solarsystem/missions/rosetta/67p.asset
View File

@@ -21,10 +21,11 @@ local images = asset.syncedResource({
Type = "HttpSynchronization",
Identifier = "rosettaimages",
Version = 2,
UnzipFiles = true
UnzipFiles = true,
UnzipFilesDestination = "images"
})
local imagesDestination = images .. "images_v1_v2"
local imagesDestination = images .. "images"
local Barycenter = {
Identifier = "67PBarycenter",
@@ -136,8 +137,8 @@ local focus_67p = {
Identifier = "os.missions.rosetta.67p.focus",
Name = "Focus on 67P",
Command = [[
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', '67P');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', '67P');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
]],
Documentation = "Sets the focus of the camera on 67P",

6
data/assets/scene/solarsystem/missions/rosetta/actions.asset
View File

@@ -2,9 +2,9 @@ local toggle_outer_planetary_trails = {
Identifier = "os.missions.rosetta.toggleouterplanetarytrails",
Name = "Toggle outer planetary trails",
Command = [[
local list = openspace.getProperty('{planetTrail_giants}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = openspace.getProperty('{planetTrail_giants}.Renderable.Enabled')
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggles the visibility of all trails further from the Sun than 67P",

4
data/assets/scene/solarsystem/missions/rosetta/rosetta.asset
View File

@@ -560,8 +560,8 @@ local focus_rosetta = {
Identifier = "os.missions.rosetta.focus",
Name = "Focus on Rosetta",
Command = [[
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Rosetta');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Anchor', 'Rosetta');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValue('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
]],
Documentation = "Sets the focus of the camera on Rosetta",

10
data/assets/scene/solarsystem/missions/voyager/actions.asset
View File

@@ -1,6 +1,6 @@
local jupiter_approach = {
Identifier = "os.missions.voyager.setup.jupiterapproach",
Name = "Set Jupiter Approach",
Name = "Set Jupiter approach",
Command = [[
openspace.time.setTime('1979-01-20T01:32:07.914')
]],
@@ -11,7 +11,7 @@ local jupiter_approach = {
local saturn_approach = {
Identifier = "os.missions.voyager.setup.saturnapproach",
Name = "Set Saturn Approach",
Name = "Set Saturn approach",
Command = [[
openspace.time.setTime('1980-10-20T07:43:42.645');
]],
@@ -50,9 +50,9 @@ local toggle_minormoon_trails = {
Identifier = "os.missions.voyager.toggleminormoontrails",
Name = "Toggle minor trails",
Command = [[
local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = openspace.getProperty('{moonTrail_minor}.Renderable.Enabled')
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggles the trails of the minor moons",

2
data/assets/scene/solarsystem/missions/voyagerpioneer/voyager1_2__pioneer10_11.asset
View File

@@ -159,7 +159,7 @@ asset.meta = {
Name = "Pioneer and Voyager Trails",
Version = "1.1",
Description = [[Pioneer 10, Pioneer 11, Voyager 1 and Voyager 2 trails. Driven by JPL
Horizons data for better performance then spice but lower resolution. Data is from
Horizons data for better performance then spice but lower resolution. Data is from
shortly after mission launches until January 1st, 2030]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",

1
data/assets/scene/solarsystem/planets/earth/default_layers.asset
View File

@@ -1,6 +1,7 @@
-- Color layers
asset.require("./layers/colorlayers/blue_marble", false)
asset.require("./layers/colorlayers/esri_viirs_combo", true)
asset.require("./layers/colorlayers/esri_noaa20_combo", false)
asset.require("./layers/colorlayers/esri_world_imagery", false)
asset.require("./layers/colorlayers/viirs_snpp_temporal", false)
asset.require("./layers/colorlayers/aqua_modis_temporal", false)

10
data/assets/scene/solarsystem/planets/earth/earth.asset
View File

@@ -77,8 +77,8 @@ local focus_earth = {
Identifier = "os.solarsystem.earth.focus",
Name = "Focus on Earth",
Command = [[
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Aim', '');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.Anchor', 'Earth');
openspace.setPropertyValueSingle('NavigationHandler.OrbitalNavigator.RetargetAnchor', nil);
]],
Documentation = "Set camera focus on the Earth",
@@ -90,9 +90,9 @@ local toggle_earth_satellitetrails = {
Identifier = "os.solarsystem.earth.togglesatellitetrails",
Name = "Toggle satellite trails",
Command = [[
local list = openspace.getProperty('{earth_satellites}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
local list = openspace.getProperty('{earth_satellites}.Renderable.Enabled');
for _,v in pairs(list) do
openspace.setPropertyValueSingle(v, not openspace.getPropertyValue(v))
end
]],
Documentation = "Toggle trails on or off for satellites around Earth",

1
data/assets/scene/solarsystem/planets/earth/lagrange_points/L1.asset
View File

@@ -39,7 +39,6 @@ local L1 = {
Parent = L1Position.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderBinMode = "Opaque",
Billboard = true,
Size = 700E5,
Texture = circle .. "circle.png",

2
data/assets/scene/solarsystem/planets/earth/lagrange_points/L2.asset
View File

@@ -64,7 +64,6 @@ local L2Small = {
Parent = L2Position.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderBinMode = "Opaque",
Billboard = true,
Size = 400E4,
Texture = circle .. "circle.png",
@@ -82,7 +81,6 @@ local L2 = {
Parent = L2Position.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderBinMode = "Opaque",
Billboard = true,
Size = 700E5,
Texture = circle .. "circle.png",

1
data/assets/scene/solarsystem/planets/earth/lagrange_points/L4.asset
View File

@@ -39,7 +39,6 @@ local L4 = {
Parent = L4Position.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderBinMode = "Opaque",
Billboard = true,
Size = 800E6,
Texture = circle .. "circle.png",

1
data/assets/scene/solarsystem/planets/earth/lagrange_points/L5.asset
View File

@@ -39,7 +39,6 @@ local L5 = {
Parent = L5Position.Identifier,
Renderable = {
Type = "RenderablePlaneImageLocal",
RenderBinMode = "Opaque",
Billboard = true,
Size = 800E6,
Texture = circle .. "circle.png",

67
data/assets/scene/solarsystem/planets/earth/layers/colorlayers/esri_noaa20_combo.asset Normal file
View File

@@ -0,0 +1,67 @@
local globeIdentifier = asset.require("../../earth").Earth.Identifier
local layer = {
Identifier = "ESRI_NOAA20_Combo",
Name = "ESRI NOAA20 Combo",
Enabled = asset.enabled,
Type = "ByLevelTileLayer",
LevelTileProviders = {
{
MaxLevel = 4,
TileProvider = {
Identifier = "Temporal_VIIRS_NOAA20",
Name = "Temporal VIIRS NOAA20",
Type = "TemporalTileLayer",
Mode = "Prototyped",
Prototyped = {
Time = {
Start = "2020-04-25",
End = "Today"
},
TemporalResolution = "1d",
TimeFormat = "YYYY-MM-DD",
Prototype = openspace.globebrowsing.createTemporalGibsGdalXml(
"VIIRS_NOAA20_CorrectedReflectance_TrueColor",
"250m",
"jpg"
)
},
PadTiles = false
}
},
{
MaxLevel = 22,
TileProvider = {
Identifier = "ESRI_World_Imagery",
Name = "ESRI World Imagery",
FilePath = asset.localResource("esri_world_imagery.wms"),
PadTiles = false
}
},
},
PadTiles = false,
Description = [[Level based layer combining "NOAA20 SNPP (Temporal)" and ESRI World
Imagery. "NOAA20 SNPP (Temporal)" is faded out at tile level 4]]
}
asset.onInitialize(function()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.onDeinitialize(function()
openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)
asset.meta = {
Name = "ESRI NOAA20 VIIRS Combo",
Version = "1.0",
Description = [[Level based layer combining "NOAA20 SNPP (Temporal)" and ESRI World
Imagery. "NOAA20 SNPP (Temporal)" is faded out at tile level 4]],
Author = "OpenSpace Tem",
URL = "http://www.openspaceproject.com",
License = "MIT License"
}

2
data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.asset
View File

@@ -5,7 +5,7 @@ local layer = {
Name = "Terrain tileset",
Enabled = asset.enabled,
FilePath = asset.localResource("terrain_tileset.wms"),
TilePixelSize = 64,
TilePixelSize = 512,
Description = [[This globe layer presents elevation data at approximately 90m or 1km
per pixel resolution for the world. The elevation data includes 90m Shuttle Radar
Topography Mission (SRTM) elevation data from NASA and National

18
data/assets/scene/solarsystem/planets/earth/layers/heightlayers/terrain_tileset.wms
View File

@@ -3,14 +3,20 @@
<ServerUrl>http://earthlive.maptiles.arcgis.com/arcgis/rest/services/GCS_Elevation3D/ImageServer/tile/${z}/${y}/${x}</ServerUrl>
</Service>
<DataWindow>
<UpperLeftX>-180</UpperLeftX> <UpperLeftY>90</UpperLeftY>
<LowerRightX>180</LowerRightX> <LowerRightY>-90</LowerRightY>
<SizeX>16777216</SizeX> <SizeY>8388608</SizeY>
<TileLevel>14</TileLevel> <YOrigin>top</YOrigin>
<UpperLeftX>-180</UpperLeftX>
<UpperLeftY>90</UpperLeftY>
<LowerRightX>180</LowerRightX>
<LowerRightY>-90</LowerRightY>
<SizeX>16777216</SizeX>
<SizeY>8388608</SizeY>
<TileLevel>14</TileLevel>
<YOrigin>top</YOrigin>
</DataWindow>
<Projection>EPSG:4326</Projection>
<BlockSizeX>512</BlockSizeX> <BlockSizeY>512</BlockSizeY>
<BandsCount>1</BandsCount> <DataType>Float32</DataType>
<BlockSizeX>512</BlockSizeX>
<BlockSizeY>512</BlockSizeY>
<BandsCount>1</BandsCount>
<DataType>Float32</DataType>
<DataValues NoData="0" Min="-11000" Max="8500"/>
<MaxConnections>5</MaxConnections>
<ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>

2
data/assets/scene/solarsystem/planets/earth/moon/default_layers.asset
View File

@@ -1,6 +1,6 @@
-- Color layers
asset.require("./layers/colorlayers/wac_utah", true)
asset.require("./layers/colorlayers/wac_sweden", true)
asset.require("./layers/colorlayers/wac_sweden", false)
asset.require("./layers/colorlayers/clemuvvis_utah", false)
asset.require("./layers/colorlayers/clemuvvis_sweden", false)
asset.require("./layers/colorlayers/uvvishybrid_utah", false)

2
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_utah.asset
View File

@@ -31,7 +31,7 @@ asset.export("layer", layer)
asset.meta = {
Name = "Clem Uvvis [Utah]",
Version = "1.1",
Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map
Description = [[Moon Clementine UVVIS Global Mosaic 118m v2 map of the Moon. This map
is hosted on the OpenSpace server in Utah]],
Author = "USGS",
URL = "https://astrogeology.usgs.gov/search/map/Moon/Clementine/UVVIS/Lunar_Clementine_UVVIS_750nm_Global_Mosaic_118m_v2",

2
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_utah.asset
View File

@@ -30,7 +30,7 @@ asset.export("layer", layer)
asset.meta = {
Name = "Lola Color Shade [Utah]",
Version = "1.1",
Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This
Description = [[Moon LRO LOLA Color Shaded Relief 388m v4 layer for Moon globe. This
map is hosted on the OpenSpace server in Utah]],
Author = "USGS",
URL = "https://astrogeology.usgs.gov/search/map/Moon/LMMP/LOLA-derived/Lunar_LRO_LOLA_ClrShade_Global_128ppd_v04",

14
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.asset
View File

@@ -4,15 +4,9 @@ local layer = {
Identifier = "WAC_Sweden",
Name = "WAC [Sweden]",
Enabled = asset.enabled,
Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
create a global mosaic comprised of over 15,000 images acquired between November 2009
and February 2011. The WAC maps the whole Moon in one month, however the solar
incidence angle at the equator changes about 28° from the beginning to the end of the
month. To even out the incidence angle variations (generally angles between 55-75
degrees), this morphology mosaic (at 643 nm), is comprised of data collected over
three periods (1/20/2010 to 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010).
(Description from URL)]],
Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC) aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to create a global mosaic comprised of over 15,000 images acquired between November 2009 and February 2011. The WAC maps the whole Moon in one month, however the solar incidence angle at the equator changes about 28° from the beginning to the end of the month. To even out the incidence angle variations (generally angles between 55-75 degrees), this morphology mosaic (at 643 nm), is comprised of data collected over three periods (1/20/2010 to 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010).
The South Pole mosaic images were acquired 8/10/10 to 9/19/10 and the north polar images 4/22/10 to 5/19/10. Some gores were filled with data taken at other times. The non-polar images were map projected onto the GLD100, WAC-derived 100 meters per pixel (m), while polar images were map projected on the Lunar Orbiter Laser Altimeter (LOLA) shape model (80° to 90° N/S) and the GLD100 (60° to 80° N/S). In addition, the LOLA derived crossover corrected ephemeris and an improved camera pointing provide accurate positioning of each WAC image. Because the polar images were acquired at a different season than the equatorial images, and the lunar photometric function is not perfectly known, there can be a brightness difference where the polar mosaics meet the equatorial mosaics. This has been greatly reduced in version 3 (created in June 2013). (Description from URL)]],
FilePath = asset.localResource("wac_sweden.wms"),
Settings = { Gamma = 0.84 }
}
@@ -31,7 +25,7 @@ asset.export("layer", layer)
asset.meta = {
Name = "WAC [Sweden]",
Version = "1.1",
Version = "2.0",
Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
server in Sweden]],
Author = "USGS",

6
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_sweden.wms
View File

@@ -1,6 +1,6 @@
<GDAL_WMS>
<Service name="TMS">
<ServerUrl>http://wms.itn.liu.se/Moon/WAC/tile/${z}/${y}/${x}</ServerUrl>
<ServerUrl>http://wms.itn.liu.se/Moon/WAC3/tile/${z}/${y}/${x}</ServerUrl>
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
@@ -13,8 +13,8 @@
<YOrigin>top</YOrigin>
</DataWindow>
<Projection>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
<BlockSizeX>256</BlockSizeX>
<BlockSizeY>256</BlockSizeY>
<BlockSizeX>360</BlockSizeX>
<BlockSizeY>360</BlockSizeY>
<BandsCount>1</BandsCount>
<MaxConnections>10</MaxConnections>
</GDAL_WMS>

16
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.asset
View File

@@ -4,17 +4,11 @@ local layer = {
Identifier = "WAC_Utah",
Name = "WAC [Utah]",
Enabled = asset.enabled,
Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC) aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to create a global mosaic comprised of over 15,000 images acquired between November 2009 and February 2011. The WAC maps the whole Moon in one month, however the solar incidence angle at the equator changes about 28° from the beginning to the end of the month. To even out the incidence angle variations (generally angles between 55-75 degrees), this morphology mosaic (at 643 nm), is comprised of data collected over three periods (1/20/2010 to 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010).
The South Pole mosaic images were acquired 8/10/10 to 9/19/10 and the north polar images 4/22/10 to 5/19/10. Some gores were filled with data taken at other times. The non-polar images were map projected onto the GLD100, WAC-derived 100 meters per pixel (m), while polar images were map projected on the Lunar Orbiter Laser Altimeter (LOLA) shape model (80° to 90° N/S) and the GLD100 (60° to 80° N/S). In addition, the LOLA derived crossover corrected ephemeris and an improved camera pointing provide accurate positioning of each WAC image. Because the polar images were acquired at a different season than the equatorial images, and the lunar photometric function is not perfectly known, there can be a brightness difference where the polar mosaics meet the equatorial mosaics. This has been greatly reduced in version 3 (created in June 2013). (Description from URL)]],
FilePath = asset.localResource("wac_utah.wms"),
Settings = { Gamma = 0.84 },
Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
create a global mosaic comprised of over 15,000 images acquired between November 2009
and February 2011. The WAC maps the whole Moon in one month, however the solar
incidence angle at the equator changes about 28° from the beginning to the end of the
month. To even out the incidence angle variations (generally angles between 55-75
degrees), this morphology mosaic (at 643 nm), is comprised of data collected over
three periods (1/20/2010 to 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010).
(Description from URL)]]
Settings = { Gamma = 0.84 }
}
asset.onInitialize(function()
@@ -31,7 +25,7 @@ asset.export("layer", layer)
asset.meta = {
Name = "WAC [Utah]",
Version = "1.1",
Version = "2.0",
Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
server in Utah]],
Author = "USGS",

7
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_utah.wms
View File

@@ -1,6 +1,6 @@
<GDAL_WMS>
<Service name="TMS">
<ServerUrl>http://openspace.sci.utah.edu/Moon/Wac/tile/${z}/${y}/${x}</ServerUrl>
<ServerUrl>http://openspace.sci.utah.edu/Moon/Wac3/tile/${z}/${y}/${x}</ServerUrl>
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
@@ -13,9 +13,8 @@
<YOrigin>top</YOrigin>
</DataWindow>
<Projection>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
<BlockSizeX>256</BlockSizeX>
<BlockSizeY>256</BlockSizeY>
<BlockSizeX>360</BlockSizeX>
<BlockSizeY>360</BlockSizeY>
<BandsCount>1</BandsCount>
<MaxConnections>10</MaxConnections>
<Timeout>5</Timeout>
</GDAL_WMS>

40
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.asset Normal file
View File

@@ -0,0 +1,40 @@
local globeIdentifier = asset.require("../../moon").Moon.Identifier
local layer = {
Identifier = "WAC_V1_Sweden",
Name = "WAC V1 [Sweden]",
Enabled = asset.enabled,
Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
create a global mosaic comprised of over 15,000 images acquired between November 2009
and February 2011. The WAC maps the whole Moon in one month, however the solar
incidence angle at the equator changes about 28° from the beginning to the end of the
month. To even out the incidence angle variations (generally angles between 55-75
degrees), this morphology mosaic (at 643 nm), is comprised of data collected over
three periods (1/20/2010 to 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010).
(Description from URL)]],
FilePath = asset.localResource("wac_v1_sweden.wms"),
Settings = { Gamma = 0.84 }
}
asset.onInitialize(function()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.onDeinitialize(function()
openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)
asset.meta = {
Name = "WAC [Sweden]",
Version = "1.2",
Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
server in Sweden]],
Author = "USGS",
URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LROC_WAC/Lunar_LRO_LROC-WAC_Mosaic_global_100m_June2013",
License = "NASA/PDS"
}

20
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_sweden.wms Normal file
View File

@@ -0,0 +1,20 @@
<GDAL_WMS>
<Service name="TMS">
<ServerUrl>http://wms.itn.liu.se/Moon/WAC/tile/${z}/${y}/${x}</ServerUrl>
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90.0</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90.0</LowerRightY>
<SizeX>109164</SizeX>
<SizeY>54582</SizeY>
<TileLevel>8</TileLevel>
<YOrigin>top</YOrigin>
</DataWindow>
<Projection>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
<BlockSizeX>256</BlockSizeX>
<BlockSizeY>256</BlockSizeY>
<BandsCount>1</BandsCount>
<MaxConnections>10</MaxConnections>
</GDAL_WMS>

40
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.asset Normal file
View File

@@ -0,0 +1,40 @@
local globeIdentifier = asset.require("../../moon").Moon.Identifier
local layer = {
Identifier = "WAC_V1_Utah",
Name = "WAC V1 [Utah]",
Enabled = asset.enabled,
FilePath = asset.localResource("wac_v1_utah.wms"),
Settings = { Gamma = 0.84 },
Description = [[Lunar Reconnaissance Orbiter Camera (LROC) Wide Angle Camera (WAC)
aboard the Lunar Reconnaissance Orbiter (LRO) has allowed the instrument team to
create a global mosaic comprised of over 15,000 images acquired between November 2009
and February 2011. The WAC maps the whole Moon in one month, however the solar
incidence angle at the equator changes about 28° from the beginning to the end of the
month. To even out the incidence angle variations (generally angles between 55-75
degrees), this morphology mosaic (at 643 nm), is comprised of data collected over
three periods (1/20/2010 to 1/28/2010, 5/30/2010 to 6/6/2010, 7/24/2010 to 7/31/2010).
(Description from URL)]]
}
asset.onInitialize(function()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.onDeinitialize(function()
openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)
asset.meta = {
Name = "WAC v1 [Utah]",
Version = "1.2",
Description = [[Wide Angle Color map of the Moon. This map is hosted on the OpenSpace
server in Utah]],
Author = "USGS",
URL = "https://astrogeology.usgs.gov/search/map/Moon/LRO/LROC_WAC/Lunar_LRO_LROC-WAC_Mosaic_global_100m_June2013",
License = "NASA/PDS"
}

21
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/wac_v1_utah.wms Normal file
View File

@@ -0,0 +1,21 @@
<GDAL_WMS>
<Service name="TMS">
<ServerUrl>http://openspace.sci.utah.edu/Moon/Wac/tile/${z}/${y}/${x}</ServerUrl>
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX>
<UpperLeftY>90.0</UpperLeftY>
<LowerRightX>180.0</LowerRightX>
<LowerRightY>-90.0</LowerRightY>
<SizeX>109164</SizeX>
<SizeY>54582</SizeY>
<TileLevel>8</TileLevel>
<YOrigin>top</YOrigin>
</DataWindow>
<Projection>GEOGCS["GCS_Moon_2000",DATUM["D_Moon_2000",SPHEROID["Moon_2000_IAU_IAG",1737400.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
<BlockSizeX>256</BlockSizeX>
<BlockSizeY>256</BlockSizeY>
<BandsCount>1</BandsCount>
<MaxConnections>10</MaxConnections>
<Timeout>5</Timeout>
</GDAL_WMS>

2
data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_sweden.asset
View File

@@ -5,7 +5,7 @@ local layer = {
Name = "Lola DEM [Sweden]",
Enabled = asset.enabled,
FilePath = asset.localResource("loladem_sweden.wms"),
TilePixelSize = 64,
TilePixelSize = 360,
Settings = { Multiplier = 0.5 }
}

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