mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-05-06 19:39:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature/jwst

Browse Source 
* Resolve conflict
This commit is contained in:
Malin Ejdbo
2021-05-31 15:45:10 +02:00
parent 139d1f7dd5 402233da85
commit 9f7b8aa32b
154 changed files with 1738 additions and 2216 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/OpenSpace/ext/launcher/include/launcherwindow.h
+1
View File
@@ -96,6 +96,7 @@ private:
bool _shouldLaunch = false;
int _userAssetCount = 0;
int _userConfigCount = 0;
const std::string _sgctConfigName;
QComboBox* _profileBox = nullptr;
QComboBox* _windowConfigBox = nullptr;
apps/OpenSpace/ext/launcher/include/profile/modulesdialog.h
+1 -1
View File
@@ -82,7 +82,7 @@ private:
QLineEdit* _loadedEdit = nullptr;
QLabel* _notLoadedLabel = nullptr;
QLineEdit* _notLoadedEdit = nullptr;
QPushButton* _buttonAdd = nullptr;
QPushButton* _buttonRemove = nullptr;
QPushButton* _buttonSave = nullptr;
apps/OpenSpace/ext/launcher/src/launcherwindow.cpp
+6 -2
View File
@@ -150,6 +150,7 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
absPath(globalConfig.pathTokens.at("USER_PROFILES")).string() + '/'
)
, _readOnlyProfiles(globalConfig.readOnlyProfiles)
, _sgctConfigName(sgctConfigName)
{
Q_INIT_RESOURCE(resources);
@@ -177,7 +178,7 @@ LauncherWindow::LauncherWindow(bool profileEnabled,
populateProfilesList(globalConfig.profile);
_profileBox->setEnabled(profileEnabled);
populateWindowConfigsList(sgctConfigName);
populateWindowConfigsList(_sgctConfigName);
_windowConfigBox->setEnabled(sgctConfigEnabled);
@@ -458,7 +459,10 @@ std::string LauncherWindow::selectedProfile() const {
}
std::string LauncherWindow::selectedWindowConfig() const {
if (_windowConfigBox->currentIndex() > _userAssetCount) {
int idx = _windowConfigBox->currentIndex();
if (idx == 0) {
return _sgctConfigName;
} else if (idx > _userAssetCount) {
return "${CONFIG}/" + _windowConfigBox->currentText().toStdString();
}
else {
apps/OpenSpace/ext/launcher/src/profile/keybindingsdialog.cpp
-3
View File
@@ -460,9 +460,6 @@ void KeybindingsDialog::listItemRemove() {
}
void KeybindingsDialog::transitionToEditMode() {
_list->setDisabled(true);
_addButton->setDisabled(true);
_removeButton->setDisabled(true);
_saveButton->setDisabled(true);
_cancelButton->setDisabled(true);
_buttonBox->setDisabled(true);
apps/OpenSpace/ext/launcher/src/profile/modulesdialog.cpp
-3
View File
@@ -297,9 +297,6 @@ void ModulesDialog::listItemRemove() {
}
void ModulesDialog::transitionToEditMode() {
_list->setDisabled(true);
_buttonAdd->setDisabled(true);
_buttonRemove->setDisabled(true);
_buttonSave->setDisabled(true);
_buttonCancel->setDisabled(true);
_buttonBox->setDisabled(true);
apps/OpenSpace/ext/launcher/src/profile/propertiesdialog.cpp
-3
View File
@@ -302,9 +302,6 @@ void PropertiesDialog::listItemRemove() {
}
void PropertiesDialog::transitionToEditMode() {
_list->setDisabled(true);
_addButton->setDisabled(true);
_removeButton->setDisabled(true);
_saveButton->setDisabled(true);
_cancelButton->setDisabled(true);
_buttonBox->setDisabled(true);
apps/OpenSpace/main.cpp
+8 -9
View File
@@ -976,14 +976,6 @@ std::string setWindowConfigPresetForGui(const std::string labelFromCfgFile,
}
else {
preset = config.windowConfiguration;
if (preset.find('/') != std::string::npos) {
preset.erase(0, preset.find_last_of('/') + 1);
}
if (preset.length() >= xmlExt.length()) {
if (preset.substr(preset.length() - xmlExt.length()) == xmlExt) {
preset = preset.substr(0, preset.length() - xmlExt.length());
}
}
}
return preset;
}
@@ -1005,7 +997,14 @@ std::string selectedSgctProfileFromLauncher(LauncherWindow& lw, bool hasCliSGCTC
}
}
else {
config += xmlExt;
if ( (config.length() >= xmlExt.length())
&& (0 == config.compare(config.length() - xmlExt.length(), xmlExt.length(), xmlExt)) ) {
//user customzied sgct config
}
else {
config += xmlExt;
}
}
global::configuration->windowConfiguration = config;
}
data/assets/customization/globebrowsing.asset
+6 -5
View File
@@ -4,6 +4,7 @@ local CreateFocusNodes = false
local AddMarsLayers = true
local AddMoonLayers = true
local AddMercuryLayers = true
local DataFolder = openspace.absPath('${BASE}/../OpenSpaceData')
----------------------------------------
-- If you add layers for different planets than listed here, be sure to add an
@@ -25,11 +26,11 @@ local vrt_folders = {
-- example: 'C:/OpenSpace/GlobeBrowsingData/Mars/CTX'
-- We recommend using this folder for CTX
openspace.absPath('${BASE}/../OpenSpaceData/Mars/CTX'),
DataFolder .. '/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'),
DataFolder .. '/Mars/HiRISE',
-- if not and you have a custom path for HiRISE layers, enter it below
''
},
@@ -39,8 +40,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'),
DataFolder .. '/Moon',
DataFolder .. '/Apollo',
''
},
Mercury = {
@@ -49,7 +50,7 @@ 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'),
DataFolder .. '/Mercury',
''
}
}
data/assets/examples/grids.asset
+1 -2
View File
@@ -17,8 +17,7 @@ local radialGrid = {
Color = { 0.6, 1.0, 0.7 },
LineWidth = 3.0,
GridSegments = { 3, 4 },
OuterRadius = 1.0,
InnerRadius = 0.2,
Radii = { 0.2, 1.0 },
Enabled = false
},
GUI = {
data/assets/examples/primitives.asset
+3 -3
View File
@@ -16,7 +16,7 @@ local circle = {
LineWidth = 3.0,
GridSegments = { 1, 1 },
CircleSegments = 64,
OuterRadius = 1.0
Radii = { 0.0, 1.0 }
},
GUI = {
Name = "Example Circle",
@@ -29,7 +29,7 @@ local ellipse = {
Transform = {
Scale = {
Type = "NonUniformStaticScale",
Scale = {1.5, 1.0, 1.0}
Scale = { 1.5, 1.0, 1.0 }
}
},
Renderable = {
@@ -38,7 +38,7 @@ local ellipse = {
LineWidth = 3.0,
GridSegments = { 1, 1 },
CircleSegments = 64,
OuterRadius = scale
Radii = { 0.0, scale }
},
GUI = {
Name = "Example Ellipse",
data/assets/global/openspacebookmarks.asset
+1 -1
View File
@@ -15,7 +15,7 @@ local bookmarksCSV = asset.syncedResource({
local nodes = {}
asset.onInitialize(function ()
nodes = bookmarkHelper.getBookmarks('OpenSpace Bookmarks', bookmarksCSV .. '/bookmarks.csv.txt')
nodes = bookmarkHelper.getBookmarks('OpenSpace Bookmarks', bookmarksCSV .. '/bookmarks.csv')
for _, n in ipairs(nodes) do
openspace.addSceneGraphNode(n);
end
data/assets/scene/digitaluniverse/2dF.asset
+2 -2
View File
@@ -24,13 +24,13 @@ local object = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 1.0,
File = speck .. "/2dF.speck",
Unit = "Mpc",
Texture = textures .. "/point3A.png",
ColorMap = speck .. "/2dF.cmap",
ColorOption = { "redshift", "proximity" },
ColorRange = { { 0.0, 0.075 }, { 1.0, 25.0 } },
Unit = "Mpc",
ScaleFactor = 520.0,
BillboardMaxSize = 4.7,
BillboardMinMaxSize = { 0.0, 4.7 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/2mass.asset
+2 -2
View File
@@ -24,15 +24,15 @@ local object = {
Color = { 1.0, 0.4, 0.2 },
Opacity = 1.0,
File = speck .. "/2MASS.speck",
Unit = "Mpc",
Texture = textures .. "/point3A.png",
ColorMap = speck .. "/lss.cmap",
ColorOption = { "redshift", "prox5Mpc" },
ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } },
Unit = "Mpc",
CorrectionSizeEndDistance = 20.6,
CorrectionSizeFactor = 15.0,
ScaleFactor = 510.78,
BillboardMaxSize = 11.15,
BillboardMinMaxSize = { 0.0, 11.15 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/6dF.asset
+3 -3
View File
@@ -24,14 +24,14 @@ local object = {
Color = { 1.0, 1.0, 0.0 },
Opacity = 1.0,
File = speck .. "/6dF.speck",
Unit = "Mpc",
Texture = textures .. "/point3A.png",
ColorMap = speck .. "/6dF.cmap",
ColorOption = { "redshift", "proximity" },
ColorRange = { { 0.0, 0.075 }, { 1.0, 10.0 } },
Unit = "Mpc",
ScaleFactor = 534.0,
BillboardMaxSize = 9.0,
EnablePixelSizeControl = true,
BillboardMinMaxSize = { 0.0, 9.0 },
EnablePixelSizeControl = true
},
GUI = {
Name = "6dF Galaxies",
data/assets/scene/digitaluniverse/abell.asset
+3 -3
View File
@@ -27,10 +27,10 @@ local object = {
File = speck .. "/abell.speck",
Texture = textures .. "/point3A.png",
LabelFile = speck .. "/abell.label",
Unit = "Mpc",
TextColor = { 0.0, 0.8, 0.0 },
TextSize = 22,
TextMinSize = 10.0,
Unit = "Mpc",
TextMinMaxSize = { 10, 12 },
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,
-0.074553778365, -0.080991471307, 0.9939225904, 0.0,
@@ -38,7 +38,7 @@ local object = {
0.0, 0.0, 0.0, 1.0
},
ScaleFactor = 520.0,
BillboardMaxSize = 7.0,
BillboardMinMaxSize = { 0.0, 7.0 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/alternatestarlabels.asset
+2 -2
View File
@@ -17,11 +17,11 @@ local object = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
LabelFile = speck .. "/stars-altlbl.label",
Unit = "pc",
TextColor = { 0.4, 0.4, 0.4 },
DrawLabels = true,
TextSize = 14.7,
TextMinSize = 6.0,
Unit = "pc"
TextMinMaxSize = { 6, 20 }
},
GUI = {
Name = "Stars Labels - Alternate",
data/assets/scene/digitaluniverse/clusters.asset
+2 -2
View File
@@ -17,11 +17,11 @@ local object = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
LabelFile = speck .. "/galclust.label",
Unit = "Mpc",
TextColor = { 1.0, 0.44, 0.0 },
DrawLabels = true,
TextSize = 22,
TextMinSize = 8.0,
Unit = "Mpc",
TextMinMaxSize = { 8, 20 },
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,
-0.074553778365, -0.080991471307, 0.9939225904, 0.0,
data/assets/scene/digitaluniverse/constellations.asset
+2 -4
View File
@@ -20,8 +20,7 @@ local constellationsExtragalactic = {
TextColor = { 0.8, 0.8, 0.8 },
TextOpacity = 0.4,
TextSize = 20.0,
TextMinSize = 20.0,
TextMaxSize = 30.0,
TextMinMaxSize = { 20, 30 },
MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
Unit = "Mpc"
},
@@ -42,8 +41,7 @@ local constellations = {
TextColor = { 0.8, 0.8, 0.8 },
TextOpacity = 0.3,
TextSize = 14.5,
TextMaxSize = 170.0,
TextMinSize = 8.0,
TextMinMaxSize = { 8, 170 },
MeshColor = { { 0.6, 0.4, 0.4 }, { 0.8, 0.0, 0.0 }, { 0.0, 0.3, 0.8 } },
Unit = "pc"
},
data/assets/scene/digitaluniverse/deepsky.asset
+4 -7
View File
@@ -30,15 +30,12 @@ local deepSkyPoints = {
--ColorOption = { "prox5Mpc" },
--ColorRange = { { 1.0, 30.0 } },
LabelFile = speck .. "/dso.label",
Unit = "pc",
TextColor = { 0.1, 0.4, 0.6 },
TextSize = 20.50,
TextMinSize = 16.0,
Unit = "pc",
-- Fade in value in the same unit as "Unit"
--FadeInDistances = { 0.05, 1.0 },
-- Max size in pixels
BillboardMaxSize = 8.22,
BillboardMinSize = 0.0,
TextMinMaxSize = { 16, 20 },
--FadeInDistances = { 0.05, 1.0 }, -- Fade in value in the same unit as "Unit"
BillboardMinMaxSize = { 0.0, 8.22 }, -- in pixels
--CorrectionSizeEndDistance = 22.0,
--CorrectionSizeFactor = 10.45
EnablePixelSizeControl = true
data/assets/scene/digitaluniverse/dwarfs.asset
+4 -4
View File
@@ -26,18 +26,18 @@ local object = {
File = speck .. "/dwarfs.speck",
Texture = textures .. "/point3.png",
LabelFile = speck .. "/dwarfs.label",
Unit = "pc",
ColorMap = speck .. "/dwarfs.cmap",
ColorOption = { "typeindex" },
--ColorRange = { { 1.0, 4.0} },
TextColor = { 0.5, 0.1, 0.2 },
TextSize = 14.6,
TextMinSize = 10.0,
TextMinMaxSize = { 10, 20 },
ScaleFactor = 372.1,
--CorrectionSizeEndDistance = 16.1,
--CorrectionSizeFactor = 7.75,
BillboardMaxSize = 20.0,
EnablePixelSizeControl = true,
Unit = "pc"
BillboardMinMaxSize = { 0.0, 20.0 },
EnablePixelSizeControl = true
},
GUI = {
Name = "Brown Dwarfs",
data/assets/scene/digitaluniverse/exoplanets.asset
+3 -4
View File
@@ -27,15 +27,14 @@ local object = {
Texture = textures .. "/target-blue.png",
File = speck .. "/expl.speck",
LabelFile = speck .. "/expl.label",
Unit = "pc",
ScaleFactor = 388.67923,
TextColor = { 0.3, 0.3, 0.8 },
TextSize = 14.8,
TextMaxSize = 200.0,
TextMinSize = 10.0,
TextMinMaxSize = { 10, 100 },
CorrectionSizeEndDistance = 15.23,
CorrectionSizeFactor = 13.3,
Unit = "pc",
BillboardMaxSize = 75.0,
BillboardMinMaxSize = { 0.0, 75.0 },
EnablePixelSizeControl = true,
},
GUI = {
data/assets/scene/digitaluniverse/globularclusters.asset
+3 -4
View File
@@ -27,13 +27,12 @@ local object = {
Texture = textures .. "/point4.png",
PolygonSides = 5,
LabelFile = speck .. "/gc.label",
Unit = "pc",
TextColor = { 0.5, 0.5, 0.0 },
ScaleFactor = 431.0,
TextSize = 16.7,
TextMinSize = 4.0,
TextMaxSize = 20,
Unit = "pc",
BillboardMaxSize = 500,
TextMinMaxSize = { 4, 20 },
BillboardMinMaxSize = { 0.0, 500.0 },
EnablePixelSizeControl = true,
},
GUI = {
data/assets/scene/digitaluniverse/grids.asset
+18 -33
View File
@@ -110,12 +110,11 @@ local eclipticLabels = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
LabelFile = speck .. "/eclip.label",
Unit = "pc",
DrawLabels = true,
TextColor = { 0.5, 0.5, 0.5 },
TextSize = 14.75,
TextMinSize = 1.3,
TextMaxSize = 50.0,
Unit = "pc",
TextMinMaxSize = { 1, 50 },
TransformationMatrix = {
-0.05487554, 0.4941095, -0.8676661, 0.0,
-0.9938214 , -0.1109906, -0.0003515167, 0.0,
@@ -164,12 +163,11 @@ local equatorialLabels = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
LabelFile = speck .. "/radec.label",
Unit = "pc",
DrawLabels = true,
TextColor = { 0.5, 0.5, 0.5 },
TextSize = 14.5,
TextMinSize = 1.7,
TextMaxSize = 70.0,
Unit = "pc",
TextMinMaxSize = { 2, 70 },
TransformationMatrix = {
-0.05487554, 0.4941095, -0.8676661, 0.0,
-0.8734371 , -0.4448296, -0.1980764, 0.0,
@@ -214,12 +212,11 @@ local galacticLabels = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
LabelFile = speck .. "/galac.label",
Unit = "pc",
DrawLabels = true,
TextColor = { 0.5, 0.5, 0.5 },
TextSize = 15.8,
TextMinSize = 0.5,
TextMaxSize = 100.0,
Unit = "pc"
TextMinMaxSize = { 1, 100 }
},
GUI = {
Name = "Galactic Sphere Labels",
@@ -245,8 +242,7 @@ local plane1ld = {
LabelFile = speck .. "/1ld.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 10.3,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "Km"
},
GUI = {
@@ -273,8 +269,7 @@ local plane1lm = {
LabelFile = speck .. "/1lm.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 11.8,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -301,8 +296,7 @@ local plane1ly = {
LabelFile = speck .. "/1ly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 13.0,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -329,8 +323,7 @@ local plane10ly = {
LabelFile = speck .. "/10ly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 14.17,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -357,8 +350,7 @@ local plane100ly = {
LabelFile = speck .. "/100ly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 15.0,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -385,8 +377,7 @@ local plane1kly = {
LabelFile = speck .. "/1kly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 16.0,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -413,8 +404,7 @@ local plane10kly = {
LabelFile = speck .. "/10kly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 17.25,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -434,8 +424,7 @@ local plane100kly = {
LabelFile = speck .. "/100kly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 18.6,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "Mpc"
},
GUI = {
@@ -455,8 +444,7 @@ local plane1Mly = {
LabelFile = speck .. "/1Mly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 19.6,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "Mpc"
},
GUI = {
@@ -476,8 +464,7 @@ local plane10Mly = {
LabelFile = speck .. "/10Mly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 20.6,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "Mpc"
},
GUI = {
@@ -497,8 +484,7 @@ local plane100Mly = {
LabelFile = speck .. "/100Mly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 21.6,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "Mpc"
},
GUI = {
@@ -518,8 +504,7 @@ local plane20Gly = {
LabelFile = speck .. "/20Gly.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 23.6,
TextMinSize = 0.5,
TextMaxSize = 30.0,
TextMinMaxSize = { 0, 30 },
Unit = "Mpc"
},
GUI = {
data/assets/scene/digitaluniverse/groups.asset
+2 -2
View File
@@ -18,10 +18,10 @@ local object = {
Opacity = 0.65,
--ScaleFactor = 10.0,
LabelFile = speck .. "/groups.label",
Unit = "Mpc",
TextColor = { 0.1, 0.6, 0.2 },
TextSize = 21.5,
TextMinSize = 8.0,
Unit = "Mpc",
TextMinMaxSize = { 8, 20 },
DrawLabels = true,
TransformationMatrix = {
-0.7357425748, 0.67726129641, 0.0, 0.0,
data/assets/scene/digitaluniverse/h2regions.asset
+3 -4
View File
@@ -27,13 +27,12 @@ local object = {
Texture = textures .."/point4.png",
PolygonSides = 6,
LabelFile = speck .. "/h2.label",
Unit = "pc",
TextColor = { 0.5, 0.5, 0.5 },
ScaleFactor = 420,
TextSize = 16.24,
TextMinSize = 4.0,
TextMaxSize = 20.0,
Unit = "pc",
BillboardMaxSize = 300.0,
TextMinMaxSize = { 4, 20 },
BillboardMinMaxSize = { 0.0, 300.0 },
EnablePixelSizeControl = false
},
GUI = {
data/assets/scene/digitaluniverse/kepler.asset
+2 -2
View File
@@ -25,11 +25,11 @@ local object = {
Opacity = 0.99,
ScaleFactor = 410.0,
File = speck .. "/kepler.speck",
Unit = "pc",
Texture = textures .. "/halo.png",
CorrectionSizeEndDistance = 15.86,
CorrectionSizeFactor = 8.59,
Unit = "pc",
BillboardMaxSize = 30.0,
BillboardMinMaxSize = { 0.0, 30.0 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/localdwarfs.asset
+3 -3
View File
@@ -29,12 +29,12 @@ local object = {
Texture = textures .. "/point4.png",
PolygonSides = 12,
LabelFile = speck .. "/localgroup.label",
Unit = "Mpc",
TextColor = { 0.3, 0.3, 1.0 },
ScaleFactor = 465,
TextSize = 18.3,
TextMinSize = 7.3,
Unit = "Mpc",
BillboardMaxSize = 20.0,
TextMinMaxSize = { 7, 20 },
BillboardMinMaxSize = { 0.0, 20.0 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/milkyway_label.asset
+3 -4
View File
@@ -20,19 +20,18 @@ local homeLabel = {
ScaleFactor = 500.0,
DrawLabels = true,
LabelFile = homespeck .. "/home.label",
Unit = "Mpc",
TextColor = { 0.8, 0.8, 0.8 },
TextSize = 20.50,
TextMinSize = 16.0,
TextMinMaxSize = { 16, 20 },
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
},
Unit = "Mpc",
FadeInDistances = { 0.05, 1.0 },
BillboardMaxSize = 8.22,
BillboardMinSize = 0.0,
BillboardMinMaxSize = { 0.0, 8.22 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/obassociations.asset
+4 -5
View File
@@ -24,20 +24,19 @@ local object = {
Color = { 1.0, 1.0, 1.0 },
ColorMap = speck .. "/ob.cmap",
ColorOption = { "arm" },
SizeOption = {"diameter"},
SizeOption = { "diameter" },
ExactColorMap = true,
Opacity = 0.7,
File = speck .. "/ob.speck",
Unit = "pc",
Texture = textures .. "/point4.png",
PolygonSides = 7,
LabelFile = speck .. "/ob.label",
TextColor = { 0.4, 0.5, 1.0 },
ScaleFactor = 390.0,
TextSize = 16.24,
TextMinSize = 4.50,
TextMaxSize = 25,
Unit = "pc",
BillboardMaxSize = 450.0,
TextMinMaxSize = { 4, 25 },
BillboardMinMaxSize = { 0.0, 450.0 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/openclusters.asset
+3 -4
View File
@@ -24,16 +24,15 @@ local object = {
Color = { 0.1, 0.8, 0.4 },
Opacity = 0.5,
File = speck .. "/oc.speck",
Unit = "pc",
Texture = textures .. "/point4.png",
PolygonSides = 12,
TextColor = { 0.05, 0.4, 0.2 },
LabelFile = speck .. "/oc.label",
ScaleFactor = 405.75,
TextSize = 15.5,
TextMinSize = 4.5,
TextMaxSize = 30.0,
Unit = "pc",
BillboardMaxSize = 604,
TextMinMaxSize = { 4, 30 },
BillboardMinMaxSize = { 0.0, 604.0 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/planetarynebulae.asset
+3 -4
View File
@@ -27,13 +27,12 @@ local object = {
Texture = textures .. "/point4.png",
PolygonSides = 3,
LabelFile = speck .. "/pn.label",
Unit = "pc",
TextColor = { 0.25, 0.25, 0.65 },
ScaleFactor = 425.0,
TextSize = 16.24,
TextMinSize = 4.5,
TextMaxSize = 25.0,
Unit = "pc",
BillboardMaxSize = 500,
TextMinMaxSize = { 4, 25 },
BillboardMinMaxSize = { 0.0, 500.0 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/pulsars.asset
+3 -4
View File
@@ -27,13 +27,12 @@ local object = {
Texture = textures .. "/point4.png",
PolygonSides = 4,
LabelFile = speck .. "/pulsar.label",
Unit = "pc",
TextColor = { 0.7, 0.2, 0.2 },
ScaleFactor = 424,
TextSize = 15.77,
TextMinSize = 4,
TextMaxSize = 20.0,
Unit = "pc",
BillboardMaxSize = 500,
TextMinMaxSize = { 4, 20 },
BillboardMinMaxSize = { 0.0, 500.0 },
EnablePixelSizeControl = false
},
GUI = {
data/assets/scene/digitaluniverse/quasars.asset
+2 -5
View File
@@ -27,11 +27,8 @@ local object = {
Texture = textures .. "/point3A.png",
Unit = "Mpc",
ScaleFactor = 540.9,
-- Fade in value in the same unit as "Unit"
FadeInDistances = { 1000.0, 10000.0 },
BillboardMaxSize = 30.0,
BillboardMinSize = 0.0,
BillboardMaxSize = 11.1,
FadeInDistances = { 1000.0, 10000.0 }, -- Fade in value in the same unit as "Unit"
BillboardMinMaxSize = { 0.0, 11.1 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/sdss.asset
+3 -7
View File
@@ -30,16 +30,12 @@ local object = {
ColorRange = { { 0.0, 0.075 }, { 1.0, 50.0 } },
Texture = textures .. "/point3A.png",
Unit = "Mpc",
-- Fade in value in the same unit as "Unit"
FadeInDistances = { 220.0, 650.0 },
BillboardMaxSize = 50.0,
BillboardMinSize = 0.0,
FadeInDistances = { 220.0, 650.0 }, -- Fade in value in the same unit as "Unit"
BillboardMinMaxSize = { 0.0, 5.5 },
CorrectionSizeEndDistance = 20.65,
CorrectionSizeFactor = 10.41,
TextSize = 14.8,
TextMinSize = 10.0,
TextMaxSize = 50.0,
BillboardMaxSize = 5.5,
TextMinMaxSize = { 10, 50 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/starlabels.asset
+2 -3
View File
@@ -17,12 +17,11 @@ local object = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
LabelFile = speck .. "/stars.label",
Unit = "pc",
TextColor = { 0.4, 0.4, 0.4 },
DrawLabels = true,
TextSize = 14.7,
TextMinSize = 6.0,
TextMaxSize = 50.0,
Unit = "pc"
TextMinMaxSize = { 6, 50 }
},
GUI = {
Name = "Stars Labels",
data/assets/scene/digitaluniverse/starorbits.asset
+20 -28
View File
@@ -20,10 +20,8 @@ local sunOrbit = {
File = speck .. "/starorbits-Sun.speck",
MeshColor = {{ 1.0, 0.65, 0.0 }},
--LabelFile = speck .. "/1ld.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 10.3,
TextMinSize = 0.5,
TextMaxSize = 30.0,
-- TextColor = { 0.0, 0.2, 0.5 },
-- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -43,10 +41,9 @@ local barnardsOrbit = {
File = speck .. "/starorbits-BarnardsStar.speck",
MeshColor = {{0.39, 0.58, 0.93}},
--LabelFile = speck .. "/1ld.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 10.3,
TextMinSize = 0.5,
TextMaxSize = 30.0,
-- TextColor = { 0.0, 0.2, 0.5 },
-- TextSize = 10.3,
-- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -66,10 +63,9 @@ local kapteynsOrbit = {
File = speck .. "/starorbits-KapteynsStar.speck",
MeshColor = {{0.6, 0.6, 0.6}},
--LabelFile = speck .. "/1ld.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 10.3,
TextMinSize = 0.5,
TextMaxSize = 30.0,
-- TextColor = { 0.0, 0.2, 0.5 },
-- TextSize = 10.3,
-- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -89,10 +85,9 @@ local lacaille9352Orbit = {
File = speck .. "/starorbits-Lacaille9352.speck",
MeshColor = {{0.58, 0.0, 0.83}},
--LabelFile = speck .. "/1ld.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 10.3,
TextMinSize = 0.5,
TextMaxSize = 30.0,
-- TextColor = { 0.0, 0.2, 0.5 },
-- TextSize = 10.3,
-- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -112,10 +107,9 @@ local lSR1826Orbit = {
File = speck .. "/starorbits-LSR1826+3014.speck",
MeshColor = {{0.0, 0.39, 0.0}},
--LabelFile = speck .. "/1ld.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 10.3,
TextMinSize = 0.5,
TextMaxSize = 30.0,
-- TextColor = { 0.0, 0.2, 0.5 },
-- TextSize = 10.3,
-- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -135,10 +129,9 @@ local lSRJ0822Orbit = {
File = speck .. "/starorbits-LSRJ0822+1700.speck",
MeshColor = {{0.5, 1.0, 0.0}},
--LabelFile = speck .. "/1ld.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 10.3,
TextMinSize = 0.5,
TextMaxSize = 30.0,
-- TextColor = { 0.0, 0.2, 0.5 },
-- TextSize = 10.3,
-- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
@@ -158,10 +151,9 @@ local pM_J13420Orbit = {
File = speck .. "/starorbits-PM_J13420-3415.speck",
MeshColor = {{0.70, 0.13, 0.13}},
--LabelFile = speck .. "/1ld.label",
TextColor = { 0.0, 0.2, 0.5 },
TextSize = 10.3,
TextMinSize = 0.5,
TextMaxSize = 30.0,
-- TextColor = { 0.0, 0.2, 0.5 },
-- TextSize = 10.3,
-- TextMinMaxSize = { 0, 30 },
Unit = "pc"
},
GUI = {
data/assets/scene/digitaluniverse/stars.asset
+1 -7
View File
@@ -1,13 +1,7 @@
local assetHelper = asset.require('util/asset_helper')
local colormaps = asset.require('./stars_colormap').ColorMaps
local textures = asset.syncedResource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",
Version = 1
})
local textures = asset.require('./stars_textures').textures
local speck = asset.syncedResource({
Name = "Stars Speck Files",
data/assets/scene/digitaluniverse/stars_textures.asset
+20
View File
@@ -0,0 +1,20 @@
local assetHelper = asset.require('util/asset_helper')
local textures = asset.syncedResource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",
Version = 1
})
asset.export("textures", textures)
asset.meta = {
Name = "Star Textures",
Version = "1.0",
Description = [[Square textures used to represent stars when applied to camera-facing bil;board]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT License"
}
data/assets/scene/digitaluniverse/superclusters.asset
+3 -3
View File
@@ -27,13 +27,13 @@ local object = {
File = speck .. "/superclust.speck",
Texture = textures .. "/point3A.png",
LabelFile = speck .. "/superclust.label",
Unit = "Mpc",
TextColor = { 0.9, 0.9, 0.9 },
ScaleFactor = 531.0,
TextSize = 22.44,
TextMinSize = 8.0,
Unit = "Mpc",
TextMinMaxSize = { 8, 20 },
DrawLabels = true,
--BillboardMaxSize = 7.2,
--BillboardMinMaxSize = { 0.0, 7.2 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/supernovaremnants.asset
+3 -4
View File
@@ -27,15 +27,14 @@ local object = {
Texture = textures .. "/point4.png",
PolygonSides = 7,
LabelFile = speck .. "/snr.label",
Unit = "pc",
TextColor = { 0.6, 0.46, 0.0 },
ScaleFactor = 424,
TextSize = 16.44,
TextMinSize = 4.0,
TextMaxSize = 200.0,
TextMinMaxSize = { 4, 100 },
--CorrectionSizeEndDistance = 17.5,
--CorrectionSizeFactor = 13.96,
Unit = "pc",
BillboardMaxSize = 500,
BillboardMinMaxSize = { 0.0, 500.0 },
EnablePixelSizeControl = true
},
GUI = {
data/assets/scene/digitaluniverse/tully.asset
+4 -7
View File
@@ -33,21 +33,18 @@ local tullyPoints = {
ColorRange = { { 1.0, 30.0 } },
LabelFile = speck .. "/tully.label",
DrawLabels = false,
Unit = "Mpc",
TextColor = { 0.7, 0.7, 0.7 },
TextSize = 19.36,
TextMinSize = 8.2,
TextMinMaxSize = { 8, 20 },
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
},
Unit = "Mpc",
-- Fade in value in the same unit as "Unit"
FadeInDistances = { 0.001, 1.0 },
-- Max size in pixels
BillboardMaxSize = 7,
BillboardMinSize = 0,
FadeInDistances = { 0.001, 1.0 }, -- Fade in value in the same unit as "Unit"
BillboardMinMaxSize = { 0.0, 7.0 }, -- in pixels
--CorrectionSizeEndDistance = 22.0,
--CorrectionSizeFactor = 10.45
EnablePixelSizeControl = true
data/assets/scene/digitaluniverse/voids.asset
+2 -2
View File
@@ -19,10 +19,10 @@ local object = {
Color = { 1.0, 1.0, 1.0 },
Opacity = 0.65,
LabelFile = speck .. "/voids.label",
Unit = "Mpc",
TextColor = { 0.296, 0.629, 1.0 },
TextSize = 20.9,
TextMinSize = 8.0,
Unit = "Mpc"
TextMinMaxSize = { 8, 20 }
},
GUI = {
Name = "Voids",
data/assets/scene/milkyway/gaia/apogee.asset
+2 -14
View File
@@ -1,14 +1,9 @@
local assetHelper = asset.require('util/asset_helper')
local colorLUT = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps
local textures = asset.require('scene/digitaluniverse/stars_textures').textures
local textures = asset.syncedResource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",
Version = 1
})
local speck = asset.syncedResource({
Name = "Apogee Speck Files",
Type = "HttpSynchronization",
@@ -16,13 +11,6 @@ local speck = asset.syncedResource({
Version = 1
})
local colorLUT = asset.syncedResource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars_colormap",
Version = 2
})
local gaia_abundance_apogee = {
Identifier = "Gaia Abundance Apogee",
Renderable = {
data/assets/scene/milkyway/gaia/gaiastars.asset
+2 -13
View File
@@ -1,18 +1,7 @@
local assetHelper = asset.require("util/asset_helper")
local textures = asset.syncedResource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",
Version = 1
})
local colorLUT = asset.syncedResource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars_colormap",
Version = 1
})
local colorLUT = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps
local textures = asset.require('scene/digitaluniverse/stars_textures').textures
-- Download a preprocessed binary octree of Radial Velocity subset values per star (preprocessed into 8 binary files).
local starsFolder = asset.syncedResource({
data/assets/scene/milkyway/gaia/galah.asset
+2 -14
View File
@@ -1,13 +1,7 @@
local assetHelper = asset.require('util/asset_helper')
local textures = asset.syncedResource({
Name = "Stars Textures",
Type = "HttpSynchronization",
Identifier = "stars_textures",
Version = 1
})
local colorLUT = asset.require('scene/digitaluniverse/stars_colormap').ColorMaps
local textures = asset.require('scene/digitaluniverse/stars_textures').textures
local speck = asset.syncedResource({
Name = "Galah Speck Files",
@@ -16,12 +10,6 @@ local speck = asset.syncedResource({
Version = 1
})
local colorLUT = asset.syncedResource({
Name = "Stars Color Table",
Type = "HttpSynchronization",
Identifier = "stars_colormap",
Version = 2
})
local gaia_abundance_galah = {
Identifier = "Gaia Abundance Galah",
data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
+9 -14
View File
@@ -27,21 +27,16 @@ local Charon = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/charon.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 40.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 2000000.0,
FadeOutStartingDistance = 800000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 250000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 9.0,
FadeInEnabled = true,
FadeOutEnabled = true,
Distances = { 800000.0, 2000000.0 },
DistanceEPS = 250000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "planet_solarSystem", "planet_terrestrial" },
data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
+14 -20
View File
@@ -27,21 +27,16 @@ local Pluto = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/pluto.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 28.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 4000000.0,
FadeOutStartingDistance = 650000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 500000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 8.5,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 650000.0, 4000000.0 },
DistanceEPS = 500000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -56,13 +51,12 @@ local PlutoLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Pluto",
FontSize = 100.0,
LabelSize = 8.9,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
Text = "Pluto",
FontSize = 70.0,
Size = 9.05,
MinMaxSize = { 1, 100 },
BlendMode = "Additive",
LabelOrientationOption = "Camera View Direction"
OrientationOption = "Camera View Direction"
},
Tag = { "solarsystem_labels" },
GUI = {
data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail.asset
+4 -2
View File
@@ -20,7 +20,8 @@ local PlutoTrailBarycentric = {
Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
GUI = {
Name = "Pluto Barycentric Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
Path = "/Solar System/Dwarf Planets/Pluto",
Description = [[Orbit of Pluto around it's Barrycenter.]]
}
}
@@ -34,5 +35,6 @@ asset.meta = {
NASA Spice (see base spice asset)]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
License = "MIT license",
Identifiers = {"PlutoBarycentricTrail"}
}
data/assets/scene/solarsystem/dwarf_planets/pluto/pluto_trail_kepler.asset
+62
View File
@@ -0,0 +1,62 @@
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('scene/solarsystem/sun/transforms')
asset.require("spice/base")
local kernels = asset.require('./kernels').PlutoKernels
local OneAU = 1.496e+8
local PlutoKeplerianTrail = {
Identifier = "PlutoKeplerianTrail",
Parent = transforms.SunECLIPJ2000.Identifier,
Renderable = {
Type = "RenderableTrailOrbit",
Translation = {
Type = "KeplerTranslation",
Eccentricity = 2.543033082909471E-01,
SemiMajorAxis = 3.974407237841206E+01 * OneAU,
Inclination = 1.736609481151430E+01,
AscendingNode = 1.102099981996057E+02,
ArgumentOfPeriapsis = 1.142248569189779E+02,
MeanAnomaly = 14.53,
Epoch = '2000 01 01 00:00',
Period = 7.82438e+9
},
Color = { 0.2, 0.8, 0.3 },
Period = 90487.27692706819,
Resolution = 1000,
Enabled = false
},
Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
GUI = {
Name = "Pluto Keplerian Trail",
Path = "/Solar System/Dwarf Planets/Pluto",
Description = "Keplerian trail of Pluto. Contains full orbit."
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { PlutoKeplerianTrail })
asset.meta = {
Name = "Pluto Keplerian Trail",
Version = "1.0",
Description = [[ Full Keplerian trail of Pluto as observed by the Sun. Data from
JPL Horizons.]],
Author = "OpenSpace Team",
URL = "https://ssd.jpl.nasa.gov/sbdb.cgi?sstr=pluto",
License = "JPL/NASA",
Identifiers = {"PlutoKeplerianTrail"}
}
-- Double AscendingNode
-- In range: ( 0.000000,360.000000 )
-- This value determines the right ascension of the ascending node in degrees, that is the location of position along the orbit where the inclined plane and the horizonal reference plane intersect.
-- Double ArgumentOfPeriapsis
-- In range: ( 0.000000,360.000000 )
-- This value determines the argument of periapsis in degrees, that is the position on the orbit that is closest to the orbiting body.
-- Double MeanAnomaly
-- In range: ( 0.000000,360.000000 )
-- This value determines the mean anomaly at the epoch in degrees, which determines the initial location of the object along the orbit at epoch.
-- EPOCH= 2457217.500000000 ! 2015-Jul-14 00:00 (TDB)
-- EC= 2.543033082909471E-01 QR= 2.963702328762702E+01 IN= 1.736609481151430E+01
-- OM= 1.102099981996057E+02 W = 1.142248569189779E+02 Tp= 2447885.610187903512
-- A = 3.974407237841206E+01 AD= 4.985112146919710E+01 PR= 9.151809533192721E+04
data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
+1
View File
@@ -1,6 +1,7 @@
asset.require('./trail')
asset.require('./pluto')
asset.require('./pluto_trail')
asset.require('./pluto_trail_kepler')
asset.require('./charon/charon')
asset.require('./charon/charon_trail')
asset.require('./minor/hydra')
data/assets/scene/solarsystem/dwarf_planets/pluto/trail.asset
+3 -1
View File
@@ -23,7 +23,9 @@ local PlutoBarycenterTrail = {
Tag = { "planetTrail_solarSystem", "planetTrail_dwarf" },
GUI = {
Name = "Pluto Barycenter Trail",
Path = "/Solar System/Dwarf Planets/Pluto"
Path = "/Solar System/Dwarf Planets/Pluto",
Description = [[Precise trail of Pluto from NASA SPICE data. Not
containing full orbit.]]
}
}
data/assets/scene/solarsystem/missions/insight/edl.asset
+101 -95
View File
@@ -60,33 +60,118 @@ local legDeployTime = "2018 NOV 26 19:43:06.68" -- entry + 243s
local landerSeperationTime = "2018 NOV 26 19:44:51.68" -- entry + 348s
local touchdownTime = "2018 NOV 26 19:45:32.68" -- entry + 389s
local panelDeployTime = "2018 NOV 26 19:45:33.68" -- entry + 390s
local foreverTime = "2018 NOV 26 20:17:50.68" -- entry + 2327s
local kernelTouchdownTime = "2018 NOV 26 19:45:32.3"
local spiceRotationEndTime = "2018 NOV 26 19:51:39"
local InsightParent = {
Identifier = "InsightParent",
Parent = "MarsBarycenter",
Transform = {
Translation = {
local TranslationKeyframes = {
['1850 JAN 01 00:00:00'] = {
Type = "SpiceTranslation",
Target = "INSIGHT",
Observer = "MARS",
Frame = "GALACTIC",
Kernels = iKernels
Frame = "IAU_MARS",
Kernels = iKernels,
FixedDate = '2018 NOV 26 19:39:03'
},
['2018 NOV 26 19:39:02'] = {
Type = "SpiceTranslation",
Target = "INSIGHT",
Observer = "MARS",
Frame = "IAU_MARS",
Kernels = iKernels,
FixedDate = '2018 NOV 26 19:39:03'
},
['2018 NOV 26 19:39:03'] = {
Type = "SpiceTranslation",
Target = "INSIGHT",
Observer = "MARS",
Frame = "IAU_MARS",
Kernels = iKernels
},
['2018 NOV 26 19:39:04'] = {
Type = "SpiceTranslation",
Target = "INSIGHT",
Observer = "MARS",
Frame = "IAU_MARS",
Kernels = iKernels
},
['2018 NOV 26 19:45:34'] = {
Type = "SpiceTranslation",
Target = "INSIGHT",
Observer = "MARS",
Frame = "IAU_MARS",
Kernels = iKernels
},
['2018 NOV 26 19:45:35'] = {
Type = "SpiceTranslation",
Target = "INSIGHT",
Observer = "MARS",
Frame = "IAU_MARS",
Kernels = iKernels,
FixedDate = '2018 NOV 26 19:45:34'
},
}
local RotationKeyframes = {
['1850 JAN 01 00:00:00'] = {
Type = "SpiceRotation",
SourceFrame = "INSIGHT_LANDER_CRUISE",
DestinationFrame = "IAU_MARS",
FixedDate = '2018 NOV 26 19:39:02',
Kernels = iKernels
},
['2018 NOV 26 19:39:02'] = {
Type = "SpiceRotation",
SourceFrame = "INSIGHT_LANDER_CRUISE",
DestinationFrame = "IAU_MARS",
FixedDate = '2018 NOV 26 19:39:02',
Kernels = iKernels
},
['2018 NOV 26 19:39:03'] = {
Type = "SpiceRotation",
SourceFrame = "INSIGHT_LANDER_CRUISE",
DestinationFrame = "IAU_MARS",
Kernels = iKernels
},
['2018 NOV 26 19:39:04'] = {
Type = "SpiceRotation",
SourceFrame = "INSIGHT_LANDER_CRUISE",
DestinationFrame = "IAU_MARS",
Kernels = iKernels
},
['2018 NOV 26 19:45:34'] = {
Type = "SpiceRotation",
SourceFrame = "INSIGHT_LANDER_CRUISE",
DestinationFrame = "IAU_MARS",
Kernels = iKernels
},
['2018 NOV 26 19:45:35'] = {
Type = "SpiceRotation",
SourceFrame = "INSIGHT_LANDER_CRUISE",
DestinationFrame = "IAU_MARS",
FixedDate = '2018 NOV 26 19:45:34'
},
}
local InsightParent = {
Identifier = "InsightParent",
Parent = "Mars",
Transform = {
Translation ={
Type = "TimelineTranslation",
Keyframes = TranslationKeyframes,
},
Rotation = {
Type = "SpiceRotation",
SourceFrame = "INSIGHT_LANDER_CRUISE",
DestinationFrame = "GALACTIC"
Type = "TimelineRotation",
Keyframes = RotationKeyframes,
}
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = spiceRotationEndTime
},
-- TimeFrame = {
-- Type = "TimeFrameInterval",
-- Start = entryTimeStart,
-- End = spiceRotationEndTime
-- },
GUI = {
Hidden = true,
Name = "InsightParent",
@@ -121,7 +206,6 @@ local Insight_Entry_CapsuleA = {
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = landerSeperationTime
},
GUI = {
@@ -142,7 +226,6 @@ local Insight_Entry_Capsule_Ring = {
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = landerSeperationTime
},
GUI = {
@@ -163,7 +246,6 @@ local Insight_Entry_Capsule_Plugs = {
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = landerSeperationTime
},
GUI = {
@@ -184,7 +266,6 @@ local Insight_Entry_Heatshield = {
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = heatShieldSeperationTime
},
GUI = {
@@ -329,11 +410,6 @@ local Insight_Lander_A001 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander A001",
@@ -350,11 +426,6 @@ local Insight_Lander_A002 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander A002",
@@ -371,11 +442,6 @@ local Insight_Lander_A003 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander A003",
@@ -392,11 +458,6 @@ local Insight_Lander_A004 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander A004",
@@ -413,11 +474,6 @@ local Insight_Lander_A005 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander A005",
@@ -434,11 +490,6 @@ local Insight_Lander_A006 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander A006",
@@ -455,11 +506,6 @@ local Insight_Lander_A007 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander A007",
@@ -476,11 +522,6 @@ local Insight_Lander_A008 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander A008",
@@ -497,11 +538,6 @@ local Insight_Lander_foil1 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander foil",
@@ -518,11 +554,6 @@ local Insight_Lander_Tex01 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander Tex01",
@@ -539,11 +570,6 @@ local Insight_Lander_Tex02 = {
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight Lander Tex02",
@@ -605,7 +631,6 @@ local Insight_Legs_Deployed_tex = {
TimeFrame = {
Type = "TimeFrameInterval",
Start = legDeployTime,
End = foreverTime
},
GUI = {
Hidden = true,
@@ -626,7 +651,6 @@ local Insight_Legs_Deployed_AO06 = {
TimeFrame = {
Type = "TimeFrameInterval",
Start = legDeployTime,
End = foreverTime
},
GUI = {
Hidden = true,
@@ -644,11 +668,6 @@ local Insight_Panels_Stowed_tex = {
ModelTransform = RotationMatrix,
LightSources = LightSources
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight panels_stow_tex",
@@ -665,11 +684,6 @@ local Insight_Panels_Stowed_tex2 = {
ModelTransform = RotationMatrix,
LightSources = LightSources
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight panels_stow_tex2",
@@ -686,11 +700,6 @@ local Insight_Panels_Stowed_AO01 = {
ModelTransform = RotationMatrix,
LightSources = LightSources
},
TimeFrame = {
Type = "TimeFrameInterval",
Start = entryTimeStart,
End = foreverTime
},
GUI = {
Hidden = true,
Name = "Insight panels_stow_AO",
@@ -710,7 +719,6 @@ local Insight_Panels_Deployed_tex = {
TimeFrame = {
Type = "TimeFrameInterval",
Start = panelDeployTime,
End = foreverTime
},
GUI = {
Hidden = true,
@@ -731,7 +739,6 @@ local Insight_Panels_Deployed_tex2 = {
TimeFrame = {
Type = "TimeFrameInterval",
Start = panelDeployTime,
End = foreverTime
},
GUI = {
Hidden = true,
@@ -752,7 +759,6 @@ local Insight_Panels_Deployed_AO06 = {
TimeFrame = {
Type = "TimeFrameInterval",
Start = panelDeployTime,
End = foreverTime
},
GUI = {
Hidden = true,
data/assets/scene/solarsystem/missions/perseverance/model.asset
+4 -3
View File
@@ -1,6 +1,6 @@
--perseverance/model.asset
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
local trail = asset.require('./trail')
local marsTransforms = asset.require('scene/solarsystem/planets/mars/transforms')
local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
-- asset.require('./fov')
@@ -29,7 +29,7 @@ local models = asset.syncedResource({
-- Perseverance Model --
local Perseverance = {
Identifier = "Perseverance",
Parent = transforms.MSL_Body.Identifier,
Parent = trail.PerseveranceNode.Identifier,
GUI = {
Name = "Perseverance",
Path = "/Solar System/Missions/Perseverance"
@@ -56,7 +56,8 @@ local Body = {
Body = "MARS SCIENCE LABORATORY",
GeometryFile = models .. "/Perseverance.obj",
LightSources = LightSources,
PerformShading = false
PerformShading = false,
RotationVector = {65.940000,201.389999,263.980011}
},
GUI = {
Name = "Perseverance Model Body",
data/assets/scene/solarsystem/missions/perseverance/trail.asset
+5 -3
View File
@@ -60,10 +60,11 @@ local PerseveranceTrailSun = {
Color = { 0.2, 0.7, 0.1 },
StartTime = startTime,
EndTime = endTime,
SampleInterval = 100
SampleInterval = 100,
Enabled = false
},
GUI = {
Name = "Perseverance Trail",
Name = "Perseverance Trail (Sun)",
Path = "/Solar System/Missions/Perseverance"
}
}
@@ -82,7 +83,8 @@ local PerseveranceTrailMars = {
Color = { 0.7, 0.9, 0.6 },
StartTime = approachMars,
EndTime = endTime,
SampleInterval = 100
SampleInterval = 100,
Enabled = false
},
GUI = {
Name = "Perseverance Trail (Mars)",
data/assets/scene/solarsystem/missions/perseverance/transforms.asset
-503
View File
@@ -1,503 +0,0 @@
local assetHelper = asset.require('util/asset_helper')
local marsTransforms = asset.require('scene/solarsystem/planets/mars/transforms')
local marsAsset = asset.require('scene/solarsystem/planets/mars/mars')
local trailAsset = asset.require('./trail')
local MSL_Body = {
Identifier = "MSL_Body",
Parent = trailAsset.PerseveranceNode.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0, 0.0, 2.8 }
},
Rotation = {
Type = "StaticRotation",
Rotation = { -0.521593,0.648407,2.888407 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
---- ROBOTIC ARM RA ----
local RA_Base_Location = {
Identifier = "RA_Base_Location",
Parent = MSL_Body.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 1.111, -0.4525, -0.106 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
--AZ
local RA_Shoulder_AZ_Location = {
Identifier = "RA_Shoulder_AZ_Location",
Parent = RA_Base_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.0, 0.0, -0.08 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
----EL
local RA_Shoulder_EL_Location = {
Identifier = "RA_Shoulder_EL_Location",
Parent = RA_Shoulder_AZ_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.17, 0.2, -0.005 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
--ELBOW
local RA_Elbow_Location = {
Identifier = "RA_Elbow_Location",
Parent = RA_Shoulder_EL_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.83, -0.2, 0.0 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
--WRIST
local RA_Wrist_Location = {
Identifier = "RA_Wrist_Location",
Parent = RA_Elbow_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.77, 0.13, 0.035 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
--TURRET
local RA_Turret_Location = {
Identifier = "RA_Turret_Location",
Parent = RA_Wrist_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.0, 0.04, -0.15 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
--MAHLI
local RA_Mahli_Location = {
Identifier = "RA_Mahli_Location",
Parent = RA_Turret_Location.Identifier
}
---- MASTCAM RSM ----
local RSM_ROOT_Location = {
Identifier = "RSM_ROOT_Location",
Parent = MSL_Body.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.7039, 0.5769, -0.563 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local RSM_AZ_Location = {
Identifier = "RSM_AZ_Location",
Parent = RSM_ROOT_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.0, 0.008, 0.0 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local RSM_ZERO_EL_Location = {
Identifier = "RSM_ZERO_EL_Location",
Parent = RSM_AZ_Location.Identifier,
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local RSM_EL_Location = {
Identifier = "RSM_EL_Location",
Parent = RSM_AZ_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
--Position = {0.0, 0.0, -0.664}
Position = { 0.002, 0.007, -0.688 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
---- HIGH GAIN ANTENNA HGA ----
local HGA_AZ_Location = {
Identifier = "HGA_AZ_Location",
Parent = MSL_Body.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { -0.46, -0.47, -0.55 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local HGA_EL_Location = {
Identifier = "HGA_EL_Location",
Parent = HGA_AZ_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.0, 0.0, -0.17 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
---- SAM & HEMIN ----
local SAM_Cover_1_Location = {
Identifier = "SAM_Cover_1_Location",
Parent = MSL_Body.Identifier,
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local SAM_Cover_2_Location = {
Identifier = "SAM_Cover_2_Location",
Parent = MSL_Body.Identifier,
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local CHEMIN_Location = {
Identifier = "CHEMIN_Location",
Parent = MSL_Body.Identifier,
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
---- Wheels ----
local Wheel_base_Location = {
Identifier = "Wheel_base_Location",
Parent = MSL_Body.Identifier,
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
-- Left side --
local Leg_1_L_Location = {
Identifier = "Leg_1_L_Location",
Parent = Wheel_base_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.217, -0.812, -0.215 } --for the right side
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Leg_2_L_Location = {
Identifier = "Leg_2_L_Location",
Parent = Leg_1_L_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { -0.74, -0.00380, 0.223 } --CORRECT, DONT CHANGE
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wrist_F_L_Location = {
Identifier = "Wrist_F_L_Location",
Parent = Leg_1_L_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.8839, -0.2659, 0.2 } --CORRECT, DONT TOUCH
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wheel_F_L_Location = {
Identifier = "Wheel_F_L_Location",
Parent = Wrist_F_L_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.0, 0.0, 0.426 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wheel_C_L_Location = {
Identifier = "Wheel_C_L_Location",
Parent = Leg_2_L_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.45, -0.4, 0.403 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wrist_B_L_Location = {
Identifier = "Wrist_B_L_Location",
Parent = Leg_2_L_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { -0.627, -0.2635, -0.022 } --CORRECT, DONT CHANGE
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wheel_B_L_Location = {
Identifier = "Wheel_B_L_Location",
Parent = Wrist_B_L_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.0, -0.0, 0.426 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
-- wheels, Right Side --
local Leg_1_R_Location = {
Identifier = "Leg_1_R_Location",
Parent = Wheel_base_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.217, 0.812, -0.215 } --Check with caroline!!!
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Leg_2_R_Location = {
Identifier = "Leg_2_R_Location",
Parent = Leg_1_R_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
--Position = {-0.74, 0.0, 0.24}
Position = { -0.74, 0.00380, 0.223 } --want to use this one, once the center point is changed in maya
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wrist_F_R_Location = {
Identifier = "Wrist_F_R_Location",
Parent = Leg_1_R_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.882, 0.259, 0.215 }
--Position = {0.8839, 0.2659, 0.2} --position for the Wrist_F_L
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wheel_F_R_Location = {
Identifier = "Wheel_F_R_Location",
Parent = Wrist_F_R_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.0, 0.0, 0.426 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wheel_C_R_Location = {
Identifier = "Wheel_C_R_Location",
Parent = Leg_2_R_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.45, 0.4, 0.403 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wrist_B_R_Location = {
Identifier = "Wrist_B_R_Location",
Parent = Leg_2_R_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { -0.6208, 0.2759, -0.025 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
local Wheel_B_R_Location = {
Identifier = "Wheel_B_R_Location",
Parent = Wrist_B_R_Location.Identifier,
Transform = {
Translation = {
Type = "StaticTranslation",
Position = { 0.0, -0.0005, 0.426 }
}
},
GUI = {
Path = "/Solar System/Missions/Perseverance/Transforms",
Hidden = true
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, {
MSL_Body,
RA_Base_Location,
RA_Shoulder_AZ_Location,
RA_Shoulder_EL_Location,
RA_Elbow_Location,
RA_Wrist_Location,
RA_Turret_Location,
RA_Mahli_Location,
RSM_ROOT_Location,
RSM_AZ_Location,
RSM_ZERO_EL_Location,
RSM_EL_Location,
HGA_AZ_Location,
HGA_EL_Location,
SAM_Cover_1_Location,
SAM_Cover_2_Location,
CHEMIN_Location,
Wheel_base_Location,
Leg_1_L_Location,
Leg_2_L_Location,
Wrist_F_L_Location,
Wheel_F_L_Location,
Wheel_C_L_Location,
Wrist_B_L_Location,
Wheel_B_L_Location,
Leg_1_R_Location,
Leg_2_R_Location,
Wrist_F_R_Location,
Wheel_F_R_Location,
Wheel_C_R_Location,
Wrist_B_R_Location,
Wheel_B_R_Location
})
data/assets/scene/solarsystem/missions/voyager/voyager2.asset
+1 -1
View File
@@ -116,7 +116,7 @@ local VoyagerTrailCruiseEarthJupiter = {
Kernels = Kernels
},
Color = { 0.70, 0.50, 0.20 },
StartTime = "1977 SEP 05",
StartTime = "1977-AUG-20 16:07:06.535",
EndTime = "1979 JUL 06",
SampleInterval = 669 * 2 -- 669 is the number of days between the Start and End time
},
data/assets/scene/solarsystem/planets/earth/earth.asset
+17 -26
View File
@@ -23,21 +23,16 @@ local Earth = {
}
},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/Earth.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 40.0,
LabelsSize = 4.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 300000.0,
FadeOutStartingDistance = 10000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 1500000.0,
LabelsColor = { 1.0, 0.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 5.0,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 10000.0, 300000.0 },
DistanceEPS = 1500000.0,
Color = { 1.0, 0.0, 0.0 }
}
},
Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -54,20 +49,16 @@ local EarthLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Earth",
FontSize = 100.0,
LabelSize = 8.6,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
Text = "Earth",
FontSize = 70.0,
Size = 8.77,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeStartUnit = "au",
FadeStartDistance = 1.5,
FadeStartSpeed = 1.0,
FadeEndUnit = "au",
FadeEndDistance = 15.0,
FadeEndSpeed = 25.0
FadeUnit = "au",
FadeDistances = { 1.5, 15.0 },
FadeWidths = { 1.0, 25.0 }
},
Tag = { "solarsystem_labels" },
GUI = {
data/assets/scene/solarsystem/planets/earth/moon/moon.asset
+9 -14
View File
@@ -34,21 +34,16 @@ local Moon = {
}
},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/moon.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 14.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 500000.0,
FadeOutStartingDistance = 100000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 1350000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 7.6,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 100000.0, 500000.0 },
DistanceEPS = 1350000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
GUI = {
data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
+9 -14
View File
@@ -103,34 +103,29 @@ local initializeAndAddNodes = function()
}
}
-- @TODO (emmbr, 2021-05-27) add to scene when label rendering issues have been fixed
local IssLabel = {
Identifier = "IssLabel",
Parent = iss.Identifier,
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "ISS",
FontSize = 100.0,
LabelSize = 3.4,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
Text = "ISS",
FontSize = 70.0,
Size = 3.4,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeStartUnit = "au",
FadeStartDistance = 0.15,
FadeStartSpeed = 1.0,
FadeEndUnit = "au",
FadeEndDistance = 15.0,
FadeEndSpeed = 25.0
FadeDistances = { 0.15, 15.0 },
FadeWidths = { 1.0, 25.0 }
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "ISS Label",
Path = "/Solar System/Planets/Earth/Satellites"
}
}
}
return { iss, parentNode, issTrail }
end
data/assets/scene/solarsystem/planets/earth/satellites/weather/aqua.asset
+24 -27
View File
@@ -59,38 +59,35 @@ asset.onInitialize(function ()
},
Tag = { "earth_satellite", "Aqua" },
GUI = {
Name = "Terra Trail",
Name = "Aqua Trail",
Path = "/Solar System/Planets/Earth/Satellites/Aqua"
}
}
-- @TODO (emmbr, 2021-05-27) this label is not visible. Too large fade distances?
-- Might also be affected by the rendering issues for labels
local AquaLabel = {
Identifier = "AquaLabel",
Parent = Aqua.Identifier,
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "SNPP",
FontSize = 100.0,
LabelSize = 4.0,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeStartUnit = "au",
FadeStartDistance = 0.15,
FadeStartSpeed = 1.0,
FadeEndUnit = "au",
FadeEndDistance = 15.0,
FadeEndSpeed = 25.0
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "Aqua Label",
Path = "/Solar System/Planets/Earth"
}
Identifier = "AquaLabel",
Parent = Aqua.Identifier,
Renderable = {
Enabled = false,
Type = "RenderableLabels",
Text = "Aqua",
FontSize = 70.0,
Size = 4.0,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeUnit = "au",
FadeDistances = { 1.5, 15.0 },
FadeWidths = { 1.0, 25.0 }
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "Aqua Label",
Path = "/Solar System/Planets/Earth"
}
}
table.insert(nodes, Aqua)
data/assets/scene/solarsystem/planets/earth/satellites/weather/snpp.asset
+21 -25
View File
@@ -67,32 +67,28 @@ asset.onInitialize(function ()
}
local SNPPLabel = {
Identifier = "SNPPLabel",
Parent = SNPP.Identifier,
Identifier = "SNPPLabel",
Parent = SNPP.Identifier,
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "SNPP",
FontSize = 100.0,
LabelSize = 4.0,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeStartUnit = "au",
FadeStartDistance = 0.15,
FadeStartSpeed = 1.0,
FadeEndUnit = "au",
FadeEndDistance = 15.0,
FadeEndSpeed = 25.0
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "SNPP Label",
Path = "/Solar System/Planets/Earth"
}
Renderable = {
Enabled = false,
Type = "RenderableLabels",
Text = "SNPP",
FontSize = 70.0,
Size = 4.0,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeUnit = "au",
FadeDistances = { 1.5, 15.0 },
FadeWidths = { 1.0, 25.0 }
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "SNPP Label",
Path = "/Solar System/Planets/Earth"
}
}
table.insert(nodes, SNPP)
data/assets/scene/solarsystem/planets/earth/satellites/weather/terra.asset
+23 -26
View File
@@ -66,33 +66,30 @@ asset.onInitialize(function ()
}
}
-- @TODO (emmbr, 2021-05-27) this label is not visible. Too large fade distances?
-- Might also be affected by the rendering issues for labels
local TerraLabel = {
Identifier = "TerraLabel",
Parent = Terra.Identifier,
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "SNPP",
FontSize = 100.0,
LabelSize = 4.0,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeStartUnit = "au",
FadeStartDistance = 0.15,
FadeStartSpeed = 1.0,
FadeEndUnit = "au",
FadeEndDistance = 15.0,
FadeEndSpeed = 25.0
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "Terra Label",
Path = "/Solar System/Planets/Earth"
}
Identifier = "TerraLabel",
Parent = Terra.Identifier,
Renderable = {
Enabled = false,
Type = "RenderableLabels",
Text = "Terra",
FontSize = 70.0,
Size = 4.0,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeUnit = "au",
FadeDistances = { 1.5, 15.0 },
FadeWidths = { 1.0, 25.0 }
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "Terra Label",
Path = "/Solar System/Planets/Earth"
}
}
table.insert(nodes, Terra)
data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset
+10 -14
View File
@@ -28,21 +28,17 @@ local Callisto = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/callisto.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 40.0,
LabelsSize = 10.5,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 15000000.0,
FadeOutStartingDistance = 5000000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 1350000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 11.5,
MinMaxSize = { 1, 100 },
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 5000000.0, 15000000.0 },
DistanceEPS = 1350000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
data/assets/scene/solarsystem/planets/jupiter/callisto/callisto_textures.asset
+1 -1
View File
@@ -2,6 +2,6 @@ local TexturesPath = asset.syncedResource({
Name = "Callisto Textures",
Type = "HttpSynchronization",
Identifier = "callisto_textures",
Version = 1
Version = 2
})
asset.export("TexturesPath", TexturesPath)
data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
+3 -3
View File
@@ -3,7 +3,7 @@ local globeIdentifier = asset.require("./../../callisto").Callisto.Identifier
local layer = {
Identifier = "Texture",
FilePath = texturesPath .. "/callisto.jpg",
FilePath = texturesPath .. "/callisto_os.tif",
}
asset.onInitialize(function ()
@@ -15,8 +15,8 @@ asset.export("layer", layer)
asset.meta = {
Name = "Callisto Texutre",
Version = "1.0",
Description = [[ Default jpg texture for Callisto]],
Version = "2.0",
Description = [[ Default texture for Callisto]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license",
data/assets/scene/solarsystem/planets/jupiter/europa/default_layers.asset
+1 -1
View File
@@ -1,7 +1,7 @@
local colorLayersPath = "./layers/colorlayers"
asset.require(colorLayersPath .. "/europa_texture")
local colorLayer = asset.require(colorLayersPath .. "/voyager_global_mosaic")
local colorLayer = asset.require(colorLayersPath .. "/voyager_global_mosaic_local")
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset
+9 -14
View File
@@ -28,21 +28,16 @@ local Europa = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/europa.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 40.0,
LabelsSize = 10.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 8000000.0,
FadeOutStartingDistance = 5000000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 700000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 11.0,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 500000.0, 8000000.0 },
DistanceEPS = 700000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
data/assets/scene/solarsystem/planets/jupiter/europa/europa_textures.asset
+1 -1
View File
@@ -2,6 +2,6 @@ local TexturesPath = asset.syncedResource({
Name = "Europa Textures",
Type = "HttpSynchronization",
Identifier = "europa_textures",
Version = 1
Version = 2
})
asset.export("TexturesPath", TexturesPath)
data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/europa_texture.asset
+4 -3
View File
@@ -3,7 +3,8 @@ local globeIdentifier = asset.require("./../../europa").Europa.Identifier
local layer = {
Identifier = "Texture",
FilePath = texturesPath .. "/europa.jpg",
FilePath = texturesPath .. "/europa_os.tif",
Enabled = true
}
asset.onInitialize(function ()
@@ -15,8 +16,8 @@ asset.export("layer", layer)
asset.meta = {
Name = "Europa Texutre",
Version = "1.0",
Description = [[ Default jpg texture for Europa]],
Version = "2.0",
Description = [[ Default texture for Europa]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
data/assets/scene/solarsystem/planets/jupiter/europa/layers/colorlayers/voyager_global_mosaic_local.asset
+36
View File
@@ -0,0 +1,36 @@
local texturesPath = asset.require("./../../europa_textures").TexturesPath
local globeIdentifier = asset.require("./../../europa").Europa.Identifier
local layer = {
Identifier = "Voyager_Global_Mosaic_Local",
Name = "Voyager Global Mosaic [Local]",
FilePath = texturesPath .. "/evgos.vrt",
BlendMode = "Color"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)
asset.meta = {
Name = "Voyager Global Mosaic",
Version = "1.0",
Description = [[ Europa Voyager - Galileo SSI Global Mosaic 500m v2. This global map
base of Europa utilizes the best image quality and moderate resolution coverage
supplied by the Galileo SSI (Solid-State Imaging) instrument and Voyager 1 and 2.
The image data was selected on the basis of overall image quality, reasonable
input resolution (from 20 km/pixel for gap fill to as high as 200 meters per
pixel[m]), and availability of moderate viewing and sun angles for topography.
The map projections are based on a sphere having a radius of 1,562.09 kilometers.
A Simple Cylindrical projection was used at a resolution of 500 m. (Description
from URL)]],
Author = "USGS",
URL = "https://astrogeology.usgs.gov/search/map/Europa/Voyager-Galileo/" ..
"Europa_Voyager_GalileoSSI_global_mosaic_500m",
License = "NASA/PDS",
Identifiers = {"Voyager_Global_Mosaic_Local"}
}
data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset
+9 -14
View File
@@ -28,21 +28,16 @@ local Ganymede = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/ganymede.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 40.0,
LabelsSize = 10.5,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 8000000.0,
FadeOutStartingDistance = 2250000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 1750000.0,
LabelsColor = {1.0, 1.0, 0.0}
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 11.5,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 2250000.0, 8000000.0 },
DistanceEPS = 1750000.0,
Color = {1.0, 1.0, 0.0}
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
data/assets/scene/solarsystem/planets/jupiter/io/io.asset
+9 -14
View File
@@ -28,21 +28,16 @@ local Io = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/io.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 40.0,
LabelsSize = 10.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 8500000.0,
FadeOutStartingDistance = 4000000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 1000000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 11.0,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 4000000.0, 8500000.0 },
DistanceEPS = 1000000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_jupiter" },
data/assets/scene/solarsystem/planets/jupiter/jupiter.asset
+5 -6
View File
@@ -42,12 +42,11 @@ local JupiterLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Jupiter",
FontSize = 100.0,
LabelSize = 8.6,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
Text = "Jupiter",
FontSize = 70.0,
Size = 8.77,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive"
},
Tag = { "solarsystem_labels" },
data/assets/scene/solarsystem/planets/jupiter/jupiter_textures.asset
+1 -1
View File
@@ -2,6 +2,6 @@ local TexturesPath = asset.syncedResource({
Name = "Jupiter Textures",
Type = "HttpSynchronization",
Identifier = "jupiter_textures",
Version = 1
Version = 2
})
asset.export("TexturesPath", TexturesPath)
data/assets/scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_texture.asset
+3 -3
View File
@@ -3,7 +3,7 @@ local globeIdentifier = asset.require("./../../jupiter").Jupiter.Identifier
local layer = {
Identifier = "Texture",
FilePath = texturesPath .. "/jupiter.jpg",
FilePath = texturesPath .. "/jupiter_os.tif",
}
asset.onInitialize(function ()
@@ -15,8 +15,8 @@ asset.export("layer", layer)
asset.meta = {
Name = "Jupiter Texutre",
Version = "1.0",
Description = [[ Default jpg texture for Jupiter]],
Version = "2.0",
Description = [[ Default texture for Jupiter]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
data/assets/scene/solarsystem/planets/mars/default_layers.asset
+2 -1
View File
@@ -23,7 +23,8 @@ asset.require(colorLayersPath .. "/hirisels")
-- Height layers
asset.require(heightLayersPath .. "/mola_europe")
local heightLayer = asset.require(heightLayersPath .. "/mola_utah")
asset.require(heightLayersPath .. "/mola_utah")
local heightLayer = asset.require(heightLayersPath .. "/MDEM200M")
asset.require(heightLayersPath .. "/hirisels")
-- Overlays
data/assets/scene/solarsystem/planets/mars/layers/heightlayers/MDEM200M.asset
+35
View File
@@ -0,0 +1,35 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../mars").Mars.Identifier
local layer = {
Identifier = "MDEM200M",
Name = "HRSC MOLA Blended DEM Global 200m v2",
FilePath = mapServiceConfigs .. "/ESRI/MDEM200M.tif",
Description = [[ Blend of data derived from the Mars Orbiter Laser Altimeter
(MOLA, an instrument aboard NASA’s
Mars Global Surveyor spacecraft), and data derived from the High-Resolution
Stereo Camera (HRSC, an instrument aboard the European Space Agency’s Mars
Express spacecraft). The average accuracy is ~100 meters in horizontal
position and the elevation uncertainty is at least ±3 m. This
tiled elevation layer, hosted by Esri, is made available using
lossless LERC compression.(Description from URL).]],
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
end)
asset.export("layer", layer)
asset.meta = {
Name = "Mars HRSC MOLA Blended DEM Global 200m v2",
Version = "1.0",
Description = [[ESRI Hosted ars HRSC MOLA Blended DEM.]],
Author = "esri_astro",
URL = "https://www.arcgis.com/home/item.html?id=225adad86379474ebc3d51a74573c99b",
License = "Esri Master License Agreement",
Identifiers = {"MDEM200M"}
}
data/assets/scene/solarsystem/planets/mars/map_service_configs/ESRI/MDEM200M.tif
+17
View File
@@ -0,0 +1,17 @@
<GDAL_WMS>
<Service name="TMS">
<ServerUrl>http://astro.arcgis.com/arcgis/rest/services/OnMars/MDEM200M/ImageServer/tile/${z}/${y}/${x}</ServerUrl>
</Service>
<DataWindow>
<UpperLeftX>-180.0</UpperLeftX> <UpperLeftY>90.0</UpperLeftY>
<LowerRightX>180.0</LowerRightX> <LowerRightY>-90.0</LowerRightY>
<SizeX>131328</SizeX> <SizeY>65664</SizeY>
<TileLevel>7</TileLevel> <YOrigin>top</YOrigin>
</DataWindow>
<Projection>GEOGCS["GCS_Mars_2000_Sphere",DATUM["D_Mars_2000_Sphere",SPHEROID["Mars_2000_Sphere_IAU_IAG",3396190.0,0.0]],PRIMEM["Reference_Meridian",0.0],UNIT["Degree",0.0174532925199433]]</Projection>
<BlockSizeX>513</BlockSizeX> <BlockSizeY>513</BlockSizeY>
<BandsCount>1</BandsCount> <DataType>Int16</DataType>
<DataValues NoData="-32768" Min="-8528" Max="21226"/>
<MaxConnections>5</MaxConnections>
<ZeroBlockHttpCodes>404,400</ZeroBlockHttpCodes>
</GDAL_WMS>
data/assets/scene/solarsystem/planets/mars/mars.asset
+14 -20
View File
@@ -23,21 +23,16 @@ local Mars = {
SegmentsPerPatch = 90,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/mars.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 14.0,
LabelsSize = 9.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 2000000.0,
FadeOutStartingDistance = 750000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 2500000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 8.7,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 750000.0, 2000000.0 },
DistanceEPS = 2500000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -54,12 +49,11 @@ local MarsLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Mars",
FontSize = 100.0,
LabelSize = 8.5,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
Text = "Mars",
FontSize = 70.0,
Size = 8.66,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive",
TransformationMatrix = {
1.0, 0.0, 0.0, -8.0E6,
data/assets/scene/solarsystem/planets/mercury/mercury.asset
+14 -20
View File
@@ -24,21 +24,16 @@ local Mercury = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/Mercury.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 22.0,
LabelsSize = 10.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 5000000.0,
FadeOutStartingDistance = 1800000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 1500000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 10.1,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 1800000.0, 5000000.0 },
DistanceEPS = 1500000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -53,12 +48,11 @@ local MercuryLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Mercury",
FontSize = 100.0,
LabelSize = 8.3,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
Text = "Mercury",
FontSize = 70.0,
Size = 8.46,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive"
},
Tag = { "solarsystem_labels" },
data/assets/scene/solarsystem/planets/neptune/neptune.asset
+5 -6
View File
@@ -33,12 +33,11 @@ local NeptuneLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Neptune",
FontSize = 100.0,
LabelSize = 8.8,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
Text = "Neptune",
FontSize = 70.0,
Size = 8.96,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive"
},
Tag = { "solarsystem_labels" },
data/assets/scene/solarsystem/planets/saturn/dione/dione.asset
+9 -14
View File
@@ -26,21 +26,16 @@ local Dione = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/dione.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 32.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 3500000.0,
FadeOutStartingDistance = 1000000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 200000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 8.7,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 500000.0, 3500000.0 },
DistanceEPS = 200000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset
+9 -14
View File
@@ -26,21 +26,16 @@ local Enceladus = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/enceladus.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 22.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 1000000.0,
FadeOutStartingDistance = 500000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 100000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 8.1,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 300000.0, 1000000.0 },
DistanceEPS = 100000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset
+9 -13
View File
@@ -26,20 +26,16 @@ local Hyperion = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
-- @TODO (2021-05-21, emmbr26) These labels do not seem to be visible
Enabled = false,
FileName = labelsPath .. "/hyperion.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 14.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
FadeInStartingDistance = 500000.0,
FadeOutStartingDistance = 1000000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 1350000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 8.6,
FadeInEnabled = true,
FadeDistances = { 500000.0, 1000000.0 },
DistanceEPS = 1350000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset
+9 -14
View File
@@ -26,21 +26,16 @@ local Iapetus = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/iapetus.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 30.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 3500000.0,
FadeOutStartingDistance = 600000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 250000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 8.7,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 600000.0, 3500000.0 },
DistanceEPS = 250000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset
+9 -14
View File
@@ -26,21 +26,16 @@ local Mimas = {
SegmentsPerPatch = 64,
Layers = { },
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/mimas.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 14.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 1000000.0,
FadeOutStartingDistance = 400000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 25000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 7.7,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 400000.0, 1000000.0 },
DistanceEPS = 25000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset
+9 -14
View File
@@ -26,21 +26,16 @@ local Rhea = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/rhea.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 40.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 2500000.0,
FadeOutStartingDistance = 1000000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 250000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 9.0,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 500000.0, 2500000.0 },
DistanceEPS = 250000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
data/assets/scene/solarsystem/planets/saturn/saturn.asset
+5 -6
View File
@@ -56,13 +56,12 @@ local SaturnLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Saturn",
FontSize = 100.0,
LabelSize = 8.7,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
Text = "Saturn",
FontSize = 70.0,
Size = 8.85,
MinMaxSize = { 1, 100 },
BlendMode = "Additive",
LabelOrientationOption = "Camera View Direction"
OrientationOption = "Camera View Direction"
},
Tag = { "solarsystem_labels" },
GUI = {
data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset
+9 -14
View File
@@ -26,21 +26,16 @@ local Tethys = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/tethys.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 24.0,
LabelsSize = 8.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 1500000.0,
FadeOutStartingDistance = 500000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 200000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 8.3,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 500000.0, 1500000.0 },
DistanceEPS = 200000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
data/assets/scene/solarsystem/planets/saturn/titan/default_layers.asset
+2 -3
View File
@@ -1,7 +1,6 @@
local colorLayersPath = "./layers/colorlayers"
colorLayer = asset.require(colorLayersPath .. "/titan_texture")
local colorLayer = asset.require(colorLayersPath .. "/cassini_iss_global_mosaic_4km_liu")
local colorLayer = asset.require(colorLayersPath .. "/cassini_iss_global_mosaic_4km_local")
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
@@ -14,7 +13,7 @@ end)
asset.meta = {
Name = "Default Titan Layers",
Version = "1.0",
Description = [[ Default Titan layers are: Titan Texture and Cassini ISS Global
Description = [[ Default Titan layers are: Cassini ISS Global
Mosaic]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/cassini_iss_global_mosaic_4km_local.asset
+34
View File
@@ -0,0 +1,34 @@
local texturesPath = asset.require("./../../titan_textures").TexturesPath
local globeIdentifier = asset.require("./../../titan").Titan.Identifier
local layer = {
Identifier = "Cassini_ISS_Global_Mosaic_4km_Local",
Name = "Cassini ISS Global Mosaic 4km",
FilePath = texturesPath .. "/Titan_ISS_P19658_Mosaic_Global_4km_os.tif",
Description = [[ This global digital map of Saturn's moon Titan was created using
images taken by the Cassini spacecraft's Imaging Science Subsystem (ISS). The map
was produced in June 2015 using data collected through Cassini's flyby on April 7,
2014, known as "T100". The mean radius of Titan used for projection of this map is
1,600 miles (2,575 kilometers). Pixel resolution is 4005 meters per pixel (m).
Titan is assumed to be spherical until a control network -- a model of the moon's
shape based on multiple images tied together at defined points on the surface --
is created at some point in the future. (Description from URL)]]
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)
asset.meta = {
Name = "Cassini ISS Global Mosaic",
Version = "1.0",
Description = [[ Cassini global image layer for Titan]],
Author = "USGS",
URL = "https://astrogeology.usgs.gov/search/map/Titan/Cassini/Global-Mosaic/" ..
"Titan_ISS_P19658_Mosaic_Global_4km",
License = "NASA/PDS",
Identifiers = {"Cassini_ISS_Global_Mosaic_4km_Local"}
}
data/assets/scene/solarsystem/planets/saturn/titan/layers/colorlayers/titan_texture.asset
-23
View File
@@ -1,23 +0,0 @@
local texturesPath = asset.require("./../../titan_textures").TexturesPath
local globeIdentifier = asset.require("./../../titan").Titan.Identifier
local layer = {
Identifier = "Texture",
FilePath = texturesPath .. "/titan.jpg",
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)
asset.meta = {
Name = "Titan Texutre",
Version = "1.0",
Description = [[ Default jpg texture for Titan]],
Author = "OpenSpace Team",
URL = "http://openspaceproject.com",
License = "MIT license"
}
data/assets/scene/solarsystem/planets/saturn/titan/titan.asset
+9 -14
View File
@@ -26,21 +26,16 @@ local Titan = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/titan.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 14.0,
LabelsSize = 10.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 7500000.0,
FadeOutStartingDistance = 6000000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 1350000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 9.6,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 5000000.0, 7500000.0 },
DistanceEPS = 1350000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "moon_solarSystem", "moon_giants", "moon_saturn" },
data/assets/scene/solarsystem/planets/saturn/titan/titan_textures.asset
+1 -1
View File
@@ -2,6 +2,6 @@ local TexturesPath = asset.syncedResource({
Type = "HttpSynchronization",
Name = "Titan textures",
Identifier = "titan_textures",
Version = 1
Version = 2
})
asset.export("TexturesPath", TexturesPath)
data/assets/scene/solarsystem/planets/uranus/uranus.asset
+5 -6
View File
@@ -33,12 +33,11 @@ local UranusLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Uranus",
FontSize = 100.0,
LabelSize = 8.7,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
Text = "Uranus",
FontSize = 70.0,
Size = 8.86,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive"
},
Tag = { "solarsystem_labels" },
data/assets/scene/solarsystem/planets/venus/venus.asset
+27 -34
View File
@@ -26,22 +26,16 @@ local Venus = {
SegmentsPerPatch = 64,
Layers = {},
Labels = {
Enable = false,
Enabled = false,
FileName = labelsPath .. "/venus.labels",
LabelAlignmentOption = "Horizontally", -- or Circularly
LabelsFontSize = 40.0,
LabelsSize = 10.0,
LabelsMinSize = 1.0,
LabelsMaxSize = 1500.0,
ProximityEnabled = false,
LabelsFadeInEnabled = true,
LabelsFadeInEnabled = true,
LabelsFadeOutEnabled = true,
FadeInStartingDistance = 7000000.0,
FadeOutStartingDistance = 2000000.0,
LabelsForceDomeRendering = true,
LabelsDistanceEPS = 4000000.0,
LabelsColor = { 1.0, 1.0, 0.0 }
AlignmentOption = "Horizontally", -- or Circularly
FontSize = 20.0,
Size = 11.0,
FadeInEnabled = true,
FadeOutEnabled = true,
FadeDistances = { 2000000.0, 7000000.0 },
DistanceEPS = 4000000.0,
Color = { 1.0, 1.0, 0.0 }
}
},
Tag = { "planet_solarSystem", "planet_terrestrial" },
@@ -53,25 +47,24 @@ local Venus = {
}
local VenusLabel = {
Identifier = "VenusLabel",
Parent = Venus.Identifier,
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Venus",
FontSize = 100.0,
LabelSize = 8.4,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
BlendMode = "Additive"
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "Venus Label",
Path = "/Solar System/Planets/Venus",
Description = "Label for Venus, viewable within the solar system."
}
Identifier = "VenusLabel",
Parent = Venus.Identifier,
Renderable = {
Enabled = false,
Type = "RenderableLabels",
Text = "Venus",
FontSize = 70.0,
Size = 8.54,
MinMaxSize = { 1, 100 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive"
},
Tag = { "solarsystem_labels" },
GUI = {
Name = "Venus Label",
Path = "/Solar System/Planets/Venus",
Description = "Label for Venus, viewable within the solar system."
}
}
assetHelper.registerSceneGraphNodesAndExport(asset, { Venus, VenusLabel })
data/assets/scene/solarsystem/sun/sun.asset
+8 -12
View File
@@ -26,20 +26,16 @@ local SunLabel = {
Renderable = {
Enabled = false,
Type = "RenderableLabels",
LabelText = "Sun",
FontSize = 100.0,
LabelSize = 13.127,
LabelMaxSize = 100.0,
LabelMinSize = 1.0,
LabelOrientationOption = "Camera View Direction",
Text = "Sun",
FontSize = 70.0,
Size = 14.17,
MinMaxSize = { 1, 50 },
OrientationOption = "Camera View Direction",
BlendMode = "Additive",
EnableFading = true,
FadeStartUnit = "Pm",
FadeStartDistance = 2.841,
FadeStartSpeed = 1.375,
FadeEndUnit = "pc",
FadeEndDistance = 1.326,
FadeEndSpeed = 1.0
FadeUnit = "pc",
FadeDistances = { 1.33, 15.0 },
FadeWidths = { 1.0, 20.0 }
},
Tag = { "solarsystem_labels" },
GUI = {
data/assets/util/webgui.asset
+1 -1
View File
@@ -3,7 +3,7 @@ asset.require('./static_server')
local guiCustomization = asset.require('customization/gui')
-- Select which commit hashes to use for the frontend and backend
local frontendHash = "17b69f29a4a596d488ba8c9de953cc22fb0dce5c"
local frontendHash = "7fed95043e967c632b446ae1c98c6390f3fb7edc"
local dataProvider = "data.openspaceproject.com/files/webgui"
local frontend = asset.syncedResource({
data/profiles/mars.profile
+3 -3
View File
@@ -39,7 +39,7 @@
"is_local": false,
"key": "I",
"name": "Setup scene for insight EDL",
"script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -470.800006);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', true);openspace.time.setPause(true);openspace.time.setTime('2018 NOV 26 19:39:03.68');openspace.navigation.setNavigationState({Anchor = 'Insight',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});"
"script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -469.300000);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -470.800006);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', true);openspace.time.setPause(true);openspace.time.setTime('2018 NOV 26 19:39:01.68');openspace.navigation.setNavigationState({Anchor = 'Insight',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});"
},
{
"documentation": "Disable Mars layer settings used for insight EDL",
@@ -55,7 +55,7 @@
"is_local": false,
"key": "P",
"name": "Setup and Goto Perseverance",
"script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1677.088867);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -1677.088867);openspace.time.setPause(true);openspace.time.setTime('2021 FEB 18 20:32:16');openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', true);openspace.navigation.setNavigationState({Anchor = 'Perseverance',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});"
"script": "openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.Mola_Utah.Settings.Offset', -1674.0);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Settings.Offset', -1674.0);openspace.time.setPause(true);openspace.time.setTime('2021 FEB 18 20:32:16');openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.HeightLayers.HiRISE-LS-DEM.Enabled', true);openspace.setPropertyValueSingle('Scene.Mars.Renderable.Layers.ColorLayers.HiRISE-LS.Enabled', true);openspace.navigation.setNavigationState({Anchor = 'Perseverance',Pitch = 0.567457E-4,Position = { 1.240506E1,-1.369270E1,-2.423553E0 },ReferenceFrame = 'Root',Up = { 0.441211E0,0.247019E0,0.862737E0 },Yaw = -0.446853E-4});"
}
],
"mark_nodes": [
@@ -77,6 +77,6 @@
},
"version": {
"major": 1,
"minor": 1
"minor": 2
}
}
ext/ghoul
+1 -1
Submodule ext/ghoul updated: e13db04716...c53587702c

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