mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merging master into session recording changes for issue 1366

Browse Source
This commit is contained in:
GPayne
2020-11-20 10:32:58 -07:00
parent 763fb110d1 d3a2ea4a5f
commit 251c4d2317
354 changed files with 2327 additions and 1723 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@
#include <openspace/engine/configuration.h>
#include <ghoul/filesystem/filesystem.h>
#include <ghoul/logging/logmanager.h>
#include <QComboBox>
#include <QFile>
#include <QLabel>
@@ -220,8 +221,17 @@ QWidget* LauncherWindow::createCentralWidget() {
connect(
startButton, &QPushButton::released,
[this]() {
_shouldLaunch = true;
close();
if (_profileBox->currentText().isEmpty()) {
QMessageBox::critical(
this,
"Empty Profile",
"Cannot launch with an empty profile"
);
}
else {
_shouldLaunch = true;
close();
}
}
);
startButton->setObjectName("large");
@@ -301,6 +311,13 @@ void LauncherWindow::populateProfilesList(std::string preset) {
_profileBox->clear();
if (!std::filesystem::exists(_profilePath)) {
LINFOC(
"LauncherWindow",
fmt::format("Could not find profile folder '{}'", _profilePath)
);
return;
}
// Add all the files with the .profile extension to the dropdown
for (const fs::directory_entry& p : fs::directory_iterator(_profilePath)) {
if (p.path().extension() != ".profile") {
@@ -321,12 +338,20 @@ void LauncherWindow::populateWindowConfigsList(std::string preset) {
namespace fs = std::filesystem;
_windowConfigBox->clear();
// Add all the files with the .xml extension to the dropdown
for (const fs::directory_entry& p : fs::directory_iterator(_configPath)) {
if (p.path().extension() != ".xml") {
continue;
if (std::filesystem::exists(_configPath)) {
// Add all the files with the .xml extension to the dropdown
for (const fs::directory_entry& p : fs::directory_iterator(_configPath)) {
if (p.path().extension() != ".xml") {
continue;
}
_windowConfigBox->addItem(QString::fromStdString(p.path().stem().string()));
}
_windowConfigBox->addItem(QString::fromStdString(p.path().stem().string()));
}
else {
LINFOC(
"LauncherWindow",
fmt::format("Could not find config folder '{}'", _configPath)
);
}
// Try to find the requested configuration file and set it as the current one. As we

14
apps/OpenSpace/ext/launcher/src/profile/cameradialog.cpp
View File

@@ -191,22 +191,22 @@ QWidget* CameraDialog::createNavStateWidget() {
QWidget* posBox = new QWidget;
QBoxLayout* posLayout = new QHBoxLayout(posBox);
posLayout->setContentsMargins(0, 0, 0, 0);
posLayout->addWidget(new QLabel("X"));
posLayout->addWidget(new QLabel("X [m]"));
_navState.positionX = new QLineEdit;
_navState.positionX->setValidator(new QDoubleValidator);
_navState.positionX->setToolTip("Camera position vector (x)");
_navState.positionX->setToolTip("Camera position vector (x) [m]");
posLayout->addWidget(_navState.positionX);
posLayout->addWidget(new QLabel("Y"));
posLayout->addWidget(new QLabel("Y [m]"));
_navState.positionY = new QLineEdit;
_navState.positionY->setValidator(new QDoubleValidator);
_navState.positionY->setToolTip("Camera position vector (y)");
_navState.positionY->setToolTip("Camera position vector (y) [m]");
posLayout->addWidget(_navState.positionY);
posLayout->addWidget(new QLabel("Z"));
posLayout->addWidget(new QLabel("Z [m]"));
_navState.positionZ = new QLineEdit;
_navState.positionZ->setValidator(new QDoubleValidator);
_navState.positionZ->setToolTip("Camera position vector (z)");
_navState.positionZ->setToolTip("Camera position vector (z) [m]");
posLayout->addWidget(_navState.positionZ);
layout->addWidget(posBox, 3, 1);
}
@@ -277,7 +277,7 @@ QWidget* CameraDialog::createGeoWidget() {
_geoState.longitude->setToolTip("Longitude of camera focus point (+/- 180 degrees)");
layout->addWidget(_geoState.longitude, 2, 1);
layout->addWidget(new QLabel("Altitude"), 3, 0);
layout->addWidget(new QLabel("Altitude [m]"), 3, 0);
_geoState.altitude = new QLineEdit;
_geoState.altitude->setValidator(new QDoubleValidator);
_geoState.altitude->setToolTip("Altitude of camera (meters)");

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: cef10f55bd...6c351ebf2e

77
apps/OpenSpace/main.cpp
View File

@@ -221,7 +221,7 @@ void mainInitFunc(GLFWwindow*) {
LTRACE("main::mainInitFunc(begin)");
LDEBUG("Initializing OpenSpace Engine started");
global::openSpaceEngine.initialize();
global::openSpaceEngine->initialize();
LDEBUG("Initializing OpenSpace Engine finished");
{
@@ -247,7 +247,7 @@ void mainInitFunc(GLFWwindow*) {
currentViewport = currentWindow->viewports().front().get();
LDEBUG("Initializing OpenGL in OpenSpace Engine started");
global::openSpaceEngine.initializeGL();
global::openSpaceEngine->initializeGL();
LDEBUG("Initializing OpenGL in OpenSpace Engine finished");
@@ -325,7 +325,7 @@ void mainInitFunc(GLFWwindow*) {
// Screenshots
//
std::string screenshotPath = "${SCREENSHOTS}";
if (global::configuration.shouldUseScreenshotDate) {
if (global::configuration->shouldUseScreenshotDate) {
std::time_t now = std::time(nullptr);
std::tm* nowTime = std::localtime(&now);
char mbstr[128];
@@ -351,7 +351,7 @@ void mainPreSyncFunc() {
LTRACE("main::mainPreSyncFunc(begin)");
try {
global::openSpaceEngine.preSynchronization();
global::openSpaceEngine->preSynchronization();
}
catch (const ghoul::RuntimeError& e) {
LFATALC(e.component, e.message);
@@ -364,7 +364,7 @@ void mainPreSyncFunc() {
for (int i = GLFW_JOYSTICK_1; i <= GLFW_JOYSTICK_LAST; ++i) {
ZoneScopedN("Joystick state");
JoystickInputState& state = global::joystickInputStates[i];
JoystickInputState& state = global::joystickInputStates->at(i);
int present = glfwJoystickPresent(i);
if (present == GLFW_FALSE) {
@@ -446,7 +446,7 @@ void mainPostSyncPreDrawFunc() {
#endif // OPENSPACE_HAS_NVTOOLS
LTRACE("main::postSynchronizationPreDraw(begin)");
global::openSpaceEngine.postSynchronizationPreDraw();
global::openSpaceEngine->postSynchronizationPreDraw();
#ifdef OPENVR_SUPPORT
if (FirstOpenVRWindow) {
@@ -515,7 +515,7 @@ void mainRenderFunc(const sgct::RenderData& data) {
);
currentModelMatrix = modelMatrix;
currentModelViewProjectionMatrix = modelMatrix * viewMatrix * projectionMatrix;
global::openSpaceEngine.render(modelMatrix, viewMatrix, projectionMatrix);
global::openSpaceEngine->render(modelMatrix, viewMatrix, projectionMatrix);
}
catch (const ghoul::RuntimeError& e) {
LERRORC(e.component, e.message);
@@ -538,7 +538,7 @@ void mainDraw2DFunc(const sgct::RenderData& data) {
currentFrustumMode = data.frustumMode;
try {
global::openSpaceEngine.drawOverlays();
global::openSpaceEngine->drawOverlays();
}
catch (const ghoul::RuntimeError& e) {
LERRORC(e.component, e.message);
@@ -565,7 +565,7 @@ void mainPostDrawFunc() {
}
#endif // OPENVR_SUPPORT
global::openSpaceEngine.postDraw();
global::openSpaceEngine->postDraw();
#ifdef OPENSPACE_HAS_SPOUT
for (const SpoutWindow& w : SpoutWindows) {
@@ -609,7 +609,7 @@ void mainKeyboardCallback(sgct::Key key, sgct::Modifier modifiers, sgct::Action
const openspace::Key k = openspace::Key(key);
const KeyModifier m = KeyModifier(modifiers);
const KeyAction a = KeyAction(action);
global::openSpaceEngine.keyboardCallback(k, m, a);
global::openSpaceEngine->keyboardCallback(k, m, a);
LTRACE("main::mainKeyboardCallback(begin)");
}
@@ -625,7 +625,7 @@ void mainMouseButtonCallback(sgct::MouseButton key, sgct::Modifier modifiers,
const openspace::MouseButton k = openspace::MouseButton(key);
const openspace::MouseAction a = openspace::MouseAction(action);
const openspace::KeyModifier m = openspace::KeyModifier(modifiers);
global::openSpaceEngine.mouseButtonCallback(k, a, m);
global::openSpaceEngine->mouseButtonCallback(k, a, m);
LTRACE("main::mainMouseButtonCallback(end)");
}
@@ -634,7 +634,7 @@ void mainMouseButtonCallback(sgct::MouseButton key, sgct::Modifier modifiers,
void mainMousePosCallback(double x, double y) {
ZoneScoped
global::openSpaceEngine.mousePositionCallback(x, y);
global::openSpaceEngine->mousePositionCallback(x, y);
}
@@ -643,7 +643,7 @@ void mainMouseScrollCallback(double posX, double posY) {
ZoneScoped
LTRACE("main::mainMouseScrollCallback(begin");
global::openSpaceEngine.mouseScrollWheelCallback(posX, posY);
global::openSpaceEngine->mouseScrollWheelCallback(posX, posY);
LTRACE("main::mainMouseScrollCallback(end)");
}
@@ -654,7 +654,7 @@ void mainCharCallback(unsigned int codepoint, int modifiers) {
ZoneScoped
const KeyModifier m = KeyModifier(modifiers);
global::openSpaceEngine.charCallback(codepoint, m);
global::openSpaceEngine->charCallback(codepoint, m);
}
@@ -663,7 +663,7 @@ std::vector<std::byte> mainEncodeFun() {
ZoneScoped
LTRACE("main::mainEncodeFun(begin)");
std::vector<std::byte> data = global::openSpaceEngine.encode();
std::vector<std::byte> data = global::openSpaceEngine->encode();
LTRACE("main::mainEncodeFun(end)");
return data;
@@ -675,7 +675,7 @@ void mainDecodeFun(const std::vector<std::byte>& data, unsigned int) {
ZoneScoped
LTRACE("main::mainDecodeFun(begin)");
global::openSpaceEngine.decode(data);
global::openSpaceEngine->decode(data);
LTRACE("main::mainDecodeFun(end)");
}
@@ -704,7 +704,7 @@ void mainLogCallback(Log::Level level, std::string_view message) {
void setSgctDelegateFunctions() {
WindowDelegate& sgctDelegate = global::windowDelegate;
WindowDelegate& sgctDelegate = *global::windowDelegate;
sgctDelegate.terminate = []() { Engine::instance().terminate(); };
sgctDelegate.setBarrier = [](bool enabled) {
ZoneScoped
@@ -925,6 +925,9 @@ void setSgctDelegateFunctions() {
return currentWindow->swapGroupFrameNumber();
};
sgctDelegate.setScreenshotFolder = [](std::string path) {
Settings::instance().setCapturePath(std::move(path));
};
}
void checkCommandLineForSettings(int& argc, char** argv, bool& hasSGCT, bool& hasProfile,
@@ -959,7 +962,7 @@ std::string setWindowConfigPresetForGui(const std::string labelFromCfgFile,
const std::string xmlExt, bool haveCliSGCTConfig,
const std::string& sgctFunctionName)
{
configuration::Configuration& config = global::configuration;
configuration::Configuration& config = *global::configuration;
std::string preset;
bool sgctConfigFileSpecifiedByLuaFunction = !config.sgctConfigNameInitialized.empty();
@@ -1003,12 +1006,14 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
else {
config = "${CONFIG}/" + config + xmlExt;
}
global::configuration.windowConfiguration = config;
global::configuration->windowConfiguration = config;
}
return config;
}
int main(int argc, char** argv) {
glfwInit();
#ifdef WIN32
SetUnhandledExceptionFilter(generateMiniDump);
#endif // WIN32
@@ -1031,6 +1036,7 @@ int main(int argc, char** argv) {
}
ghoul::initialize();
global::create();
// Register the path of the executable,
// to make it possible to find other files in the same directory.
@@ -1104,7 +1110,7 @@ int main(int argc, char** argv) {
// Loading configuration from disk
LDEBUG("Loading configuration from disk");
global::configuration = configuration::loadConfigurationFromFile(
*global::configuration = configuration::loadConfigurationFromFile(
configurationFilePath
);
// If the user requested a commandline-based configuration script that should
@@ -1113,16 +1119,16 @@ int main(int argc, char** argv) {
LDEBUG("Executing Lua script passed through the commandline:");
LDEBUG(commandlineArguments.configurationOverride);
ghoul::lua::runScript(
global::configuration.state,
global::configuration->state,
commandlineArguments.configurationOverride
);
parseLuaState(global::configuration);
parseLuaState(*global::configuration);
}
// Determining SGCT configuration file
LDEBUG("SGCT Configuration file: " + global::configuration.windowConfiguration);
LDEBUG("SGCT Configuration file: " + global::configuration->windowConfiguration);
windowConfiguration = global::configuration.windowConfiguration;
windowConfiguration = global::configuration->windowConfiguration;
}
catch (const documentation::SpecificationError& e) {
LFATALC("main", "Loading of configuration file failed");
@@ -1145,7 +1151,7 @@ int main(int argc, char** argv) {
return EXIT_FAILURE;
}
global::openSpaceEngine.registerPathTokens();
global::openSpaceEngine->registerPathTokens();
bool hasSGCTConfig = false;
@@ -1164,12 +1170,12 @@ int main(int argc, char** argv) {
);
bool skipLauncher =
(hasProfile && hasSGCTConfig) || global::configuration.bypassLauncher;
(hasProfile && hasSGCTConfig) || global::configuration->bypassLauncher;
if (!skipLauncher) {
int qac = 0;
QApplication app(qac, nullptr);
LauncherWindow win(!hasProfile,
global::configuration, !hasSGCTConfig, windowCfgPreset, nullptr);
*global::configuration, !hasSGCTConfig, windowCfgPreset, nullptr);
win.show();
app.exec();
@@ -1177,7 +1183,7 @@ int main(int argc, char** argv) {
exit(EXIT_SUCCESS);
}
global::configuration.profile = win.selectedProfile();
global::configuration->profile = win.selectedProfile();
windowConfiguration = selectedSgctProfileFromLauncher(
win,
hasSGCTConfig,
@@ -1186,6 +1192,11 @@ int main(int argc, char** argv) {
xmlExt
);
}
if (global::configuration->profile.empty()) {
LFATAL("Cannot launch with an empty profile");
exit(EXIT_FAILURE);
}
// Prepend the outgoing sgctArguments with the program name
// as well as the configuration file that sgct is supposed to use
@@ -1231,11 +1242,12 @@ int main(int argc, char** argv) {
catch (const std::runtime_error& e) {
LFATALC("main", e.what());
Engine::destroy();
global::openSpaceEngine.deinitialize();
global::openSpaceEngine->deinitialize();
ghoul::deinitialize();
throw;
}
catch (...) {
global::openSpaceEngine.deinitialize();
global::openSpaceEngine->deinitialize();
ghoul::deinitialize();
Engine::destroy();
throw;
@@ -1274,8 +1286,9 @@ int main(int argc, char** argv) {
Engine::instance().render();
LINFO("Ending rendering loop");
global::openSpaceEngine.deinitializeGL();
global::openSpaceEngine.deinitialize();
global::openSpaceEngine->deinitializeGL();
global::openSpaceEngine->deinitialize();
global::destroy();
// Clear function bindings to avoid crash after destroying the OpenSpace Engine
Log::instance().setLogCallback(nullptr);

6
data/assets/base.asset
View File

@@ -18,11 +18,13 @@ asset.require('scene/solarsystem/dwarf_planets/pluto/charon/default_layers')
asset.require('scene/milkyway/milkyway/volume')
asset.require('scene/milkyway/constellations/constellation_art')
asset.require('scene/milkyway/constellations/constellation_keybinds')
asset.require('scene/milkyway/objects/orionnebula/orionnebula')
asset.require('util/launcher_images')
local assetHelper = asset.require('util/asset_helper')
assetHelper.requireAll(asset, 'scene/milkyway/exoplanets')
assetHelper.requireAll(asset, 'scene/digitaluniverse')
asset.require('scene/milkyway/exoplanets/exoplanets_data')
asset.require('scene/milkyway/exoplanets/exoplanets_textures')
asset.require('scene/digitaluniverse/digitaluniverse')
asset.require('customization/globebrowsing')

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

@@ -1,10 +1,13 @@
-- Add require statements for assets exporting the neccessary globes
-- here we add Mars, Moon and Mercury:
asset.require('../scene/solarsystem/planets/mars/mars')
asset.require('../scene/solarsystem/planets/earth/moon/moon')
asset.require('../scene/solarsystem/planets/mercury/mercury')
----------------------------------------
-- Configuration options for this asset
local CreateFocusNodes = false
local AddMarsLayers = true
local AddMoonLayers = true
local AddMercuryLayers = true
----------------------------------------
-- If you add layers for different planets than listed here, be sure to add an
-- asset.require(...) statement in here similar to the ones that are used below
-- Add folders to this list that contain .info files describing patches
-- OBS: Even on Windows, you have to use forward slashes (/) or double backslashes (\\)
@@ -22,11 +25,11 @@ local vrt_folders = {
-- example: 'C:/OpenSpace/GlobeBrowsingData/Mars/CTX'
-- We recommend using this folder for CTX
openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'),
openspace.absPath('G:/OpenSpaceData/Mars/CTX'),
-- if not and you have a custom path for CTX layers, enter it below
'',
-- We recommend using this folder for HiRISE
openspace.absPath('${BASE}/../OpenSpaceData/Mars/HiRISE'),
openspace.absPath('G:/OpenSpaceData/Mars/HiRISE'),
-- if not and you have a custom path for HiRISE layers, enter it below
''
},
@@ -36,8 +39,8 @@ local vrt_folders = {
-- if areas overlap, images from the lower results will overwrite the images from former
-- results
-- example: 'C:/OpenSpace/GlobeBrowsingData/Moon'
openspace.absPath('${BASE}/../OpenSpaceData/Moon'),
openspace.absPath('${BASE}/../OpenSpaceData/Apollo'),
openspace.absPath('G:/OpenSpaceData/Moon'),
openspace.absPath('G:/OpenSpaceData/Apollo'),
''
},
Mercury = {
@@ -46,11 +49,29 @@ local vrt_folders = {
-- if areas overlap, images from the lower results will overwrite the images from former
-- results
-- example: 'C:/OpenSpace/GlobeBrowsingData/Mercury'
openspace.absPath('${BASE}/../OpenSpaceData/Mercury'),
openspace.absPath('G:/OpenSpaceData/Mercury'),
''
}
}
-- Add require statements for assets exporting the neccessary globes
-- here we add Mars, Moon and Mercury:
if AddMarsLayers then
asset.require('../scene/solarsystem/planets/mars/mars')
else
vrt_folders['Mars'] = nil
end
if AddMoonLayers then
asset.require('../scene/solarsystem/planets/earth/moon/moon')
else
vrt_folders['Moon'] = nil
end
if AddMercuryLayers then
asset.require('../scene/solarsystem/planets/mercury/mercury')
else
vrt_folders['Mercury'] = nil
end
asset.onInitialize(function ()
-- Add local patches described at the top of this file
for obj, list in pairs(vrt_folders) do

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

@@ -64,5 +64,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH), Eric Gawiser (Rutgers U)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "2dF"
Identifiers = {"2dF"}
}

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

@@ -60,5 +60,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "2MASS"
Identifiers = {"2MASS"}
}

2
data/assets/scene/digitaluniverse/6dF.asset
View File

@@ -61,5 +61,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "6dF"
Identifiers = {"6dF"}
}

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

@@ -70,5 +70,5 @@ asset.meta = {
Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Abell"
Identifiers = {"Abell"}
}

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

@@ -44,7 +44,7 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "StarLabelsAlternate"
Identifiers = {"StarLabelsAlternate"}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { object })

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

@@ -260,6 +260,6 @@ asset.meta = {
Author = "Brian Abbott (AMNH), OpenSpace Team",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "WMAP,CBE,Planck,PlanckMultiverse1,PlanckMultiverse2" ..
"PlanckMultiverse3,PlanckMultiverse4,HAlpha"
Identifiers = {"WMAP", "CBE", "Planck", "PlanckMultiverse1", "PlanckMultiverse2",
"PlanckMultiverse3", "PlanckMultiverse4", "HAlpha"}
}

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

@@ -50,5 +50,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "GalaxyClusterLabels"
Identifiers = {"GalaxyClusterLabels"}
}

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

@@ -53,5 +53,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "ConstellationBounds"
Identifiers = {"ConstellationBounds"}
}

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

@@ -72,5 +72,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Constellations,ConstellationsExtragalactic"
Identifiers = {"Constellations", "ConstellationsExtragalactic"}
}

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

@@ -105,6 +105,6 @@ asset.meta = {
Author = "Nate Greenstein, Matt Everhart, Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "DeepSkyObjects,DeepSkyObjectsImages"
Identifiers = {"DeepSkyObjects", "DeepSkyObjectsImages"}
}

36
data/assets/scene/digitaluniverse/digitaluniverse.asset Normal file
View File

@@ -0,0 +1,36 @@
asset.require('./2dF')
asset.require('./2mass')
asset.require('./6dF')
asset.require('./abell')
asset.require('./alternatestarlabels')
asset.require('./backgroundradiation')
asset.require('./clusters')
asset.require('./constellationbounds')
asset.require('./constellations')
asset.require('./deepsky')
asset.require('./dwarfs')
asset.require('./exoplanets')
asset.require('./globularclusters')
asset.require('./grids')
asset.require('./groups')
asset.require('./h2regions')
asset.require('./kepler')
asset.require('./localdwarfs')
asset.require('./milkyway')
asset.require('./milkyway_arm_labels')
asset.require('./milkyway_data')
asset.require('./milkyway_label')
asset.require('./milkyway_sphere')
asset.require('./obassociations')
asset.require('./openclusters')
asset.require('./planetarynebulae')
asset.require('./pulsars')
asset.require('./quasars')
asset.require('./sdss')
asset.require('./starlabels')
asset.require('./starorbits')
asset.require('./stars')
asset.require('./superclusters')
asset.require('./supernovaremnants')
asset.require('./tully')
asset.require('./voids')

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

@@ -72,5 +72,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Dwarfs"
Identifiers = {"Dwarfs"}
}

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

@@ -61,5 +61,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Exoplanets"
Identifiers = {"Exoplanets"}
}

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

@@ -75,5 +75,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "GlobularClusters"
Identifiers = {"GlobularClusters"}
}

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

@@ -548,8 +548,8 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "RadioSphere,OortSphere,EclipticSphere,EclipticSphereLabels,Equatorial,"
.. "EquatorialSphereLabels,GalacticSphere,GalacticSphereLabels,1ldGrid,1lmGrid,"
.. "1lyGrid,10lyGrid,100lyGrid,1klyGrid,10klyGrid,100klyGrid,1MlyGrid,10MlyGrid,"
.. "100MlyGrid,20GlyGrid"
Identifiers = {"RadioSphere", "OortSphere", "EclipticSphere", "EclipticSphereLabels",
"Equatorial", "EquatorialSphereLabels", "GalacticSphere", "GalacticSphereLabels",
"1ldGrid", "1lmGrid", "1lyGrid", "10lyGrid", "100lyGrid", "1klyGrid", "10klyGrid",
"100klyGrid", "1MlyGrid", "10MlyGrid", "100MlyGrid", "20GlyGrid"}
}

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

@@ -50,5 +50,5 @@ asset.meta = {
Description = [[Digital Universe asset for Galaxy Groups]],
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "NearbyGalaxyGroups"
Identifiers = {"NearbyGalaxyGroups"}
}

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

@@ -63,5 +63,5 @@ asset.meta = {
Author = "Carter Emmart, Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "HIIRegions"
Identifiers = {"HIIRegions"}
}

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

@@ -58,5 +58,5 @@ asset.meta = {
Author = "Brian Abbott, Emily Rice, and Jason No (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "KeplerPlanetaryCandidates"
Identifiers = {"KeplerPlanetaryCandidates"}
}

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

@@ -64,5 +64,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "LocalDwarfGalaxies"
Identifiers = {"LocalDwarfGalaxies"}
}

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

@@ -44,5 +44,5 @@ asset.meta = {
Author = "Brian Abbott, Carter Emmart (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "MilkyWayGalaxyImage"
Identifiers = {"MilkyWayGalaxyImage"}
}

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

@@ -59,5 +59,5 @@ asset.meta = {
any damage resulting from the use of this Atlas. The entire risk as to the quality
and performance of this product is with the user. <br><br> For more information,
please visit http://www.haydenplanetarium.org/universe]],
Identifiers = "MilkyWayGalaxyArmLabelsImage"
Identifiers = {"MilkyWayGalaxyArmLabelsImage"}
}

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

@@ -53,5 +53,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "HomeLabel"
Identifiers = {"HomeLabel"}
}

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

@@ -48,5 +48,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "MilkyWay"
Identifiers = {"MilkyWay"}
}

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

@@ -67,5 +67,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "OBAssociations"
Identifiers = {"OBAssociations"}
}

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

@@ -63,5 +63,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "OpenStarClusters"
Identifiers = {"OpenStarClusters"}
}

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

@@ -60,5 +60,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "PlanetaryNebulae"
Identifiers = {"PlanetaryNebulae"}
}

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

@@ -64,5 +64,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Pulsars"
Identifiers = {"Pulsars"}
}

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

@@ -58,5 +58,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Quasars"
Identifiers = {"Quasars"}
}

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

@@ -73,5 +73,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "SloanDigitalSkySurvey"
Identifiers = {"SloanDigitalSkySurvey"}
}

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

@@ -42,5 +42,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "StarsLabels"
Identifiers = {"StarsLabels"}
}

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

@@ -187,6 +187,6 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "SunOrbit,BarnardsOrbit,KapteynsOrbit,pM_J13420Orbit,LSR1826Orbit," ..
"LSRJ0822Orbit,lacaille9352Orbit"
Identifiers = {"SunOrbit", "BarnardsOrbit", "KapteynsOrbit", "pM_J13420Orbit",
"LSR1826Orbit", "LSRJ0822Orbit", "lacaille9352Orbit"}
}

5
data/assets/scene/digitaluniverse/stars.asset
View File

@@ -66,7 +66,8 @@ local sunstar = {
MagnitudeExponent = 6.2,
SizeComposition = "Distance Modulus",
RenderMethod = "Texture Based", -- or PSF
FadeInDistances = { 0.0001, 0.1 }
FadeInDistances = { 0.0001, 0.1 },
RenderableType = "PostDeferredTransparent"
},
GUI = {
Name = "Sun",
@@ -86,5 +87,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Stars"
Identifiers = {"Stars"}
}

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

@@ -58,5 +58,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "GalaxySuperclusters"
Identifiers = {"GalaxySuperclusters"}
}

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

@@ -59,5 +59,5 @@ asset.meta = {
Author = "Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "SupernovaRemnants"
Identifiers = {"SupernovaRemnants"}
}

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

@@ -124,5 +124,5 @@ asset.meta = {
Author = "Stuart Levy (NCSA/UIUC), Brian Abbott (AMNH)",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "TullyGalaxies,TullyGalaxiesImages"
Identifiers = {"TullyGalaxies" , "TullyGalaxiesImages"}
}

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

@@ -50,5 +50,5 @@ asset.meta = {
Description = [[Digital Universe asset for Cosmic voids.]],
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "Voids"
Identifiers = {"Voids"}
}

2
data/assets/scene/milkyway/milkyway/volume.asset
View File

@@ -62,5 +62,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT License",
Identifiers = "MilkyWayVolume"
Identifiers = {"MilkyWayVolume"}
}

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

@@ -16,7 +16,7 @@ local OrionClusterStars = {
Type = "RenderableStars",
File = sync .. "/oricluster.speck",
Texture = sync .. "/halo.png",
Texture = sync .. "/colorbv.cmap",
ColorMap = sync .. "/colorbv.cmap",
MagnitudeExponent = 5.02,
SizeComposition = "Distance Modulus",
RenderMethod = "Texture Based"
@@ -49,5 +49,5 @@ cluster distribution. ]],
Author = "AMNH Digital Universe",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "OrionClusterStars"
Identifiers = {"OrionClusterStars"}
}

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

@@ -54,8 +54,9 @@ local OrionNebulaModel = {
Opacity = 1.0,
DisableFaceCulling = false,
SpecularIntensity = 0.0,
AmbientIntensity = 0.45,
DiffuseIntensity = 0.0,
AmbientIntensity = 0.0,
DiffuseIntensity = 1.0,
--PerformShading = false,
RotationVector = { 0.000000, 22.300000, 0.000000 },
LightSources = LIGHTS;
},
@@ -85,8 +86,9 @@ local OrionNebulaShocksModel = {
Opacity = 1.0,
DisableFaceCulling = false,
SpecularIntensity = 0.0,
AmbientIntensity = 0.19,
DiffuseIntensity = 0.4,
AmbientIntensity = 0.0,
DiffuseIntensity = 1.0,
--PerformShading = false,
RotationVector = { 0.000000, 22.300000, 0.000000 },
LightSources = LIGHTS;
},
@@ -116,8 +118,9 @@ local OrionNebulaProplydsModel = {
Opacity = 1.0,
DisableFaceCulling = false,
SpecularIntensity = 0.0,
AmbientIntensity = 1.0,
AmbientIntensity = 0.0,
DiffuseIntensity = 1.0,
--PerformShading = false,
RotationVector = { 0.000000, 22.300000, 0.000000 },
LightSources = LIGHTS;
},
@@ -155,6 +158,6 @@ and the bow shocks are part of the outward rush of material. ]],
Author = "AMNH Digital Universe",
URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
License = "AMNH Digital Universe",
Identifiers = "OrionNebulaModel,OrionNebulaModel,OrionNebulaProplydsModel,"..
"OrionNebulaShocksModel"
Identifiers = {"OrionNebulaModel", "OrionNebulaModel", "OrionNebulaProplydsModel",
"OrionNebulaShocksModel"}
}

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

@@ -111,5 +111,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "EarthAtmosphere"
Identifiers = {"EarthAtmosphere"}
}

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

@@ -91,5 +91,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "Earth,EarthLabel"
Identifiers = {"Earth", "EarthLabel"}
}

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

@@ -35,5 +35,5 @@ asset.meta = {
Author = "NASA EOSDIS Global Imagery Browse Services",
URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs",
License = "NASA",
Identifiers = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal"
Identifiers = {"AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal"}
}

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

@@ -40,5 +40,5 @@ asset.meta = {
Author = "NASA EOSDIS Global Imagery Browse Services",
URL = "https://earthdata.nasa.gov/eosdis/science-system-description/eosdis-components/gibs",
License = "NASA",
Identifiers = "Aqua_Modis_Temporal"
Identifiers = {"Aqua_Modis_Temporal"}
}

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

@@ -24,5 +24,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble",
License = "NASA",
Identifiers = "BMNG_Sweden"
Identifiers = {"BMNG_Sweden"}
}

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

@@ -24,5 +24,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble",
License = "NASA",
Identifiers = "BMNG_Utah"
Identifiers = {"BMNG_Utah"}
}

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

@@ -30,5 +30,5 @@ asset.meta = {
Author = "ESRI",
URL = "https://www.arcgis.com/home/item.html?id=21b4ba14d9e5472d97afcbb819f7368e",
License = "Esri Master License Agreement",
Identifiers = "ESRI_Imagery_World_2D"
Identifiers = {"ESRI_Imagery_World_2D"}
}

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

@@ -56,5 +56,5 @@ asset.meta = {
Author = "OpenSpace Tem",
URL = "http://www.openspaceproject.com",
License = "MIT License",
Identifiers = "ESRI_VIIRS_Combo"
Identifiers = {"ESRI_VIIRS_Combo"}
}

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

@@ -31,5 +31,5 @@ asset.meta = {
Author = "ESRI",
URL = "https://www.arcgis.com/home/item.html?id=10df2279f9684e4a9f6a7f08febac2a9",
License = "Esri Master License Agreement",
Identifiers = "ESRI_World_Imagery"
Identifiers = {"ESRI_World_Imagery"}
}

2
data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset
View File

@@ -19,5 +19,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble",
License = "NASA",
Identifiers = "Blue_Marble"
Identifiers = {"Blue_Marble"}
}

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

