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

Merged master in

Browse Source
This commit is contained in:
GPayne
2020-09-11 10:29:59 -06:00
parent 1b07268324 a57003f272
commit 7d41cd5a49
371 changed files with 3951 additions and 2855 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -26,3 +26,6 @@
[submodule "apps/OpenSpace-MinVR/ext/glfw"]
path = apps/OpenSpace-MinVR/ext/glfw
url = https://github.com/opensgct/glfw
[submodule "ext/date"]
path = ext/date
url = https://github.com/HowardHinnant/date

8
CMakeLists.txt
View File

@@ -155,7 +155,7 @@ endif ()
# Ghoul
add_subdirectory(${OPENSPACE_EXT_DIR}/ghoul)
target_link_libraries(openspace-core Ghoul)
target_link_libraries(openspace-core PUBLIC Ghoul)
set_openspace_compile_settings(Ghoul)
set_folder_location(Lua "External")
set_folder_location(lz4 "External")
@@ -165,7 +165,7 @@ link_directories("${GHOUL_LIBRARY_DIRS}")
# Spice
begin_dependency("Spice")
add_subdirectory(${OPENSPACE_EXT_DIR}/spice)
target_link_libraries(openspace-core Spice)
target_link_libraries(openspace-core PUBLIC Spice)
set_folder_location(Spice "External")
end_dependency()
@@ -174,13 +174,13 @@ begin_dependency("CURL")
if (WIN32)
set(CURL_ROOT_DIR "${OPENSPACE_EXT_DIR}/curl")
target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_ROOT_DIR}/include)
target_link_libraries(openspace-core ${CURL_ROOT_DIR}/lib/libcurl.lib)
target_link_libraries(openspace-core PUBLIC ${CURL_ROOT_DIR}/lib/libcurl.lib)
target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED" "CURL_STATICLIB")
else ()
find_package(CURL)
if (CURL_FOUND)
target_include_directories(openspace-core SYSTEM PUBLIC ${CURL_INCLUDE_DIRS})
target_link_libraries(openspace-core ${CURL_LIBRARIES})
target_link_libraries(openspace-core PUBLIC ${CURL_LIBRARIES})
target_compile_definitions(openspace-core PUBLIC "OPENSPACE_CURL_ENABLED")
endif ()
endif ()

2
apps/OpenSpace/ext/sgct

Submodule apps/OpenSpace/ext/sgct updated: b712e64848...3d3835c38c

12
apps/OpenSpace/main.cpp
View File