@@ -34,5 +34,5 @@ asset.meta = {
URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" ..
"eosdis-components/gibs",
License = "NASA",
Identifiers = "GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal"
Identifiers = {"GHRSST_L4_G1SST_Sea_Surface_Temperature_Temporal"}
}

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

@@ -32,5 +32,5 @@ asset.meta = {
URL = "https://earthdata.nasa.gov/eosdis/science-system-description/"..
"eosdis-components/gibs",
License = "NASA",
Identifiers = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal"
Identifiers = {"GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal"}
}

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

@@ -32,5 +32,5 @@ asset.meta = {
URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" ..
"eosdis-components/gibs",
License = "NASA",
Identifiers = "MODIS_Terra_Chlorophyll_A_Temporal"
Identifiers = {"MODIS_Terra_Chlorophyll_A_Temporal"}
}

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

@@ -32,5 +32,5 @@ asset.meta = {
URL = "https://earthdata.nasa.gov/eosdis/science-system-description/"..
"eosdis-components/gibs",
License = "NASA",
Identifiers = "Terra_Modis_Temporal"
Identifiers = {"Terra_Modis_Temporal"}
}

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

@@ -32,5 +32,5 @@ asset.meta = {
URL = "https://earthdata.nasa.gov/eosdis/science-system-description/" ..
"eosdis-components/gibs",
License = "NASA",
Identifiers = "VIIRS_SNPP_Temporal"
Identifiers = {"VIIRS_SNPP_Temporal"}
}

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