@@ -681,22 +681,21 @@ void mainDecodeFun(const std::vector<std::byte>& data, unsigned int) {
void mainLogCallback(Log::Level level, const char* message) {
void mainLogCallback(Log::Level level, std::string_view message) {
ZoneScoped
std::string msg = message;
switch (level) {
case Log::Level::Debug:
LDEBUGC("SGCT", msg);
LDEBUGC("SGCT", message);
break;
case Log::Level::Info:
LINFOC("SGCT", msg);
LINFOC("SGCT", message);
break;
case Log::Level::Warning:
LWARNINGC("SGCT", msg);
LWARNINGC("SGCT", message);
break;
case Log::Level::Error:
LERRORC("SGCT", msg);
LERRORC("SGCT", message);
break;
}
@@ -1077,6 +1076,7 @@ int main(int argc, char** argv) {
Log::instance().setLogToConsole(false);
Log::instance().setShowTime(false);
Log::instance().setShowLogLevel(false);
Log::instance().setLogCallback(mainLogCallback);
#ifdef __APPLE__

10
data/assets/base.asset
View File

@@ -19,11 +19,11 @@ asset.require('scene/solarsystem/planets/mars/moons/deimos')
asset.require('scene/solarsystem/dwarf_planets/pluto/system')
asset.require('scene/solarsystem/dwarf_planets/pluto/default_layers')
asset.require('scene/solarsystem/dwarf_planets/pluto/charon/default_layers')
asset.request('scene/milkyway/milkyway/volume')
asset.request('scene/milkyway/constellations/constellation_art')
asset.request('scene/milkyway/constellations/constellation_keybinds')
asset.require('scene/milkyway/milkyway/volume')
asset.require('scene/milkyway/constellations/constellation_art')
asset.require('scene/milkyway/constellations/constellation_keybinds')
assetHelper.requestAll(asset, 'scene/digitaluniverse')
assetHelper.requireAll(asset, 'scene/digitaluniverse')
-- Load default key bindings applicable to most scenes
asset.require('util/default_keybindings')
@@ -33,7 +33,7 @@ asset.require('util/default_joystick')
-- Load web gui
local webGui = asset.require('util/webgui')
asset.request('customization/globebrowsing')
asset.require('customization/globebrowsing')
-- Keybindings that are specific for this scene
local Keybindings = {

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

@@ -31,7 +31,7 @@ local vrt_folders = {
-- We recommend using this folder for HiRISE
openspace.absPath('${BASE}/../OpenSpaceData/Mars/HiRISE'),
-- if not and you have a custom path for HiRISE layers, enter it below
'',
''
},
Moon = {
-- Add folders here whose contents will be automatically added to the Moon globe

12
data/assets/examples/globetranslation.asset
View File

@@ -34,9 +34,9 @@ local Example_Fixed_Height = {
Body = "NEW HORIZONS",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/NewHorizonsCleanModel.obj"
},
ColorTexture = textures .. "/NHTexture.jpg",
GeometryFile = models .. "/NewHorizonsCleanModel.obj",
ColorTexture = textures .. "/NHTexture.jpg"
}
},
GUI = {
Path = "/Example"
@@ -59,9 +59,9 @@ local Example_Adaptive_Height = {
Body = "NEW HORIZONS",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/NewHorizonsCleanModel.obj"
},
ColorTexture = textures .. "/NHTexture.jpg",
GeometryFile = models .. "/NewHorizonsCleanModel.obj",
ColorTexture = textures .. "/NHTexture.jpg"
}
},
GUI = {
Path = "/Example"

2
data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset
View File

@@ -1,7 +1,7 @@
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./../transforms')
asset.require("spice/base")
asset.request('./../trail')
asset.require('../trail')
local labelsPath = asset.require('./../pluto_globelabels').LabelsPath

16
data/assets/scene/solarsystem/dwarf_planets/pluto/charon/default_layers.asset
View File

@@ -1,13 +1,9 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./charon')
local globeIdentifier = globeAsset.Charon.Identifier
local colorLayersPath = "./layers/colorlayers"
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs")
local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
asset.onInitialize(function ()
openspace.setPropertyValueSingle("Scene.Charon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
end)

6
data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/colorlayers/greyscale_usgs.asset
View File

@@ -1,7 +1,13 @@
local globeIdentifier = asset.require("./../../charon").Charon.Identifier
local layer = {
Identifier = "Greyscale_USGS",
Name = "Black & White [USGS]",
FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/charon_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_CHARON_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90.0003,359.972,90",
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

15
data/assets/scene/solarsystem/dwarf_planets/pluto/charon/layers/default_layers.asset
View File

@@ -1,15 +0,0 @@
local colorLayersPath = "./colorlayers"
local colorLayers = {
asset.require(colorLayersPath .. "/greyscale_usgs").layer,
}
local heightLayers = {}
local nightLayers = {}
local overlays = {}
local waterMasks = {}
asset.export("colorLayers", colorLayers)
asset.export("heightLayers", heightLayers)
asset.export("nightLayers", nightLayers)
asset.export("overlays", overlays)
asset.export("waterMasks", waterMasks)

16
data/assets/scene/solarsystem/dwarf_planets/pluto/default_layers.asset
View File

@@ -1,13 +1,9 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./pluto')
local globeIdentifier = globeAsset.Pluto.Identifier
local colorLayersPath = "./layers/colorlayers"
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require(colorLayersPath .. "/greyscale_usgs")
local colorLayer = asset.require('./layers/colorlayers/greyscale_usgs').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
asset.onInitialize(function ()
openspace.setPropertyValueSingle("Scene.Pluto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
end)

6
data/assets/scene/solarsystem/dwarf_planets/pluto/layers/colorlayers/greyscale_usgs.asset
View File

@@ -1,7 +1,13 @@
local globeIdentifier = asset.require("./../../pluto").Pluto.Identifier
local layer = {
Identifier = "Greyscale_USGS",
Name = "Black & White [USGS]",
FilePath = "WMS:https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/pluto/pluto_simp_cyl.map&SERVICE=WMS&VERSION=1.1.1&REQUEST=GetMap&LAYERS=NEWHORIZONS_PLUTO_MOSAIC&SRS=EPSG:4326&BBOX=-180,-90,360,90",
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

15
data/assets/scene/solarsystem/dwarf_planets/pluto/layers/default_layers.asset
View File

@@ -1,15 +0,0 @@
local colorLayersPath = "./colorlayers"
local colorLayers = {
asset.require(colorLayersPath .. "/greyscale_usgs").layer,
}
local heightLayers = {}
local nightLayers = {}
local overlays = {}
local waterMasks = {}
asset.export("colorLayers", colorLayers)
asset.export("heightLayers", heightLayers)
asset.export("nightLayers", nightLayers)
asset.export("overlays", overlays)
asset.export("waterMasks", waterMasks)

2
data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset
View File

@@ -1,7 +1,7 @@
local assetHelper = asset.require('util/asset_helper')
local transforms = asset.require('./transforms')
asset.require("spice/base")
asset.request('./trail')
asset.require('./trail')
local labelsPath = asset.require('./pluto_globelabels').LabelsPath

18
data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset
View File

@@ -1,10 +1,10 @@
asset.request('./trail')
asset.request('./pluto')
asset.request('./pluto_trail')
asset.request('./charon/charon')
asset.request('./charon/charon_trail')
asset.request('./minor/hydra')
asset.request('./minor/kerberos')
asset.request('./minor/nix')
asset.request('./minor/styx')
asset.require('./trail')
asset.require('./pluto')
asset.require('./pluto_trail')
asset.require('./charon/charon')
asset.require('./charon/charon_trail')
asset.require('./minor/hydra')
asset.require('./minor/kerberos')
asset.require('./minor/nix')
asset.require('./minor/styx')

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

@@ -58,9 +58,9 @@ local Apollo11Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_double_size.obj"
GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_double_size.obj",
ColorTexture = models .. "/gray.png"
},
ColorTexture = models .. "/gray.png",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {
@@ -177,11 +177,11 @@ local Apollo11LemDescentModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = lem_model.modelFolder .. "/lmremoved.obj"
GeometryFile = lem_model.modelFolder .. "/lmremoved.obj",
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg"
},
SpecularIntensity = 0.0,
RotationVector = { 273.750,28.0,309.85 },
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {
@@ -207,11 +207,11 @@ local Apollo11LemLandedModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj"
GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj",
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg"
},
SpecularIntensity = 0.0,
RotationVector = { 273.750,28.0,309.85 },
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {

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

@@ -38,10 +38,10 @@ local Apollo11LemModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj"
GeometryFile = lem_model.modelFolder .. "/LM-2_ver2clean.obj",
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg"
},
RotationVector = { 91.044090,171.229706,111.666664 },
ColorTexture = lem_model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {

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

@@ -66,9 +66,9 @@ local Apollo15 = {
-- Geometry = {
-- Type = "MultiModelGeometry",
-- -- GeometryFile = models .. "/Apollo_Spacecraft.obj"
-- GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_doubble_size.obj"
-- GeometryFile = models .. "/Apollo_CSM_shrunk_rotated_xy_doubble_size.obj",
-- ColorTexture = models .. "/gray.png"
-- },
-- ColorTexture = models .. "/gray.png",
-- LightSources = LightSources,
-- DisableFaceCulling = true
-- },

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

@@ -49,10 +49,10 @@ local Station2Boulder1Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/b1-v2.obj"
GeometryFile = models .. "/b1-v2.obj",
ColorTexture = models .. "/b1-v2_u1_v1.jpeg"
},
RotationVector = { 243.243256 ,206.270264, 309.677429 },
ColorTexture = models .. "/b1-v2_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true
@@ -95,10 +95,10 @@ local Station2Boulder2Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/b2model.obj"
GeometryFile = models .. "/b2model.obj",
ColorTexture = models .. "/b2model_u1_v1.jpeg"
},
RotationVector = { 66.162155, 7.783780, 114.193550 },
ColorTexture = models .. "/b2model_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true
@@ -141,10 +141,10 @@ local Station2Boulder3Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/b3model.obj"
GeometryFile = models .. "/b3model.obj",
ColorTexture = models .. "/b3model_u1_v1.jpeg"
},
RotationVector = { 161.513519 ,243.243256, 65.806450 },
ColorTexture = models .. "/b3model_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true

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

@@ -60,10 +60,10 @@ local Station6Frag1Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/A17-S6-frag1.obj"
GeometryFile = models .. "/A17-S6-frag1.obj",
ColorTexture = models .. "/A17-S6-frag1.png"
},
RotationVector = { 235.909088,165.000000,286.299194 },
ColorTexture = models .. "/A17-S6-frag1.png",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true
@@ -107,10 +107,10 @@ local Station6Frag2Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/station6_boulder_frag2.obj"
GeometryFile = models .. "/station6_boulder_frag2.obj",
ColorTexture = models .. "/frag2crop_u1_v1.jpeg"
},
RotationVector = { 336.959991,210.239990,325.984253 },
ColorTexture = models .. "/frag2crop_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true,
@@ -142,10 +142,10 @@ local Station6Frag3Model = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/station6_boulder_frag3.obj"
GeometryFile = models .. "/station6_boulder_frag3.obj",
ColorTexture = models .. "/frag3crop_u1_v1.jpeg"
},
RotationVector = { 293.181824,255.000000,4.090910 },
ColorTexture = models .. "/frag3crop_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true

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

@@ -49,10 +49,10 @@ local Station7BoulderModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/b7model.obj"
GeometryFile = models .. "/b7model.obj",
ColorTexture = models .. "/b7model_u1_v1.jpeg"
},
RotationVector = { 1.945950,274.378387,212.903214 },
ColorTexture = models .. "/b7model_u1_v1.jpeg",
LightSources = LightSources,
PerformShading = false,
DisableFaceCulling = true

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

@@ -36,11 +36,11 @@ local Apollo17LemModel = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = model.modelFolder .. "/LM-2_ver2clean.obj"
GeometryFile = model.modelFolder .. "/LM-2_ver2clean.obj",
ColorTexture = model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg"
},
SpecularIntensity = 0.0,
RotationVector = { 110.255219,171.229706,126.666664 },
ColorTexture = model.modelFolder .. "/LM-2_ver2clean_u1_v1.jpeg",
LightSources = asset_helper.getDefaultLightSources(sun_transforms.SolarSystemBarycenter.Identifier)
},
GUI = {

12
data/assets/scene/solarsystem/missions/dawn/dawn.asset
View File

@@ -652,9 +652,9 @@ local Dawn = {
Body = "DAWN",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/mainbodydawn.obj"
GeometryFile = models .. "/mainbodydawn.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
LightSources = LightSources
},
GUI = {
@@ -684,9 +684,9 @@ local DawnSolarArray1 = {
Body = "DAWN",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/solarpanelleft.obj"
GeometryFile = models .. "/solarpanelleft.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
LightSources = LightSources
},
GUI = {
@@ -715,9 +715,9 @@ local DawnSolarArray2 = {
Body = "DAWN",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/solarpanelright.obj"
GeometryFile = models .. "/solarpanelright.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
LightSources = LightSources
},
GUI = {

4
data/assets/scene/solarsystem/missions/dawn/vesta.asset
View File

@@ -47,10 +47,10 @@ local Vesta = {
Type = "RenderableModelProjection",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/VestaComet_5000.obj"
GeometryFile = models .. "/VestaComet_5000.obj",
ColorTexture = textures .. "/dummy.jpg"
},
BoundingSphereRadius = 10.0,
ColorTexture = textures .. "/dummy.jpg",
Projection = {
Sequence = images,
SequenceType = "image-sequence",

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

@@ -41,9 +41,9 @@ local Gaia = {
Body = "GAIA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = model .. "/gaia.obj"
GeometryFile = model .. "/gaia.obj",
ColorTexture = textures .. "/gaia-baked.png"
},
ColorTexture = textures .. "/gaia-baked.png",
LightSources = {
{
Type = "SceneGraphLightSource",

124
data/assets/scene/solarsystem/missions/insight/edl.asset
View File

@@ -169,9 +169,9 @@ local Insight_Entry_CapsuleA = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj"
GeometryFile = models_cruise_cone .. "/cruise_insight_doubleside2_newcapsule_diffuse.obj",
ColorTexture = models_cruise_cone .. "/insight_newcapsule_diffuse.jpg"
},
ColorTexture = models_cruise_cone .. "/insight_newcapsule_diffuse.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -194,9 +194,9 @@ local Insight_Entry_Capsule_Ring = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_ring_foil_gold.obj"
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_ring_foil_gold.obj",
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png"
},
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -219,9 +219,9 @@ local Insight_Entry_Capsule_Plugs = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_capsule_diffuse.obj"
GeometryFile = models_cruise_cone .. "/insight_cruise_cone_capsule_diffuse.obj",
ColorTexture = models_cruise_cone .. "/insight_capsule_diffuse.png"
},
ColorTexture = models_cruise_cone .. "/insight_capsule_diffuse.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -244,9 +244,9 @@ local Insight_Entry_Heatshield = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_cruise_cone .. "/insight_cruise_heatshield_foil_gold.obj"
GeometryFile = models_cruise_cone .. "/insight_cruise_heatshield_foil_gold.obj",
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png"
},
ColorTexture = models_cruise_cone .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -269,9 +269,9 @@ local Insight_Parachute_0 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame01_diff1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame01_diff1.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
ColorTexture = models_chutes .. "/chute_diff.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -294,9 +294,9 @@ local Insight_Parachute_Cords_0 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame01_cords1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame01_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
ColorTexture = models_chutes .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -319,9 +319,9 @@ local Insight_Parachute_20 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame20_diff1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame20_diff1.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
ColorTexture = models_chutes .. "/chute_diff.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -344,9 +344,9 @@ local Insight_Parachute_Cords_20 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame20_cords1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame20_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
ColorTexture = models_chutes .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -369,9 +369,9 @@ local Insight_Parachute_40 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/chute_doubleside_frame40_diff.obj"
GeometryFile = models_chutes .. "/chute_doubleside_frame40_diff.obj",
ColorTexture = models_chutes .. "/chute_diff.png"
},
ColorTexture = models_chutes .. "/chute_diff.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -394,9 +394,9 @@ local Insight_Parachute_Cords_40 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_chutes .. "/insight_chute_frame40_cords1.obj"
GeometryFile = models_chutes .. "/insight_chute_frame40_cords1.obj",
ColorTexture = models_chutes .. "/foil_gold_ramp.png"
},
ColorTexture = models_chutes .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -419,9 +419,9 @@ local Insight_Lander_A001 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO01.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO01.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_01.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -444,9 +444,9 @@ local Insight_Lander_A002 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO02.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO02.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_02.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_02.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -469,9 +469,9 @@ local Insight_Lander_A003 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO03.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO03.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_03.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_03.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -494,9 +494,9 @@ local Insight_Lander_A004 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO04.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO04.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_04.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_04.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -519,9 +519,9 @@ local Insight_Lander_A005 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO05.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO05.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_05.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_05.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -544,9 +544,9 @@ local Insight_Lander_A006 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO06.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO06.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_06.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_06.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -569,9 +569,9 @@ local Insight_Lander_A007 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO07.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO07.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_07.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_07.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -594,9 +594,9 @@ local Insight_Lander_A008 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO08.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_AO08.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_08.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_AO_08.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -619,9 +619,9 @@ local Insight_Lander_foil1 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_foil1.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_foil1.obj",
ColorTexture = models_lander_lander_deck .. "/foil_silver_ramp.jpg"
},
ColorTexture = models_lander_lander_deck .. "/foil_silver_ramp.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -644,9 +644,9 @@ local Insight_Lander_Tex01 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex01.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex01.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -669,9 +669,9 @@ local Insight_Lander_Tex02 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex02.obj"
GeometryFile = models_lander_lander_deck .. "/insight_lander_deck_tex02.obj",
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_02.jpg"
},
ColorTexture = models_lander_lander_deck .. "/InSIGHT_tex_02.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -694,9 +694,9 @@ local Insight_Legs_Stowed_tex = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_tex01.obj"
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_tex01.obj",
ColorTexture = models_lander_legs_stow .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_legs_stow .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -719,9 +719,9 @@ local Insight_Legs_Stowed_AO06 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_AO06.obj"
GeometryFile = models_lander_legs_stow .. "/insight_lander_legs_stow_AO06.obj",
ColorTexture = models_lander_legs_stow .. "/InSIGHT_AO_06.jpg"
},
ColorTexture = models_lander_legs_stow .. "/InSIGHT_AO_06.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -744,9 +744,9 @@ local Insight_Legs_Deployed_tex = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_tex01.obj"
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_tex01.obj",
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -769,9 +769,9 @@ local Insight_Legs_Deployed_AO06 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_AO06.obj"
GeometryFile = models_lander_legs_deploy .. "/insight_lander_legs_deploy_AO06.obj",
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_AO_06.jpg"
},
ColorTexture = models_lander_legs_deploy .. "/InSIGHT_AO_06.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -794,9 +794,9 @@ local Insight_Panels_Stowed_tex = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex01.obj"
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex01.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -819,9 +819,9 @@ local Insight_Panels_Stowed_tex2 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex02.obj"
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_tex02.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_02.jpg"
},
ColorTexture = models_lander_panels_stow .. "/InSIGHT_tex_02.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -844,9 +844,9 @@ local Insight_Panels_Stowed_AO01 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_AO01.obj"
GeometryFile = models_lander_panels_stow .. "/insight_lander_panels_stow_AO01.obj",
ColorTexture = models_lander_panels_stow .. "/InSIGHT_AO_01.jpg"
},
ColorTexture = models_lander_panels_stow .. "/InSIGHT_AO_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -869,9 +869,9 @@ local Insight_Panels_Deployed_tex = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex01.obj"
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex01.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_01.jpg"
},
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -894,9 +894,9 @@ local Insight_Panels_Deployed_tex2 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex02.obj"
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_tex02.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_02.jpg"
},
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_tex_02.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},
@@ -919,9 +919,9 @@ local Insight_Panels_Deployed_AO06 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_AO01.obj"
GeometryFile = models_lander_panels_deploy .. "/insight_lander_panels_deploy_AO01.obj",
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_AO_01.jpg"
},
ColorTexture = models_lander_panels_deploy .. "/InSIGHT_AO_01.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources,
},

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

@@ -159,9 +159,9 @@ local Juno = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = model .. "/Juno.obj"
GeometryFile = model .. "/Juno.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
ModelTransform = RotationMatrix,
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},

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

@@ -94,9 +94,9 @@ local MessengerProbeBlack = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_black.obj"
GeometryFile = models .. "/MessengerProbe_black.obj",
ColorTexture = models .. "/Tex_black.png"
},
ColorTexture = models .. "/Tex_black.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -113,9 +113,9 @@ local MessengerProbeFoil = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_foil.obj"
GeometryFile = models .. "/MessengerProbe_foil.obj",
ColorTexture = models .. "/foil_n2.png"
},
ColorTexture = models .. "/foil_n2.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -132,9 +132,9 @@ local MessengerProbeHeatShield = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_heatShield.obj"
GeometryFile = models .. "/MessengerProbe_heatShield.obj",
ColorTexture = models .. "/AO_heatshield4.png"
},
ColorTexture = models .. "/AO_heatshield4.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -151,9 +151,9 @@ local MessengerProbeMetal = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_metal.obj"
GeometryFile = models .. "/MessengerProbe_metal.obj",
ColorTexture = models .. "/Tex_grey.png"
},
ColorTexture = models .. "/Tex_grey.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -171,9 +171,9 @@ local MessengerProbePanels = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MessengerProbe_panels.obj"
GeometryFile = models .. "/MessengerProbe_panels.obj",
ColorTexture = models .. "/Messenger_tex.png"
},
ColorTexture = models .. "/Messenger_tex.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},

4
data/assets/scene/solarsystem/missions/newhorizons/label.asset
View File