@@ -18,5 +18,5 @@ asset.meta = {
Author = "NASA",
URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble",
License = "NASA",
Identifiers = "Earth_Bluemarble_Height"
Identifiers = {"Earth_Bluemarble_Height"}
}

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

@@ -31,5 +31,5 @@ asset.meta = {
Author = "ESRI",
URL = "https://www.arcgis.com/home/item.html?id=1b48cd3b6276416784fe90a68c580a89",
License = "Esri Master License Agreement",
Identifiers = "Terrain_tileset"
Identifiers = {"Terrain_tileset"}
}

2
data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_2012.asset
View File

@@ -26,5 +26,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "https://visibleearth.nasa.gov/images/79765/night-lights-2012-map",
License = "NASA",
Identifiers = "Earth_at_Night_2012"
Identifiers = {"Earth_at_Night_2012"}
}

2
data/assets/scene/solarsystem/planets/earth/layers/nightlayers/earth_at_night_temporal.asset
View File

@@ -47,5 +47,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "https://worldview.earthdata.nasa.gov/?l=VIIRS_SNPP_DayNightBand_ENCC",
License = "NASA",
Identifiers = "Earth_at_Night_Temporal"
Identifiers = {"Earth_at_Night_Temporal"}
}

2
data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset
View File

@@ -17,5 +17,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "https://visibleearth.nasa.gov/collection/1484/blue-marble",
License = "NASA",
Identifiers = "Earth_Night_Texture"
Identifiers = {"Earth_Night_Texture"}
}

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

@@ -32,5 +32,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "EarthMarker"
Identifiers = {"EarthMarker"}
}

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

@@ -67,5 +67,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "Moon"
Identifiers = {"Moon"}
}

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

@@ -36,5 +36,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "MoonTrail"
Identifiers = {"MoonTrail"}
}

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

@@ -36,5 +36,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "EarthTrail"
Identifiers = {"EarthTrail"}
}

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

@@ -89,5 +89,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "EarthBarycenter,EarthCenter,EarthInertial,EarthIAU"
Identifiers = {"EarthBarycenter", "EarthCenter", "EarthInertial", "EarthIAU"}
}

2
data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
View File

@@ -60,5 +60,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "Callisto"
Identifiers = {"Callisto"}
}

2
data/assets/scene/solarsystem/planets/jupiter/callisto/trail.asset
View File

@@ -38,5 +38,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "CallistoTrail"
Identifiers = {"CallistoTrail"}
}

2
data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
View File

@@ -60,5 +60,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "Europa"
Identifiers = {"Europa"}
}

2
data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic.asset
View File

@@ -31,5 +31,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" ..
"Europa_Voyager_GalileoSSI_global_mosaic_500m",
License = "NASA/PDS",
Identifiers = "Voyager_Global_Mosaic"
Identifiers = {"Voyager_Global_Mosaic"}
}