@@ -16,9 +16,9 @@ local Labels = {
Body = "NEW HORIZONS",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/Labels.obj"
GeometryFile = models .. "/Labels.obj",
ColorTexture = textures .. "/labels.png"
},
ColorTexture = textures .. "/labels.png",
AmbientIntensity = 0.8
},
GUI = {

4
data/assets/scene/solarsystem/missions/newhorizons/model.asset
View File

@@ -24,9 +24,9 @@ local NewHorizons = {
Body = "NEW HORIZONS",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/NewHorizonsCleanModel.obj"
GeometryFile = models .. "/NewHorizonsCleanModel.obj",
ColorTexture = textures .. "/NHTexture.jpg"
},
ColorTexture = textures .. "/NHTexture.jpg",
AmbientIntensity = 0.0,
DiffuseIntensity = 1.0,
SpecularIntensity = 1.0,

4
data/assets/scene/solarsystem/missions/osirisrex/bennu.asset
View File

@@ -36,9 +36,9 @@ local Bennu = {
Body = BENNU_BODY,
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/BennuTextured.obj"
GeometryFile = models .. "/BennuTextured.obj",
ColorTexture = textures .. "/gray.png"
},
ColorTexture = textures .. "/gray.png",
Projection = {
Sequence = asset.localResource('InstrumentTimes'),
SequenceType = "instrument-times",

12
data/assets/scene/solarsystem/missions/osirisrex/model.asset
View File

@@ -218,9 +218,9 @@ local OsirisRex = {
Body = "OSIRIS-REX",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_base_resized_12_sep_2016.obj"
GeometryFile = models .. "/orx_base_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
ColorTexture = textures .. "/osirisTex.png",
LightSources = LightSources
},
GUI = {
@@ -248,9 +248,9 @@ local PolyCam = {
Body = "OSIRIS-REX",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_polycam_resized_12_sep_2016.obj"
GeometryFile = models .. "/orx_polycam_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
ColorTexture = textures .. "/osirisTex.png",
LightSources = LightSources
},
GUI = {
@@ -267,9 +267,9 @@ local Rexis = {
Body = "OSIRIS-REX",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/orx_rexis_resized_12_sep_2016.obj"
GeometryFile = models .. "/orx_rexis_resized_12_sep_2016.obj",
ColorTexture = textures .. "/osirisTex.png"
},
ColorTexture = textures .. "/osirisTex.png",
LightSources = LightSources
},
Transform = {

8
data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset
View File

@@ -1,7 +1,7 @@
asset.request('./bennu')
asset.request('./model')
asset.request('./trail')
asset.request('scene/solarsystem/sun/marker')
asset.require('./bennu')
asset.require('./model')
asset.require('./trail')
asset.require('scene/solarsystem/sun/marker')
asset.require('./script_schedule')

223
data/assets/scene/solarsystem/missions/perseverance/model.asset
View File

@@ -63,9 +63,9 @@ local Body = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_1.obj"
GeometryFile = models .. "/MSL_BODY_new_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false,
},
@@ -85,9 +85,9 @@ local Body_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_1_new_detail.obj"
GeometryFile = models .. "/MSL_BODY_new_1_new_detail.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false,
},
@@ -106,9 +106,9 @@ local Body_staticParts_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_2.obj"
GeometryFile = models .. "/MSL_BODY_new_2.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -126,9 +126,9 @@ local Body_staticParts_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_3.obj"
GeometryFile = models .. "/MSL_BODY_new_3.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -146,9 +146,9 @@ local Body_staticParts_3 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_4.obj"
GeometryFile = models .. "/MSL_BODY_new_4.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -166,9 +166,9 @@ local Body_staticParts_4 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_5.obj"
GeometryFile = models .. "/MSL_BODY_new_5.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -186,9 +186,9 @@ local Body_staticParts_5 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_BODY_new_A0.obj"
GeometryFile = models .. "/MSL_BODY_new_A0.obj",
ColorTexture = textures .. "/parts_AO.png"
},
ColorTexture = textures .. "/parts_AO.png",
LightSources = LightSources,
PerformShading = false
},
@@ -207,9 +207,9 @@ local RA_Shoulder_AZ = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_new.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -227,9 +227,9 @@ local RA_Shoulder_AZ_detail_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_1.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_1.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -247,9 +247,9 @@ local RA_Shoulder_AZ_detail_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_2.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_AZ_detail_2.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false
},
@@ -268,9 +268,9 @@ local RA_Shoulder_EL_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_1.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false
},
@@ -289,9 +289,9 @@ local RA_Shoulder_EL_detail_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_1.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_1.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -309,9 +309,9 @@ local RA_Shoulder_EL_detail_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_2.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_detail_2.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -331,9 +331,9 @@ local RA_Shoulder_EL_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_2.obj"
GeometryFile = models .. "/MSL_RA_SHOULDER_EL_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -352,9 +352,9 @@ local RA_Elbow_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_1.obj"
GeometryFile = models .. "/MSL_RA_ELBOW_1.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false
},
@@ -372,9 +372,9 @@ local RA_Elbow_detail_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_detail_1.obj"
GeometryFile = models .. "/MSL_RA_ELBOW_detail_1.obj",
ColorTexture = textures .. "/tex_04.png",
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -392,9 +392,9 @@ local RA_Elbow_detail_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_detail_2.obj"
GeometryFile = models .. "/MSL_RA_ELBOW_detail_2.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -413,9 +413,9 @@ local RA_Elbow_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_ELBOW_2.obj"
GeometryFile = models .. "/MSL_RA_ELBOW_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -435,9 +435,9 @@ local RA_Wrist = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_1.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_1.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -455,9 +455,9 @@ local RA_Wrist_details = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_1_details.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_1_details.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
LightSources = LightSources,
PerformShading = false
},
@@ -476,9 +476,9 @@ local RA_Turret = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_2.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -497,9 +497,9 @@ local RA_Turret_details_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_1.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_1.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -517,9 +517,9 @@ local RA_Turret_details_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_2.obj"
GeometryFile = models .. "/MSL_RA_TURRET_new_2_detail_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -538,10 +538,9 @@ local RSM_root = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_ROOT.obj"
GeometryFile = models .. "/MSL_RSM_ROOT.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -559,9 +558,9 @@ local RSM_AZ = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_AZ.obj"
GeometryFile = models .. "/MSL_RSM_AZ.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -579,9 +578,9 @@ local RSM_EL = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_RSM_EL.obj"
GeometryFile = models .. "/MSL_RSM_EL.obj",
ColorTexture = textures .. "/tex_04.png"
},
ColorTexture = textures .. "/tex_04.png",
LightSources = LightSources,
PerformShading = false
},
@@ -600,9 +599,9 @@ local HGA_AZ = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_HGA_AZ_0ANGLE.obj"
GeometryFile = models .. "/MSL_HGA_AZ_0ANGLE.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -620,9 +619,9 @@ local HGA_EL = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_HGA_EL.obj"
GeometryFile = models .. "/MSL_HGA_EL.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -641,9 +640,9 @@ local SAM_Cover_1 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_1.obj"
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_1.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
ColorTexture = textures .. "/MSLTextureTest.png",
LightSources = LightSources,
PerformShading = false
},
@@ -661,9 +660,9 @@ local SAM_Cover_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_2.obj"
GeometryFile = models .. "/MSL_SAM_FIXED_COVER_2.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
ColorTexture = textures .. "/MSLTextureTest.png",
LightSources = LightSources,
PerformShading = false
},
@@ -681,9 +680,9 @@ local CHEMIN_Bottom = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_CHEMIN.obj"
GeometryFile = models .. "/MSL_CHEMIN.obj",
ColorTexture = textures .. "/MSLTextureTest.png"
},
ColorTexture = textures .. "/MSLTextureTest.png",
LightSources = LightSources,
PerformShading = false
},
@@ -702,9 +701,9 @@ local Wheel_Base = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_BASE.obj"
GeometryFile = models .. "/MSL_WHEEL_BASE.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -721,9 +720,9 @@ local Wheel_Base_2 = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_BASE_2.obj"
GeometryFile = models .. "/MSL_WHEEL_BASE_2.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -742,9 +741,9 @@ local Wheel_Leg_1_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1_L.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -762,9 +761,9 @@ local Wheel_Leg_1A_L_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_L_detail.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_L_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -782,9 +781,9 @@ local Wheel_Leg_1B_L_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_L_detail.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_L_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -802,9 +801,9 @@ local Wheel_Leg_2_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_2_L_new.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_2_L_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -822,9 +821,9 @@ local Wheel_Wrist_F_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -842,9 +841,9 @@ local Wheel_Wrist_hub_F_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -862,9 +861,9 @@ local Wheel_F_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj"
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -882,9 +881,9 @@ local Wheel_C_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj"
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -902,9 +901,9 @@ local Wheel_Wrist_B_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_B_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_B_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -922,9 +921,9 @@ local Wheel_Wrist_hub_B_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false,
},
@@ -943,9 +942,9 @@ local Wheel_B_L = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_L.obj"
GeometryFile = models .. "/MSL_WHEEL_L.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -964,9 +963,9 @@ local Wheel_Leg_1_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1_R.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -984,9 +983,9 @@ local Wheel_Leg_1A_R_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_R_detail.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1A_R_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1004,9 +1003,9 @@ local Wheel_Leg_1B_R_detail = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_R_detail.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_1B_R_detail.obj",
ColorTexture = textures .. "/tex_05.png"
},
ColorTexture = textures .. "/tex_05.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1024,9 +1023,9 @@ local Wheel_Leg_2_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_LEG_2_R_new.obj"
GeometryFile = models .. "/MSL_WHEEL_LEG_2_R_new.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1044,10 +1043,10 @@ local Wheel_Wrist_F_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_R.obj"
--GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_F_R.obj",
--GeometryFile = models .. "/MSL_WHEEL_WRIST_F_L.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1065,9 +1064,9 @@ local Wheel_Wrist_hub_F_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_R.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_F_R.obj",
ColorTexture = textures .. "/tex_02.png",
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1085,9 +1084,9 @@ local Wheel_F_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj"
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1105,9 +1104,9 @@ local Wheel_C_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj"
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1125,9 +1124,9 @@ local Wheel_Wrist_B_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1A_B_R.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1A_B_R.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1145,9 +1144,9 @@ local Wheel_Wrist_hub_B_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_R.obj"
GeometryFile = models .. "/MSL_WHEEL_WRIST_1B_B_R.obj",
ColorTexture = textures .. "/tex_02.png"
},
ColorTexture = textures .. "/tex_02.png",
LightSources = LightSources,
PerformShading = false
},
@@ -1165,9 +1164,9 @@ local Wheel_B_R = {
Body = "MARS SCIENCE LABORATORY",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/MSL_WHEEL_R.obj"
GeometryFile = models .. "/MSL_WHEEL_R.obj",
ColorTexture = textures .. "/tex_03.png"
},
ColorTexture = textures .. "/tex_03.png",
LightSources = LightSources,
PerformShading = false
},

4
data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset
View File

@@ -34,9 +34,9 @@ local Pioneer10 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj"
GeometryFile = modelFolder .. "/Pioneer.obj",
ColorTexture = modelFolder .. "/gray.png"
},
ColorTexture = modelFolder .. "/gray.png",
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},
GUI = {

4
data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset
View File

@@ -37,9 +37,9 @@ local Pioneer11 = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = modelFolder .. "/Pioneer.obj"
GeometryFile = modelFolder .. "/Pioneer.obj",
ColorTexture = modelFolder .. "/gray.png"
},
ColorTexture = modelFolder .. "/gray.png",
LightSources = assetHelper.getDefaultLightSources(sunTransforms.SolarSystemBarycenter.Identifier)
},
GUI = {

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

@@ -56,9 +56,9 @@ local Comet67P = {
Type = "RenderableModelProjection",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/67P_rotated_5_130.obj"
GeometryFile = models .. "/67P_rotated_5_130.obj",
ColorTexture = textures .. "/gray.jpg"
},
ColorTexture = textures .. "/gray.jpg",
Projection = {
Sequence = { imagesDestination },
SequenceType = "image-sequence",

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

@@ -140,9 +140,9 @@ local RosettaBlackFoil = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/black_foil.obj"
GeometryFile = models .. "/black_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -160,9 +160,9 @@ local RosettaBlackParts = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/black_parts.obj"
GeometryFile = models .. "/black_parts.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -180,9 +180,9 @@ local RosettaDish = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/dish.obj"
GeometryFile = models .. "/dish.obj",
ColorTexture = textures .. "/dish_AO.png"
},
ColorTexture = textures .. "/dish_AO.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -200,9 +200,9 @@ local RosettaParts = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/parts.obj"
GeometryFile = models .. "/parts.obj",
ColorTexture = textures .. "/parts2_AO.png"
},
ColorTexture = textures .. "/parts2_AO.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -220,9 +220,9 @@ local RosettaSilverFoil = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/silver_foil.obj"
GeometryFile = models .. "/silver_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -240,9 +240,9 @@ local RosettaVents = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/vents.obj"
GeometryFile = models .. "/vents.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -260,9 +260,9 @@ local RosettaWingA = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .."/wingA.obj"
GeometryFile = models .."/wingA.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -280,9 +280,9 @@ local RosettaWingB = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/wingB.obj"
GeometryFile = models .. "/wingB.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -300,9 +300,9 @@ local RosettaYellowFoil = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/yellow_foil.obj"
GeometryFile = models .. "/yellow_foil.obj",
ColorTexture = textures .. "/foil_gold_ramp.png"
},
ColorTexture = textures .. "/foil_gold_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -349,9 +349,9 @@ local PhilaeFoil = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_foil.obj"
GeometryFile = models .. "/lander_foil.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -369,9 +369,9 @@ local PhilaeLids = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_lids.obj"
GeometryFile = models .. "/lander_lids.obj",
ColorTexture = textures .. "/parts2_AO.png"
},
ColorTexture = textures .. "/parts2_AO.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -389,9 +389,9 @@ local PhilaeParts = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_parts.obj"
GeometryFile = models .. "/lander_parts.obj",
ColorTexture = textures .. "/foil_silver_ramp.png"
},
ColorTexture = textures .. "/foil_silver_ramp.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -409,9 +409,9 @@ local PhilaeSolarPanels = {
Body = "ROSETTA",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/lander_solarp.obj"
GeometryFile = models .. "/lander_solarp.obj",
ColorTexture = textures .. "/tex_01.png"
},
ColorTexture = textures .. "/tex_01.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},

8
data/assets/scene/solarsystem/missions/voyager/voyager1.asset
View File

@@ -82,9 +82,9 @@ local Voyager1Main = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-main.obj"
GeometryFile = models .. "/voyager-main.obj",
ColorTexture = models .. "/voyager-main.jpg"
},
ColorTexture = models .. "/voyager-main.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -101,9 +101,9 @@ local Voyager1Antenna = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-antenna.obj"
GeometryFile = models .. "/voyager-antenna.obj",
ColorTexture = models .. "/voyager-antenna.png"
},
ColorTexture = models .. "/voyager-antenna.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},

8
data/assets/scene/solarsystem/missions/voyager/voyager2.asset
View File

@@ -85,9 +85,9 @@ local Voyager2Main = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-main.obj"
GeometryFile = models .. "/voyager-main.obj",
ColorTexture = models .. "/voyager-main.jpg"
},
ColorTexture = models .. "/voyager-main.jpg",
ModelTransform = RotationMatrix,
LightSources = LightSources
},
@@ -104,9 +104,9 @@ local Voyager2Antenna = {
Type = "RenderableModel",
Geometry = {
Type = "MultiModelGeometry",
GeometryFile = models .. "/voyager-antenna.obj"
GeometryFile = models .. "/voyager-antenna.obj",
ColorTexture = models .. "/voyager-antenna.png"
},
ColorTexture = models .. "/voyager-antenna.png",
ModelTransform = RotationMatrix,
LightSources = LightSources
},

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