2
data/assets/scene/solarsystem/planets/jupiter/europa/trail.asset
View File

@@ -38,5 +38,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "EuropaTrail"
Identifiers = {"EuropaTrail"}
}

2
data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
View File

@@ -60,5 +60,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "Ganymede"
Identifiers = {"Ganymede"}
}

2
data/assets/scene/solarsystem/planets/jupiter/ganymede/trail.asset
View File

@@ -38,5 +38,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "GanymedeTrail"
Identifiers = {"GanymedeTrail"}
}

2
data/assets/scene/solarsystem/planets/jupiter/io/io.asset
View File

@@ -60,5 +60,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "Io"
Identifiers = {"Io"}
}

2
data/assets/scene/solarsystem/planets/jupiter/io/trail.asset
View File

@@ -38,5 +38,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "IoTrail"
Identifiers = {"IoTrail"}
}

2
data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
View File

@@ -56,5 +56,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "Jupiter,JupiterLabel"
Identifiers = {"Jupiter", "JupiterLabel"}
}

2
data/assets/scene/solarsystem/planets/jupiter/trail.asset
View File

@@ -36,5 +36,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "JupiterTrail"
Identifiers = {"JupiterTrail"}
}

2
data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset
View File

@@ -36,7 +36,7 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "VenusTrailEarth"
Identifiers = {"VenusTrailEarth"}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterTrailEarth })

2
data/assets/scene/solarsystem/planets/jupiter/transforms.asset
View File

@@ -31,5 +31,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "JupiterBarycenter"
Identifiers = {"JupiterBarycenter"}
}

2
data/assets/scene/solarsystem/planets/mars/atmosphere.asset
View File

@@ -74,5 +74,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
Identifiers = "MarsAtmosphere"
Identifiers = {"MarsAtmosphere"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/HiRISE.asset
View File

@@ -38,5 +38,5 @@ asset.meta = {
Author = "esri_astro",
URL = "https://www.arcgis.com/home/item.html?id=c1c4c750a2154842ae523c984cc14fa5",
License = "Esri Master License Agreement",
Identifiers = "HiRISE-PSP"
Identifiers = {"HiRISE-PSP"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/ctx_blended_01.asset
View File

@@ -42,5 +42,5 @@ asset.meta = {
Author = "Caltech Murray Lab",
URL = "http://murray-lab.caltech.edu/CTX/",
License = "Esri Master License Agreement",
Identifiers = "CTX_blended_01"
Identifiers = {"CTX_blended_01"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/hirisels.asset
View File

@@ -35,7 +35,7 @@ asset.meta = {
Author = "USGS",
URL = "https://www.uahirise.org",
License = "Esri Master License Agreement",
Identifiers = "HiRISE-LS"
Identifiers = {"HiRISE-LS"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_liu.asset
View File

@@ -33,5 +33,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://www.openspaceproject.com",
License = "NASA/PDS",
Identifiers = "MOLA_HRSC_Sweden"
Identifiers = {"MOLA_HRSC_Sweden"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/moc_wa_color_utah.asset
View File

@@ -33,5 +33,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://www.openspaceproject.com",
License = "NASA/PDS",
Identifiers = "MOC_WA_Color_Utah"
Identifiers = {"MOC_WA_Color_Utah"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_sweden.asset
View File

@@ -26,5 +26,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://www.openspaceproject.com",
License = "NASA/PDS",
Identifiers = "MOLA_HRSC_Sweden"
Identifiers = {"MOLA_HRSC_Sweden"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_hrsc_utah.asset
View File

@@ -26,5 +26,5 @@ asset.meta = {
Author = "OpenSpace Team",
URL = "http://www.openspaceproject.com",
License = "NASA/PDS",
Identifiers = "MOLA_HRSC_Sweden"
Identifiers = {"MOLA_HRSC_Sweden"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_sweden.asset
View File

@@ -37,5 +37,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" ..
"Mars_MGS_MOLA_ClrShade_merge_global_463m",
License = "NASA/PDS",
Identifiers = "MOLA_Pseudo_Color_Sweden"
Identifiers = {"MOLA_Pseudo_Color_Sweden"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/mola_pseudo_color_utah.asset
View File

@@ -37,5 +37,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Mars/GlobalSurveyor/MOLA/" ..
"Mars_MGS_MOLA_ClrShade_merge_global_463m",
License = "NASA/PDS",
Identifiers = "MOLA_Pseudo_Color_Utah"
Identifiers = {"MOLA_Pseudo_Color_Utah"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_sweden.asset
View File

@@ -34,5 +34,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" ..
"Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12",
License = "NASA/PDS",
Identifiers = "Themis_IR_Day_Sweden"
Identifiers = {"Themis_IR_Day_Sweden"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_day_utah.asset
View File

@@ -34,5 +34,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" ..
"Mars_MO_THEMIS-IR-Day_mosaic_global_100m_v12",
License = "NASA/PDS",
Identifiers = "Themis_IR_Day_Utah"
Identifiers = {"Themis_IR_Day_Utah"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_sweden.asset
View File

@@ -35,5 +35,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" ..
"Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14",
License = "NASA/PDS",
Identifiers = "Themis_IR_Night_Sweden"
Identifiers = {"Themis_IR_Night_Sweden"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/themis_ir_night_utah.asset
View File

@@ -35,5 +35,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Mars/Odyssey/THEMIS-IR-Mosaic-ASU/" ..
"Mars_MO_THEMIS-IR-Night_mosaic_60N60S_100m_v14",
License = "NASA/PDS",
Identifiers = "Themis_IR_Night_Utah"
Identifiers = {"Themis_IR_Night_Utah"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_sweden.asset
View File

@@ -42,5 +42,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" ..
"Mars_Viking_MDIM21_ClrMosaic_global_232m",
License = "NASA/PDS",
Identifiers = "Viking_MDIM_Sweden"
Identifiers = {"Viking_MDIM_Sweden"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/colorlayers/viking_mdim_utah.asset
View File

@@ -42,5 +42,5 @@ asset.meta = {
URL = "https://astrogeology.usgs.gov/search/map/Mars/Viking/MDIM21/" ..
"Mars_Viking_MDIM21_ClrMosaic_global_232m",
License = "NASA/PDS",
Identifiers = "Viking_MDIM_Utah"
Identifiers = {"Viking_MDIM_Utah"}
}

2
data/assets/scene/solarsystem/planets/mars/layers/heightlayers/hirisels.asset
View File

@@ -33,7 +33,7 @@ asset.meta = {
Author = "USGS",
URL = "https://www.uahirise.org",
License = "Esri Master License Agreement",
Identifiers = "HiRISE-LS-DEM"
Identifiers = {"HiRISE-LS-DEM"}
}

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