@@ -1,33 +1,47 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./earth')
local globeIdentifier = globeAsset.Earth.Identifier
local colorLayersPath = "./layers/colorlayers"
local heightLayersPath = "./layers/heightlayers"
local nightLayersPath = "./layers/nightlayers"
local overlaysPath = "./layers/overlays"
local waterMasksPath = "./layers/watermasks"
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorFallbackLayer = asset.require('./layers/colorlayers/blue_marble_fallback').layer
local nightFallbackLayer = asset.require('./layers/nightlayers/earth_night_texture').layer
local heightFallbackLayer = asset.require('./layers/heightlayers/blue_marble_height_fallback').layer
-- Color layers
local colorLayer = asset.require(colorLayersPath .. "/esri_viirs_combo")
asset.require(colorLayersPath .. "/esri_world_imagery")
asset.require(colorLayersPath .. "/esri_imagery_world_2d")
asset.require(colorLayersPath .. "/viirs_snpp_temporal")
asset.require(colorLayersPath .. "/aqua_modis_temporal")
asset.require(colorLayersPath .. "/terra_modis_temporal")
asset.require(colorLayersPath .. "/bmng_utah")
asset.require(colorLayersPath .. "/bmng_sweden")
asset.require(colorLayersPath .. "/amsr2_gcom_w1_sea_ice_concentration_temporal")
asset.require(colorLayersPath .. "/modis_terra_chlorophyll_a_temporal")
asset.require(colorLayersPath .. "/ghrsst_l4_g1sst_sea_surface_temperature_temporal")
asset.require(colorLayersPath .. "/ghrsst_l4_mur_sea_surface_temperature_temporal")
colorFallbackLayer.Enabled = true
heightFallbackLayer.Enabled = true
nightFallbackLayer.Enabled = true
-- Height layers
local heightLayer = asset.require(heightLayersPath .. "/terrain_tileset")
local colorLayer = asset.require('./layers/colorlayers/esri_viirs_combo').layer
local heightLayer = asset.require('./layers/heightlayers/terrain_tileset').layer
local nightLayer = asset.require('./layers/nightlayers/earth_at_night_2012').layer
local waterMask = asset.require('./layers/watermasks/modis_water_mask').layer
-- Night layers
local nightLayer = asset.require(nightLayersPath .. "/earth_at_night_2012")
asset.require(nightLayersPath .. "/earth_at_night_temporal")
colorLayer.Enabled = true
colorLayer.Fallback = colorFallbackLayer
-- Overlays
asset.require(overlaysPath .. "/coastlines")
asset.require(overlaysPath .. "/reference_features")
asset.require(overlaysPath .. "/reference_labels")
asset.require(overlaysPath .. "/tile_indices")
asset.require(overlaysPath .. "/size_reference")
heightLayer.Enabled = true
heightLayer.Fallback = heightFallbackLayer
-- Watermasks
asset.require(waterMasksPath .. "/gebco_sweden")
asset.require(waterMasksPath .. "/gebco_utah")
local watermask = asset.require(waterMasksPath .. "/modis_water_mask")
nightLayer.Enabled = true
nightLayer.Fallback = nightFallbackLayer
waterMask.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
asset.onInitialize(function ()
openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true)
openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.NightLayers." .. nightLayer.layer.Identifier .. ".Enabled", true)
openspace.setPropertyValueSingle("Scene.Earth.Renderable.Layers.WaterMasks." .. watermask.layer.Identifier .. ".Enabled", true)
end)

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

@@ -2,7 +2,7 @@ local transforms = asset.require('./transforms')
local assetHelper = asset.require('util/asset_helper')
local labelsPath = asset.require('./earth_globelabels').LabelsPath
asset.request('./trail')
asset.require('./trail')
-- local earthEllipsoid = { 6378137.0, 6378137.0, 6356752.314245 }
local earthEllipsoid = { 6378137.0, 6378137.0, 6378137.0 }

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

@@ -1,3 +1,5 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "AMSR2_GCOM_W1_Sea_Ice_Concentration_Temporal",
Name = "AMSR2 GCOM W1 Sea Ice Concentration (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
)
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,3 +1,5 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "Aqua_Modis_Temporal",
Name = "Aqua Modis (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
)
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "BMNG_Sweden",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/LiU/Bmng.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "BMNG_Utah",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/Utah/Bmng.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "ESRI_Imagery_World_2D",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/ESRI/ESRI_Imagery_World_2D.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,7 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local fallBackLayer = asset.require("./fallbacks/blue_marble").layer
local layer = {
Identifier = "ESRI_VIIRS_Combo",
@@ -33,6 +36,11 @@ local layer = {
},
},
PadTiles = false,
Fallback = fallBackLayer
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "ESRI_World_Imagery",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/ESRI/World_Imagery.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

3
data/assets/scene/solarsystem/planets/earth/layers/colorlayers/blue_marble_fallback.asset → data/assets/scene/solarsystem/planets/earth/layers/colorlayers/fallbacks/blue_marble.asset
View File

@@ -1,4 +1,5 @@
local texturesPath = asset.require("./../../earth_textures").TexturesPath
local texturesPath = asset.require("./../../../earth_textures").TexturesPath
local globeIdentifier = asset.require("./../../../earth").Earth.Identifier
local layer = {
Identifier = "Blue_Marble",

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

@@ -1,3 +1,5 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "GHRSST_L4_MUR_Sea_Surface_Temperature_Temporal",
Name = "GHRSST L4 MUR Sea Surface Temperature (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
)
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,3 +1,5 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "Terra_Modis_Temporal",
Name = "Terra Modis (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
)
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,3 +1,5 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "MODIS_Terra_Chlorophyll_A_Temporal",
Name = "MODIS Terra Chlorophyll A (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
)
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,3 +1,5 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "Terra_Modis_Temporal",
Name = "Terra Modis (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
)
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,3 +1,5 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "VIIRS_SNPP_Temporal",
Name = "VIIRS SNPP (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
)
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,48 +0,0 @@
local colorLayersPath = "./colorlayers"
local colorLayers = {
asset.require(colorLayersPath .. "/esri_viirs_combo").layer,
asset.require(colorLayersPath .. "/esri_world_imagery").layer,
asset.require(colorLayersPath .. "/esri_imagery_world_2d").layer,
asset.require(colorLayersPath .. "/viirs_snpp_temporal").layer,
asset.require(colorLayersPath .. "/aqua_modis_temporal").layer,
asset.require(colorLayersPath .. "/terra_modis_temporal").layer,
asset.require(colorLayersPath .. "/bmng_utah").layer,
asset.require(colorLayersPath .. "/bmng_sweden").layer,
asset.require(colorLayersPath .. "/amsr2_gcom_w1_sea_ice_concentration_temporal").layer,
asset.require(colorLayersPath .. "/modis_terra_chlorophyll_a_temporal").layer,
asset.require(colorLayersPath .. "/ghrsst_l4_g1sst_sea_surface_temperature_temporal").layer,
asset.require(colorLayersPath .. "/ghrsst_l4_mur_sea_surface_temperature_temporal").layer
}
local heightLayersPath = "./heightlayers"
local heightLayers = {
asset.require(heightLayersPath .. "/terrain_tileset").layer
}
local nightLayersPath = "./nightlayers"
local nightLayers = {
asset.require(nightLayersPath .. "/earth_at_night_2012").layer,
asset.require(nightLayersPath .. "/earth_at_night_temporal").layer
}
local overlaysPath = "./overlays"
local overlays = {
asset.require(overlaysPath .. "/coastlines").layer,
asset.require(overlaysPath .. "/reference_features").layer,
asset.require(overlaysPath .. "/reference_labels").layer,
asset.require(overlaysPath .. "/tile_indices").layer,
asset.require(overlaysPath .. "/size_reference").layer
}
local waterMasksPath = "./watermasks"
local waterMasks = {
asset.require(waterMasksPath .. "/gebco_sweden").layer,
asset.require(waterMasksPath .. "/gebco_utah").layer,
asset.require(waterMasksPath .. "/modis_water_mask").layer
}
asset.export("colorLayers", colorLayers)
asset.export("heightLayers", heightLayers)
asset.export("nightLayers", nightLayers)
asset.export("overlays", overlays)
asset.export("waterMasks", waterMasks)

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

@@ -1,4 +1,4 @@
local texturesPath = asset.require("./../../earth_textures").TexturesPath
local texturesPath = asset.require("./../../../earth_textures").TexturesPath
local layer = {
Name = "Earth Bluemarble Height",

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

@@ -1,10 +1,18 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local fallBackLayer = asset.require("./fallbacks/blue_marble_height").layer
local layer = {
Identifier = "Terrain_tileset",
Name = "Terrain tileset",
FilePath = mapServiceConfigsPath .. "/ESRI/Terrain.wms",
TilePixelSize = 64,
Fallback = fallBackLayer
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,9 +1,17 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local fallBackLayer = asset.require("./fallbacks/earth_night_texture").layer
local layer = {
Identifier = "Earth_at_Night_2012",
Name = "Earth at Night 2012",
FilePath = mapServiceConfigsPath .. "/GIBS/night/VIIRS_CityLights_2012.wms",
Fallback = fallBackLayer
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,3 +1,5 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "Earth_at_Night_Temporal",
Name = "Earth at Night (Temporal)",
@@ -12,4 +14,8 @@ local layer = {
)
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,9 +0,0 @@
local texturesPath = asset.require("./../../earth_textures").TexturesPath
local layer = {
Identifier = "Earth_Night",
Name = "Earth Night",
FilePath = texturesPath .. "/earth_night.jpg",
}
asset.export("layer", layer)

9
data/assets/scene/solarsystem/planets/earth/layers/nightlayers/fallbacks/earth_night_texture.asset Normal file
View File

@@ -0,0 +1,9 @@
local texturesPath = asset.require("./../../../earth_textures").TexturesPath
local layer = {
Identifier = "Earth_Night Texture",
Name = "Earth Night Texture",
FilePath = texturesPath .. "/earth_night.jpg",
}
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines.asset
View File

@@ -1,8 +1,13 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "Coastlines",
FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Coastlines.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
end)
asset.export("layer", layer)

10
data/assets/scene/solarsystem/planets/earth/layers/overlays/coastlines_enabled.asset Normal file
View File

@@ -0,0 +1,10 @@
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = asset.require("./coastlines").layer
layer.Enabled = true
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_features.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "Reference_Features",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Features.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/layers/overlays/reference_labels.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "Reference_Labels",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/GIBS/overlays/Reference_Labels.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
end)
asset.export("layer", layer)

9
data/assets/scene/solarsystem/planets/earth/layers/overlays/size_reference.asset
View File

@@ -1,10 +1,15 @@
local earthAsset = asset.require("./../../earth")
local earthAsset = asset.require("./../../earth").Earth
local globeIdentifier = earthAsset.Identifier
local layer ={
Identifier = "Size_Reference",
Name = "Size Reference",
Type = "SizeReferenceTileLayer",
Radii = earthAsset.Earth.Renderable.Radii
Radii = earthAsset.Renderable.Radii
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/layers/overlays/tile_indices.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "Tile_Indices",
@@ -6,4 +7,8 @@ local layer = {
Type = "TileIndexTileLayer"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "Overlays", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_sweden.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Name = "Gebco [Sweden]",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/LiU/Gebco.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/layers/watermasks/gebco_utah.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Name = "Gebco [Utah]",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/Utah/Gebco.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/layers/watermasks/modis_water_mask.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigsPath = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../earth").Earth.Identifier
local layer = {
Identifier = "MODIS_Water_Mask",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigsPath .. "/GIBS/water/MODIS_Water_Mask.wms",
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "WaterMasks", layer)
end)
asset.export("layer", layer)

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

@@ -1,16 +1,27 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./moon')
local globeIdentifier = globeAsset.Moon.Identifier
local colorLayersPath = "./layers/colorlayers"
local heightLayersPath = "./layers/heightlayers"
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
-- Color layers
local colorLayer = asset.require(colorLayersPath .. "/wac_utah")
asset.require(colorLayersPath .. "/wac_sweden")
asset.require(colorLayersPath .. "/clemuvvis_utah")
asset.require(colorLayersPath .. "/clemuvvis_sweden")
asset.require(colorLayersPath .. "/uvvishybrid_utah")
asset.require(colorLayersPath .. "/uvvishybrid_sweden")
asset.require(colorLayersPath .. "/kaguya_utah")
asset.require(colorLayersPath .. "/kaguya_sweden")
asset.require(colorLayersPath .. "/lola_clr_shade_utah")
asset.require(colorLayersPath .. "/lola_clr_shade_sweden")
asset.require(colorLayersPath .. "/lola_shade_utah")
asset.require(colorLayersPath .. "/lola_shade_sweden")
local colorLayer = asset.require('./layers/colorlayers/wac_utah').layer
local heightLayer = asset.require('./layers/heightlayers/loladem_utah').layer
-- Height layers
local heightLayer = asset.require(heightLayersPath .. "/loladem_utah")
asset.require(heightLayersPath .. "/loladem_sweden")
colorLayer.Enabled = true
heightLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
asset.onInitialize(function ()
openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
openspace.setPropertyValueSingle("Scene.Moon.Renderable.Layers.HeightLayers." .. heightLayer.layer.Identifier .. ".Enabled", true)
end)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/clemuvvis_sweden.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "ClemUvvis_Sweden",
@@ -10,4 +11,8 @@ local layer = {
}
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "ClemUvvis_Utah",
@@ -10,4 +11,8 @@ local layer = {
}
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_sweden.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "Kaguya_Sweden",
@@ -10,4 +11,8 @@ local layer = {
}
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/kaguya_utah.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "Kaguya_Utah",
@@ -10,4 +11,8 @@ local layer = {
}
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_clr_shade_sweden.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "Lola_Clr_Shade_Sweden",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigs .. "/LiU/Lola_Clr_Shade.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "Lola_Clr_Shade_Utah",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigs .. "/Utah/LolaClrShade.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_sweden.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "Lola_Shade_Sweden",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigs .. "/LiU/Lola_Shade.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/lola_shade_utah.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "Lola_Shade_Utah",
@@ -6,4 +7,8 @@ local layer = {
FilePath = mapServiceConfigs .. "/Utah/LolaShade.wms"
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_sweden.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "UvvisHybrid_Sweden",
@@ -10,4 +11,8 @@ local layer = {
}
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/colorlayers/uvvishybrid_utah.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "UvvisHybrid_Utah",
@@ -10,4 +11,8 @@ local layer = {
}
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "WAC_Sweden",
@@ -7,4 +8,8 @@ local layer = {
Settings = { Gamma = 0.84 }
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "WAC_Utah",
@@ -7,4 +8,8 @@ local layer = {
Settings = { Gamma = 0.84 }
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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

@@ -1,31 +0,0 @@
local colorLayersPath = "./colorlayers"
local colorLayers = {
asset.require(colorLayersPath .. "/wac_utah").layer,
asset.require(colorLayersPath .. "/wac_sweden").layer,
asset.require(colorLayersPath .. "/clemuvvis_utah").layer,
asset.require(colorLayersPath .. "/clemuvvis_sweden").layer,
asset.require(colorLayersPath .. "/uvvishybrid_utah").layer,
asset.require(colorLayersPath .. "/uvvishybrid_sweden").layer,
asset.require(colorLayersPath .. "/kaguya_utah").layer,
asset.require(colorLayersPath .. "/kaguya_sweden").layer,
asset.require(colorLayersPath .. "/lola_clr_shade_utah").layer,
asset.require(colorLayersPath .. "/lola_clr_shade_sweden").layer,
asset.require(colorLayersPath .. "/lola_shade_utah").layer,
asset.require(colorLayersPath .. "/lola_shade_sweden").layer
}
local heightLayersPath = "./heightlayers"
local heightLayers = {
asset.require(heightLayersPath .. "/loladem_utah").layer,
asset.require(heightLayersPath .. "/loladem_sweden").layer
}
local nightLayers = {}
local overlays = {}
local waterMasks = {}
asset.export("colorLayers", colorLayers)
asset.export("heightLayers", heightLayers)
asset.export("nightLayers", nightLayers)
asset.export("overlays", overlays)
asset.export("waterMasks", waterMasks)

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

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "LolaDem_Sweden",
@@ -8,4 +9,8 @@ local layer = {
Settings = { Multiplier = 0.5 }
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
end)
asset.export("layer", layer)

5
data/assets/scene/solarsystem/planets/earth/moon/layers/heightlayers/loladem_utah.asset
View File

@@ -1,4 +1,5 @@
local mapServiceConfigs = asset.localResource("./../../map_service_configs")
local globeIdentifier = asset.require("./../../moon").Moon.Identifier
local layer = {
Identifier = "LolaDem_Utah",
@@ -8,4 +9,8 @@ local layer = {
Settings = { Multiplier = 0.5 }
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
end)
asset.export("layer", layer)

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

@@ -3,7 +3,7 @@ local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
local sunAsset = asset.require('scene/solarsystem/sun/sun')
local earthAsset = asset.require('../earth')
asset.require('spice/base')
asset.request('./trail')
asset.require('./trail')
local labelsPath = asset.require('./moon_labels').LabelsPath
local Moon = {

181
data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset
View File

@@ -57,6 +57,167 @@ local initializeAndAddNodes = function()
YAxis = transforms.EarthInertial.Identifier
}
},
Renderable = {
Type = "RenderableModel",
Geometry = {
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/0.obj",
ColorTexture = models .. "/0.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/1.obj",
ColorTexture = models .. "/1.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/2.obj",
ColorTexture = models .. "/2.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/3.obj",
ColorTexture = models .. "/3.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/4.obj",
ColorTexture = models .. "/4.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/5.obj",
ColorTexture = models .. "/5.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/6.obj",
ColorTexture = models .. "/6.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/7.obj",
ColorTexture = models .. "/7.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/8.obj",
ColorTexture = models .. "/8.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/10.obj",
ColorTexture = models .. "/10.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/11.obj",
ColorTexture = models .. "/11.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/13.obj",
ColorTexture = models .. "/13.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/14.obj",
ColorTexture = models .. "/14.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/15.obj",
ColorTexture = models .. "/15.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/16.obj",
ColorTexture = models .. "/16.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/17.obj",
ColorTexture = models .. "/17.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/19.obj",
ColorTexture = models .. "/19.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/21.obj",
ColorTexture = models .. "/21.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/22.obj",
ColorTexture = models .. "/22.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/23.obj",
ColorTexture = models .. "/23.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/24.obj",
ColorTexture = models .. "/24.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/25.obj",
ColorTexture = models .. "/25.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/foilsilver.obj",
ColorTexture = models .. "/foilsilver.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/olive.obj",
ColorTexture = models .. "/olive.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/basemetal.obj",
ColorTexture = models .. "/basemetal.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/white_20.obj",
ColorTexture = models .. "/white_20.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/plasticblack.obj",
ColorTexture = models .. "/plasticblack.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/ecostresswhite.obj",
ColorTexture = models .. "/ecostresswhite.png"
},
{
Type = "MultiModelGeometry",
GeometryFile = models .. "/plain.obj",
ColorTexture = models .. "/plain.png"
},
},
LightSources = {
{
Type = "SceneGraphLightSource",
Identifier = "Sun",
Node = sunTransforms.SolarSystemBarycenter.Identifier,
Intensity = 1.0
}
},
PerformShading = true,
DisableFaceCulling = true
},
GUI = {
Name = "ISSparentNode",
Path = "/Solar System/Planets/Earth/Satellites/ISS",
@@ -64,24 +225,6 @@ local initializeAndAddNodes = function()
}
}
local list = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "10", "11",
"13", "14", "15", "16", "17", "19", "21", "22", "23", "24", "25",
"foilsilver", "olive", "basemetal", "white_20", "plasticblack", "ecostresswhite",
"plain"}
local nodes = { iss, parentNode }
for i, info in ipairs(list) do
n = assetHelper.createModelPart(
parentNode.Identifier,
sunTransforms.SolarSystemBarycenter.Identifier,
models,
info,
info .. ".png",
true
)
table.insert(nodes, n)
end
local issTrail = {
Identifier = identifier .. "_trail",
Parent = transforms.EarthInertial.Identifier,
@@ -108,7 +251,7 @@ local initializeAndAddNodes = function()
}
table.insert(nodes, issTrail)
return nodes
return { iss, parentNode, issTrail }
end
asset.onInitialize(function ()

14
data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset
View File

@@ -1,8 +1,8 @@
asset.request('./satellites_communications')
asset.require('./satellites_communications')
-- The debris contains a **lot** of nodes, so we disable it on default
-- asset.request('./satellites_debris')
asset.request('./satellites_interesting')
asset.request('./satellites_misc')
asset.request('./satellites_navigation')
asset.request('./satellites_science')
asset.request('./satellites_weather')
-- asset.require('./satellites_debris')
asset.require('./satellites_interesting')
asset.require('./satellites_misc')
asset.require('./satellites_navigation')
asset.require('./satellites_science')
asset.require('./satellites_weather')

26
data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset
View File

@@ -1,13 +1,13 @@
asset.request('./communications/geostationary')
asset.request('./communications/intelsat')
asset.request('./communications/ses')
asset.request('./communications/iridium')
asset.request('./communications/iridium_next')
asset.request('./communications/orbcomm')
asset.request('./communications/globalstar')
asset.request('./communications/amateur')
asset.request('./communications/experimental')
asset.request('./communications/other_comm')
asset.request('./communications/gorizont')
asset.request('./communications/raduga')
asset.request('./communications/molniya')
asset.require('./communications/geostationary')
asset.require('./communications/intelsat')
asset.require('./communications/ses')
asset.require('./communications/iridium')
asset.require('./communications/iridium_next')
asset.require('./communications/orbcomm')
asset.require('./communications/globalstar')
asset.require('./communications/amateur')
asset.require('./communications/experimental')
asset.require('./communications/other_comm')
asset.require('./communications/gorizont')
asset.require('./communications/raduga')
asset.require('./communications/molniya')

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

@@ -1,5 +1,5 @@
asset.request('./debris/debris_asat')
asset.request('./debris/debris_breezem')
asset.request('./debris/debris_fengyun')
asset.request('./debris/debris_iridium33')
asset.request('./debris/debris_kosmos2251')
asset.require('./debris/debris_asat')
asset.require('./debris/debris_breezem')
asset.require('./debris/debris_fengyun')
asset.require('./debris/debris_iridium33')
asset.require('./debris/debris_kosmos2251')

8
data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset
View File

@@ -1,4 +1,4 @@
asset.request('./misc/military')
asset.request('./misc/radar')
asset.request('./misc/cubesats')
asset.request('./misc/other')
asset.require('./misc/military')
asset.require('./misc/radar')
asset.require('./misc/cubesats')
asset.require('./misc/other')

14
data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset
View File

@@ -1,7 +1,7 @@
asset.request('./navigation/beidou')
asset.request('./navigation/galileo')
asset.request('./navigation/glosnass')
asset.request('./navigation/gps')
asset.request('./navigation/musson')
asset.request('./navigation/nnss')
asset.request('./navigation/sbas')
asset.require('./navigation/beidou')
asset.require('./navigation/galileo')
asset.require('./navigation/glosnass')
asset.require('./navigation/gps')
asset.require('./navigation/musson')
asset.require('./navigation/nnss')
asset.require('./navigation/sbas')

8
data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset
View File

@@ -1,4 +1,4 @@
asset.request('./science/spaceearth')
asset.request('./science/geodetic')
asset.request('./science/engineering')
asset.request('./science/education')
asset.require('./science/spaceearth')
asset.require('./science/geodetic')
asset.require('./science/engineering')
asset.require('./science/education')

20
data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset
View File

@@ -1,10 +1,10 @@
asset.request('./weather/argos')
asset.request('./weather/dmc')
asset.request('./weather/earth_resources')
asset.request('./weather/goes')
asset.request('./weather/noaa')
asset.request('./weather/planet')
asset.request('./weather/sarsat')
asset.request('./weather/spire')
asset.request('./weather/tdrss')
asset.request('./weather/weather')
asset.require('./weather/argos')
asset.require('./weather/dmc')
asset.require('./weather/earth_resources')
asset.require('./weather/goes')
asset.require('./weather/noaa')
asset.require('./weather/planet')
asset.require('./weather/sarsat')
asset.require('./weather/spire')
asset.require('./weather/tdrss')
asset.require('./weather/weather')

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

@@ -1,7 +1,7 @@
local transforms = asset.require('../transforms')
local assetHelper = asset.require('util/asset_helper')
asset.require("spice/base")
asset.request('./trail')
asset.require('./trail')
local kernel = asset.require('../kernels').jup310
local labelsPath = asset.require('../jupiter_globelabels').LabelsPath

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

@@ -1,13 +1,9 @@
local layerHelper = asset.require('util/layer_helper')
local globeAsset = asset.require('./callisto')
local globeIdentifier = globeAsset.Callisto.Identifier
local colorLayersPath = "./layers/colorlayers"
-- set enabled and fallback layers
local defaultLayers = asset.require('./layers/default_layers')
local colorLayer = asset.require(colorLayersPath .. "/callisto_texture")
local colorLayer = asset.require('./layers/colorlayers/callisto_texture').layer
colorLayer.Enabled = true
asset.onInitialize(function ()
layerHelper.addLayersToGlobe(globeIdentifier, defaultLayers)
-- Set enabled layers (temporary solution)
-- @TODO: do this using a boolean that's passed to the 'asset.require' instead
asset.onInitialize(function ()
openspace.setPropertyValueSingle("Scene.Callisto.Renderable.Layers.ColorLayers." .. colorLayer.layer.Identifier .. ".Enabled", true)
end)

5
data/assets/scene/solarsystem/planets/jupiter/callisto/layers/colorlayers/callisto_texture.asset
View File

@@ -1,8 +1,13 @@
local texturesPath = asset.require("./../../callisto_textures").TexturesPath
local globeIdentifier = asset.require("./../../callisto").Callisto.Identifier
local layer = {
Identifier = "Texture",
FilePath = texturesPath .. "/callisto.jpg",
}
asset.onInitialize(function ()
openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
end)
asset.export("layer", layer)

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