diff --git a/.gitmodules b/.gitmodules index 516a853c2b..0bfcb7f59d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 78f9078edb..ac3c0cf925 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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 () diff --git a/apps/OpenSpace/ext/sgct b/apps/OpenSpace/ext/sgct index b712e64848..3d3835c38c 160000 --- a/apps/OpenSpace/ext/sgct +++ b/apps/OpenSpace/ext/sgct @@ -1 +1 @@ -Subproject commit b712e6484894d70a60277bdcf719613b217954a7 +Subproject commit 3d3835c38c8b87972f406ed44af1b5b2d48b1600 diff --git a/apps/OpenSpace/main.cpp b/apps/OpenSpace/main.cpp index 80e5ff01cb..83f1bf5796 100644 --- a/apps/OpenSpace/main.cpp +++ b/apps/OpenSpace/main.cpp @@ -678,22 +678,21 @@ void mainDecodeFun(const std::vector& 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; } @@ -1074,6 +1073,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__ diff --git a/data/assets/base.asset b/data/assets/base.asset index 6646492c9b..86bdf3cbd6 100644 --- a/data/assets/base.asset +++ b/data/assets/base.asset @@ -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 = { diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset index 1ecfbefdc2..4f400883bd 100644 --- a/data/assets/examples/globetranslation.asset +++ b/data/assets/examples/globetranslation.asset @@ -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" diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset index 1ee6157510..b9a30df0b5 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/charon/charon.asset @@ -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 diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset index c90da31679..ceb9a72424 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/pluto.asset @@ -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 diff --git a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset index e649a45a58..c6497de839 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/pluto/system.asset @@ -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') diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset index c65cd3c47a..8fa2acf516 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset index 0ca61edef6..5186ed9057 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset index 770592ba8e..584a064313 100644 --- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset +++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset @@ -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 -- }, diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset index f709f0bc2b..e14c5e7566 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset @@ -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 diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset index d013b8fea4..828c2b039b 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset @@ -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 diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset index d2e9c5146c..6385768d1d 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset @@ -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 diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset index 50f81a1693..9c901a59a2 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset index e7fc3a3747..5fefe46052 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/missions/dawn/vesta.asset b/data/assets/scene/solarsystem/missions/dawn/vesta.asset index 75c1ed63f1..2d555b6834 100644 --- a/data/assets/scene/solarsystem/missions/dawn/vesta.asset +++ b/data/assets/scene/solarsystem/missions/dawn/vesta.asset @@ -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", diff --git a/data/assets/scene/solarsystem/missions/gaia/gaia.asset b/data/assets/scene/solarsystem/missions/gaia/gaia.asset index b5c6d6a18d..55de00a894 100644 --- a/data/assets/scene/solarsystem/missions/gaia/gaia.asset +++ b/data/assets/scene/solarsystem/missions/gaia/gaia.asset @@ -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", diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset index 5ede98786a..62552b57f7 100644 --- a/data/assets/scene/solarsystem/missions/insight/edl.asset +++ b/data/assets/scene/solarsystem/missions/insight/edl.asset @@ -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, }, diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset index 78d0296a6f..7f3d8412c3 100644 --- a/data/assets/scene/solarsystem/missions/juno/juno.asset +++ b/data/assets/scene/solarsystem/missions/juno/juno.asset @@ -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) }, diff --git a/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset b/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset index 70861f014e..f78d1f3655 100644 --- a/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset +++ b/data/assets/scene/solarsystem/missions/messenger/messengerSC.asset @@ -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 }, diff --git a/data/assets/scene/solarsystem/missions/newhorizons/label.asset b/data/assets/scene/solarsystem/missions/newhorizons/label.asset index 8353a01be9..69267f9f5f 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/label.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/label.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset index 57b6d401d8..b5b95ba870 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset @@ -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, diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset index a935cc6fcf..c6c5856413 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset @@ -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", diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset index 30a81b344c..b383470092 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset index ed12d60ba9..9877ef9694 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/osirisrex.asset @@ -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') diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset index 24c0c37d9d..95554d5a6e 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/model.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset @@ -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 }, diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset index 40ec1f9334..04d9cab085 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer10.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset index 2b97f8e720..def3eeacc5 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneer11.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/missions/rosetta/67p.asset b/data/assets/scene/solarsystem/missions/rosetta/67p.asset index c5882719df..fd9d09ff50 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/67p.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/67p.asset @@ -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", diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index cac99bdd49..8b29ea4180 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -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 }, diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset index c5a8ae6b0c..f93ffdefe6 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset @@ -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 }, diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index f1a87c9e13..993b86dc90 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -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 }, diff --git a/data/assets/scene/solarsystem/planets/earth/earth.asset b/data/assets/scene/solarsystem/planets/earth/earth.asset index c281713453..be78f5c522 100644 --- a/data/assets/scene/solarsystem/planets/earth/earth.asset +++ b/data/assets/scene/solarsystem/planets/earth/earth.asset @@ -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 } diff --git a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset index 16e67dd16b..3859cf2b28 100644 --- a/data/assets/scene/solarsystem/planets/earth/moon/moon.asset +++ b/data/assets/scene/solarsystem/planets/earth/moon/moon.asset @@ -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 = { diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index 841a2536d9..bfde270d5a 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -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 () diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset index cb663ed946..312d2f2cfb 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_all.asset @@ -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') diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset index 78080e6557..872322c03c 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_communications.asset @@ -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') diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset index 36806c5eb0..03feae1272 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_debris.asset @@ -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') diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset index 117ad486e8..bd4c0d88b9 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_misc.asset @@ -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') diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset index 2707ea06b4..6765ad4118 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_navigation.asset @@ -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') diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset index 8e8d0a3e0f..cb1ecee8e3 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_science.asset @@ -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') diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset index c464cb4a6f..fe272e6816 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/satellites_weather.asset @@ -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') diff --git a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset index 5b7208bf01..cf1828b9de 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/callisto/callisto.asset @@ -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 diff --git a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset index 626cb52977..8e296655a5 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/europa/europa.asset @@ -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 diff --git a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset index dc4f65f7cf..530745e4b7 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/ganymede/ganymede.asset @@ -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 diff --git a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset index 0c4af55b78..55ecb7a35b 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/io/io.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/io/io.asset @@ -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 diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index 9142e7dce2..a581d7f1c0 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -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 Jupiter = { Identifier = "Jupiter", diff --git a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset index 90a1812f3f..0609399eef 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/minor_moons.asset @@ -1,8 +1,8 @@ -asset.request('./minor/ananke_group') -asset.request('./minor/carme_group') -asset.request('./minor/carpo_group') -asset.request('./minor/himalia_group') -asset.request('./minor/inner_group') -asset.request('./minor/other_groups') -asset.request('./minor/pasiphae_group') -asset.request('./minor/themisto_group') +asset.require('./minor/ananke_group') +asset.require('./minor/carme_group') +asset.require('./minor/carpo_group') +asset.require('./minor/himalia_group') +asset.require('./minor/inner_group') +asset.require('./minor/other_groups') +asset.require('./minor/pasiphae_group') +asset.require('./minor/themisto_group') diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 8be70b30a7..666f90e7bd 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -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 labelsPath = asset.require('./mars_globelabels').LabelsPath -- local marsRadii = { 3396190.0, 3396190.0, 3376200.0 } diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index 0aafae5c38..771c819783 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -3,7 +3,7 @@ local transforms = asset.require('./transforms') local labelsPath = asset.require('./mercury_globelabels').LabelsPath asset.require("spice/base") -asset.request('./trail') +asset.require('./trail') local Mercury = { Identifier = "Mercury", diff --git a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset index 118e2f71b9..a6b9ebde18 100644 --- a/data/assets/scene/solarsystem/planets/neptune/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/neptune/major_moons.asset @@ -1 +1 @@ -asset.request('./triton') +asset.require('./triton') diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index adff2b77fd..ee3f021892 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -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 Neptune = { Identifier = "Neptune", diff --git a/data/assets/scene/solarsystem/planets/planets.asset b/data/assets/scene/solarsystem/planets/planets.asset index abac03b55a..fd537c3f98 100644 --- a/data/assets/scene/solarsystem/planets/planets.asset +++ b/data/assets/scene/solarsystem/planets/planets.asset @@ -1,27 +1,27 @@ -asset.request('./mercury/mercury') +asset.require('./mercury/mercury') -asset.request('./venus/venus') -asset.request('./venus/atmosphere') +asset.require('./venus/venus') +asset.require('./venus/atmosphere') -asset.request('./earth/earth') -asset.request('./earth/atmosphere') -asset.request('./earth/markers') -asset.request('./earth/moon/moon') +asset.require('./earth/earth') +asset.require('./earth/atmosphere') +asset.require('./earth/markers') +asset.require('./earth/moon/moon') -asset.request('./mars/mars') -asset.request('./mars/atmosphere') +asset.require('./mars/mars') +asset.require('./mars/atmosphere') -asset.request('./jupiter/jupiter') -asset.request('./jupiter/major_moons') +asset.require('./jupiter/jupiter') +asset.require('./jupiter/major_moons') -asset.request('./saturn/saturn') -asset.request('./saturn/major_moons') +asset.require('./saturn/saturn') +asset.require('./saturn/major_moons') -asset.request('./uranus/uranus') -asset.request('./uranus/major_moons') +asset.require('./uranus/uranus') +asset.require('./uranus/major_moons') -asset.request('./neptune/neptune') -asset.request('./neptune/major_moons') +asset.require('./neptune/neptune') +asset.require('./neptune/major_moons') asset.meta = { diff --git a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset index 91081403c7..38e136eba1 100644 --- a/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset +++ b/data/assets/scene/solarsystem/planets/saturn/dione/dione.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 -asset.request('./trail') +asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Dione = { diff --git a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset index 4dd9296794..d27fc30a25 100644 --- a/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/enceladus/enceladus.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 -asset.request('./trail') +asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Enceladus = { diff --git a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset index f469c320e8..8698e41e73 100644 --- a/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset +++ b/data/assets/scene/solarsystem/planets/saturn/hyperion/hyperion.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 -asset.request('./trail') +asset.require('./trail') diff --git a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset index d87978c575..20dc032e50 100644 --- a/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset +++ b/data/assets/scene/solarsystem/planets/saturn/iapetus/iapetus.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 -asset.request('./trail') +asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Iapetus = { diff --git a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset index 08162dfd0f..e14aa30f56 100644 --- a/data/assets/scene/solarsystem/planets/saturn/major_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/major_moons.asset @@ -1,8 +1,8 @@ -asset.request('./dione/dione') -asset.request('./enceladus/enceladus') -asset.request('./hyperion/hyperion') -asset.request('./iapetus/iapetus') -asset.request('./mimas/mimas') -asset.request('./rhea/rhea') -asset.request('./tethys/tethys') -asset.request('./titan/titan') +asset.require('./dione/dione') +asset.require('./enceladus/enceladus') +asset.require('./hyperion/hyperion') +asset.require('./iapetus/iapetus') +asset.require('./mimas/mimas') +asset.require('./rhea/rhea') +asset.require('./tethys/tethys') +asset.require('./titan/titan') diff --git a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset index 122df73011..b453f6b0fa 100644 --- a/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset +++ b/data/assets/scene/solarsystem/planets/saturn/mimas/mimas.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 -asset.request('./trail') +asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Mimas = { diff --git a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset index fbdc302cff..ba7da9ccbc 100644 --- a/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/saturn/minor_moons.asset @@ -1,4 +1,4 @@ -asset.request('./minor/gallic_group') -asset.request('./minor/inuit_group') -asset.request('./minor/norse_group') -asset.request('./minor/other_group') +asset.require('./minor/gallic_group') +asset.require('./minor/inuit_group') +asset.require('./minor/norse_group') +asset.require('./minor/other_group') diff --git a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset index a662f29c57..faed079a9d 100644 --- a/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset +++ b/data/assets/scene/solarsystem/planets/saturn/rhea/rhea.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 -asset.request('./trail') +asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Rhea = { diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index 5a3fd508e6..16dd8c7700 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -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 textures = asset.syncedResource({ Type = "HttpSynchronization", diff --git a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset index f9ceb09277..59dc831c2b 100644 --- a/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset +++ b/data/assets/scene/solarsystem/planets/saturn/tethys/tethys.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 -asset.request('./trail') +asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Tethys = { diff --git a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset index b323e25ec8..40d3bfae51 100644 --- a/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset +++ b/data/assets/scene/solarsystem/planets/saturn/titan/titan.asset @@ -1,7 +1,7 @@ local transforms = asset.require('../transforms') local assetHelper = asset.require('util/asset_helper') local kernel = asset.require('../kernels').sat375 -asset.request('./trail') +asset.require('./trail') local labelsPath = asset.require('../saturn_globelabels').LabelsPath local Titan = { diff --git a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset index d4039d2b0c..83a3d6391f 100644 --- a/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset +++ b/data/assets/scene/solarsystem/planets/uranus/minor_moons.asset @@ -1,3 +1,3 @@ -asset.request('./inner_moons') -asset.request('./irregular_prograde_moons') -asset.request('./irregular_retrograde_moons') +asset.require('./inner_moons') +asset.require('./irregular_prograde_moons') +asset.require('./irregular_retrograde_moons') diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index b25675fbf3..89421662c2 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -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 Uranus = { Identifier = "Uranus", diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index fa3cc3a186..d591a30cc1 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -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('./venus_globelabels').LabelsPath local Venus = { diff --git a/data/assets/scene/solarsystem/sun.asset b/data/assets/scene/solarsystem/sun.asset index a5a1502544..0d0b462d84 100644 --- a/data/assets/scene/solarsystem/sun.asset +++ b/data/assets/scene/solarsystem/sun.asset @@ -1,2 +1,2 @@ -asset.request('./sun/sun') -asset.request('./sun/glare') +asset.require('./sun/sun') +asset.require('./sun/glare') diff --git a/data/assets/sync/everything.asset b/data/assets/sync/everything.asset index 8979061ee2..976e7d3027 100644 --- a/data/assets/sync/everything.asset +++ b/data/assets/sync/everything.asset @@ -4,7 +4,7 @@ local assetHelper = asset.require('../util/asset_helper') -assetHelper.requestAll(asset, '../customization') -assetHelper.requestAll(asset, '../scene') -assetHelper.requestAll(asset, '../spice') -assetHelper.requestAll(asset, '../util') +assetHelper.requireAll(asset, '../customization') +assetHelper.requireAll(asset, '../scene') +assetHelper.requireAll(asset, '../spice') +assetHelper.requireAll(asset, '../util') diff --git a/data/assets/util/asset_helper.asset b/data/assets/util/asset_helper.asset index a785329785..24009580c4 100644 --- a/data/assets/util/asset_helper.asset +++ b/data/assets/util/asset_helper.asset @@ -132,21 +132,6 @@ local requireAll = function (sceneAsset, directory) return result end -local requestAll = function (sceneAsset, directory) - function string.ends(String,End) - return End=='' or string.sub(String,-string.len(End))==End - end - - local files = openspace.walkDirectoryFiles(sceneAsset.localResource('') .. directory, true) - for _, file in pairs(files) do - if file:ends('.asset') then - openspace.printDebug("Requesting: " .. file:sub(file:find(directory), -7)) - sceneAsset.request(file:sub(file:find(directory), -7)) - end - end -end - - local getDefaultLightSources = function (solarSystemBarycenterIdentifier) local sourceList = { { @@ -182,9 +167,9 @@ local createModelPart = function (parent, sunLightSourceNode, models, geometry, Type = "RenderableModel", Geometry = { Type = "MultiModelGeometry", - GeometryFile = models .. "/" .. geometry .. ".obj" + GeometryFile = models .. "/" .. geometry .. ".obj", + ColorTexture = models .. "/" .. texture }, - ColorTexture = models .. "/" .. texture, LightSources = lightSources, PerformShading = performShading, DisableFaceCulling = true @@ -203,6 +188,5 @@ asset.export("registerScreenSpaceRenderables", registerScreenSpaceRenderables) asset.export("registerSpiceKernels", registerSpiceKernels) asset.export("registerDashboardItems", registerDashboardItems) asset.export("requireAll", requireAll) -asset.export("requestAll", requestAll) asset.export("getDefaultLightSources", getDefaultLightSources) asset.export("createModelPart", createModelPart) diff --git a/data/assets/util/default_keybindings.asset b/data/assets/util/default_keybindings.asset index cd8559d306..b6e08b0100 100644 --- a/data/assets/util/default_keybindings.asset +++ b/data/assets/util/default_keybindings.asset @@ -109,7 +109,39 @@ openspace.setPropertyValueSingle("RenderEngine.ShowCamera", not isEnabled)]], Documentation = "Toggles the rendering on master", GuiPath = "/Rendering", Local = true - } + }, + { + Key = "Right", + Name = "Next Delta Time Step (Interpolate)", + Command = "openspace.time.interpolateNextDeltaTimeStep()", + Documentation = "Smoothly interpolates the simulation speed to the next delta time step, if one exists.", + GuiPath = "/Simulation Speed", + Local = true + }, + { + Key = "Shift+Right", + Name = "Next Delta Time Step (Immediate)", + Command = "openspace.time.setNextDeltaTimeStep()", + Documentation = "Immediately set the simulation speed to the next delta time step, if one exists.", + GuiPath = "/Simulation Speed", + Local = true + }, + { + Key = "Left", + Name = "Previous Delta Time Step (Interpolate)", + Command = "openspace.time.interpolatePreviousDeltaTimeStep()", + Documentation = "Smoothly interpolates the simulation speed to the previous delta time step, if one exists.", + GuiPath = "/Simulation Speed", + Local = true + }, + { + Key = "Shift+Left", + Name = "Previous Delta Time Step (Immediate)", + Command = "openspace.time.setPreviousDeltaTimeStep()", + Documentation = "Immediately set the simulation speed to the previous delta time step, if one exists.", + GuiPath = "/Simulation Speed", + Local = true + }, } local DeltaTimeKeys diff --git a/data/assets/util/vrt_flipbook_helper.asset b/data/assets/util/vrt_flipbook_helper.asset index 6693fca1d5..144a4d5ce7 100644 --- a/data/assets/util/vrt_flipbook_helper.asset +++ b/data/assets/util/vrt_flipbook_helper.asset @@ -10,39 +10,39 @@ end local nextFlipbookPage = function (flipbook) - if (flipbook.CurrentFlipIndex >= 0) then - local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; - openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false) - end + if (flipbook.CurrentFlipIndex >= 0) then + local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; + openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false) + end - if (flipbook.CurrentFlipIndex < flipbook.TotalCount - 1) then - flipbook.CurrentFlipIndex = flipbook.CurrentFlipIndex + 1; - local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; - openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true) - end + if (flipbook.CurrentFlipIndex < flipbook.TotalCount - 1) then + flipbook.CurrentFlipIndex = flipbook.CurrentFlipIndex + 1; + local assetSring = flipbook.AssetPrefix .. flipbook.CurrentFlipIndex; + openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true) + end end local previousFlipbookPage = function (flipbook) - if (localIndex == -1) then - return - end + if (localIndex == -1) then + return + end - local localIndex = flipbook.CurrentFlipIndex; + local localIndex = flipbook.CurrentFlipIndex; - local assetSring = flipbook.AssetPrefix .. localIndex; - openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false) - localIndex = localIndex - 1; + local assetSring = flipbook.AssetPrefix .. localIndex; + openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", false) + localIndex = localIndex - 1; - if (localIndex >= 0 ) then - assetSring = flipbook.AssetPrefix .. localIndex; - openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true) - end + if (localIndex >= 0 ) then + assetSring = flipbook.AssetPrefix .. localIndex; + openspace.setPropertyValueSingle("Scene." .. flipbook.AssetGlobe .. ".Renderable.Layers.ColorLayers.".. assetSring .. ".Enabled", true) + end - if (localIndex < -1) then - localIndex = -1 - end - flipbook.CurrentFlipIndex = localIndex; + if (localIndex < -1) then + localIndex = -1 + end + flipbook.CurrentFlipIndex = localIndex; end diff --git a/data/assets/util/webgui.asset b/data/assets/util/webgui.asset index 27209f9080..ecdb0faae0 100644 --- a/data/assets/util/webgui.asset +++ b/data/assets/util/webgui.asset @@ -3,7 +3,7 @@ asset.require('./static_server') local guiCustomization = asset.require('customization/gui') -- Select which commit hashes to use for the frontend and backend -local frontendHash = "6673d083bf2629502ce7f809610509f29ad444b7" +local frontendHash = "e520f14d3fffc915b7b900f4fc6d888070f458c4" local dataProvider = "data.openspaceproject.com/files/webgui" local frontend = asset.syncedResource({ diff --git a/ext/date b/ext/date new file mode 160000 index 0000000000..569b2d6785 --- /dev/null +++ b/ext/date @@ -0,0 +1 @@ +Subproject commit 569b2d678547985d0ead3b73ee93a28919000887 diff --git a/ext/ghoul b/ext/ghoul index 8af1b3a19c..d18c7bb1fb 160000 --- a/ext/ghoul +++ b/ext/ghoul @@ -1 +1 @@ -Subproject commit 8af1b3a19c5d001ae0e1039c460bd42c6f3b78a2 +Subproject commit d18c7bb1fb9ad05421f0b9ed7022ab0c214407ae diff --git a/include/openspace/engine/openspaceengine.h b/include/openspace/engine/openspaceengine.h index 967629e94b..6ccae1f19a 100644 --- a/include/openspace/engine/openspaceengine.h +++ b/include/openspace/engine/openspaceengine.h @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -127,6 +128,8 @@ private: //grabs json from each module to pass to the documentation engine. std::string _documentationJson; + std::future _writeDocumentationTask; + ShutdownInformation _shutdown; // The first frame might take some more time in the update loop, so we need to know to diff --git a/include/openspace/network/messagestructures.h b/include/openspace/network/messagestructures.h index 06fe7841ee..e344a95255 100644 --- a/include/openspace/network/messagestructures.h +++ b/include/openspace/network/messagestructures.h @@ -40,18 +40,18 @@ enum class Type : uint32_t { }; struct CameraKeyframe { - CameraKeyframe() {} - CameraKeyframe(const std::vector &buffer) { + CameraKeyframe() = default; + CameraKeyframe(const std::vector& buffer) { deserialize(buffer); } glm::dvec3 _position = glm::dvec3(0.0); glm::dquat _rotation = glm::dquat(1.0, 0.0, 0.0, 0.0); - bool _followNodeRotation; + bool _followNodeRotation = false; std::string _focusNode; - float _scale; + float _scale = 0.f; - double _timestamp; + double _timestamp = 0.0; void serialize(std::vector &buffer) const { // Add position @@ -104,28 +104,28 @@ struct CameraKeyframe { ); }; - size_t deserialize(const std::vector &buffer, size_t offset = 0) { + size_t deserialize(const std::vector& buffer, size_t offset = 0) { int size = 0; // Position size = sizeof(_position); - memcpy(&_position, buffer.data() + offset, size); + std::memcpy(&_position, buffer.data() + offset, size); offset += size; // Orientation size = sizeof(_rotation); - memcpy(&_rotation, buffer.data() + offset, size); + std::memcpy(&_rotation, buffer.data() + offset, size); offset += size; // Follow focus node rotation? size = sizeof(_followNodeRotation); - memcpy(&_followNodeRotation, buffer.data() + offset, size); + std::memcpy(&_followNodeRotation, buffer.data() + offset, size); offset += size; // Focus node int nodeNameLength; size = sizeof(int); - memcpy(&nodeNameLength, buffer.data() + offset, size); + std::memcpy(&nodeNameLength, buffer.data() + offset, size); offset += size; size = nodeNameLength; _focusNode = std::string(buffer.data() + offset, buffer.data() + offset + size); @@ -133,29 +133,20 @@ struct CameraKeyframe { // Scale size = sizeof(_scale); - memcpy(&_scale, buffer.data() + offset, size); + std::memcpy(&_scale, buffer.data() + offset, size); offset += size; // Timestamp size = sizeof(_timestamp); - memcpy(&_timestamp, buffer.data() + offset, size); + std::memcpy(&_timestamp, buffer.data() + offset, size); offset += size; return offset; }; void write(std::ostream& out) const { - // Write position - out.write( - reinterpret_cast(&_position), - sizeof(_position) - ); - - // Write orientation - out.write( - reinterpret_cast(&_rotation), - sizeof(_rotation) - ); + out.write(reinterpret_cast(&_position), sizeof(_position)); + out.write(reinterpret_cast(&_rotation), sizeof(_rotation)); // Write follow focus node rotation? out.write( @@ -166,88 +157,58 @@ struct CameraKeyframe { int nodeNameLength = static_cast(_focusNode.size()); // Write focus node - out.write( - reinterpret_cast(&nodeNameLength), - sizeof(nodeNameLength) - ); - out.write( - _focusNode.c_str(), - _focusNode.size() - ); + out.write(reinterpret_cast(&nodeNameLength), sizeof(nodeNameLength)); + out.write(_focusNode.c_str(), _focusNode.size()); - //Write scale - out.write( - reinterpret_cast(&_scale), - sizeof(_scale) - ); + // Write scale + out.write(reinterpret_cast(&_scale), sizeof(_scale)); // Write timestamp - out.write( - reinterpret_cast(&_timestamp), - sizeof(_timestamp) - ); + out.write(reinterpret_cast(&_timestamp), sizeof(_timestamp)); }; void read(std::istream* in) { // Read position - in->read( - reinterpret_cast(&_position), - sizeof(_position) - ); + in->read(reinterpret_cast(&_position), sizeof(_position)); // Read orientation - in->read( - reinterpret_cast(&_rotation), - sizeof(_rotation) - ); + in->read(reinterpret_cast(&_rotation), sizeof(_rotation)); // Read follow focus node rotation unsigned char b; - in->read( - reinterpret_cast(&b), - sizeof(unsigned char) - ); + in->read(reinterpret_cast(&b), sizeof(unsigned char)); _followNodeRotation = (b == 1); // Read focus node int nodeNameLength = static_cast(_focusNode.size()); - in->read( - reinterpret_cast(&nodeNameLength), - sizeof(nodeNameLength) - ); - std::vector temp(nodeNameLength + 1); + in->read(reinterpret_cast(&nodeNameLength), sizeof(nodeNameLength)); + std::vector temp(static_cast(nodeNameLength) + 1); in->read(temp.data(), nodeNameLength); temp[nodeNameLength] = '\0'; _focusNode = temp.data(); // Read scale - in->read( - reinterpret_cast(&_scale), - sizeof(_scale) - ); + in->read(reinterpret_cast(&_scale), sizeof(_scale)); // Read timestamp - in->read( - reinterpret_cast(&_timestamp), - sizeof(_timestamp) - ); + in->read(reinterpret_cast(&_timestamp), sizeof(_timestamp)); }; }; struct TimeKeyframe { - TimeKeyframe() {} - TimeKeyframe(const std::vector &buffer) { + TimeKeyframe() = default; + TimeKeyframe(const std::vector& buffer) { deserialize(buffer); } - double _time; - double _dt; - bool _paused; - bool _requiresTimeJump; - double _timestamp; + double _time = 0.0; + double _dt = 0.0; + bool _paused = false; + bool _requiresTimeJump = false; + double _timestamp = 0.0; - void serialize(std::vector &buffer) const { + void serialize(std::vector& buffer) const { buffer.insert( buffer.end(), reinterpret_cast(this), @@ -255,37 +216,31 @@ struct TimeKeyframe { ); }; - size_t deserialize(const std::vector &buffer, size_t offset = 0){ + size_t deserialize(const std::vector& buffer, size_t offset = 0) { *this = *reinterpret_cast(buffer.data() + offset); offset += sizeof(TimeKeyframe); return offset; }; void write(std::ostream* out) const { - out->write( - reinterpret_cast(this), - sizeof(TimeKeyframe) - ); + out->write(reinterpret_cast(this), sizeof(TimeKeyframe)); }; void read(std::istream* in) { - in->read( - reinterpret_cast(this), - sizeof(TimeKeyframe) - ); + in->read(reinterpret_cast(this), sizeof(TimeKeyframe)); }; }; struct TimeTimeline { - TimeTimeline() {} - TimeTimeline(const std::vector &buffer) { + TimeTimeline() = default; + TimeTimeline(const std::vector& buffer) { deserialize(buffer); } bool _clear = true; std::vector _keyframes; - void serialize(std::vector &buffer) const { + void serialize(std::vector& buffer) const { buffer.insert( buffer.end(), reinterpret_cast(&_clear), @@ -298,77 +253,65 @@ struct TimeTimeline { reinterpret_cast(&nKeyframes), reinterpret_cast(&nKeyframes) + sizeof(int64_t) ); - for (const auto& k : _keyframes) { + for (const TimeKeyframe& k : _keyframes) { k.serialize(buffer); } }; - size_t deserialize(const std::vector &buffer, size_t offset = 0) { + size_t deserialize(const std::vector& buffer, size_t offset = 0) { int size = 0; size = sizeof(_clear); - memcpy(&_clear, buffer.data() + offset, size); + std::memcpy(&_clear, buffer.data() + offset, size); offset += size; int64_t nKeyframes = _keyframes.size(); size = sizeof(nKeyframes); - memcpy(&nKeyframes, buffer.data() + offset, size); + std::memcpy(&nKeyframes, buffer.data() + offset, size); offset += size; _keyframes.resize(nKeyframes); - for (auto& k : _keyframes) { + for (TimeKeyframe& k : _keyframes) { offset = k.deserialize(buffer, offset); } return offset; }; void write(std::ostream* out) const { - out->write( - reinterpret_cast(&_clear), - sizeof(bool) - ); + out->write(reinterpret_cast(&_clear), sizeof(bool)); int64_t nKeyframes = _keyframes.size(); - out->write( - reinterpret_cast(&nKeyframes), - sizeof(int64_t) - ); - for (const auto& k : _keyframes) { + out->write(reinterpret_cast(&nKeyframes), sizeof(int64_t)); + for (const TimeKeyframe& k : _keyframes) { k.write(out); } }; void read(std::istream* in) { - in->read( - reinterpret_cast(&_clear), - sizeof(bool) - ); + in->read(reinterpret_cast(&_clear), sizeof(bool)); int64_t nKeyframes = _keyframes.size(); - in->read( - reinterpret_cast(&nKeyframes), - sizeof(int64_t) - ); - for (auto& k : _keyframes) { + in->read(reinterpret_cast(&nKeyframes), sizeof(int64_t)); + for (TimeKeyframe& k : _keyframes) { k.read(in); } }; }; struct ScriptMessage { - ScriptMessage() {} - ScriptMessage(const std::vector &buffer) { + ScriptMessage() = default; + ScriptMessage(const std::vector& buffer) { deserialize(buffer); } std::string _script; - double _timestamp; + double _timestamp = 0.0; - void serialize(std::vector &buffer) const { + void serialize(std::vector& buffer) const { buffer.insert(buffer.end(), _script.begin(), _script.end()); }; - void deserialize(const std::vector &buffer) { + void deserialize(const std::vector& buffer) { _script.assign(buffer.begin(), buffer.end()); }; diff --git a/include/openspace/properties/propertyowner.h b/include/openspace/properties/propertyowner.h index 5b4b9bd038..48a26bb079 100644 --- a/include/openspace/properties/propertyowner.h +++ b/include/openspace/properties/propertyowner.h @@ -291,7 +291,7 @@ public: */ void removeTag(const std::string& tag); - //Generate JSON for documentation + // Generate JSON for documentation std::string generateJson() const override; diff --git a/include/openspace/rendering/renderable.h b/include/openspace/rendering/renderable.h index 281c5ef85b..589daf3827 100644 --- a/include/openspace/rendering/renderable.h +++ b/include/openspace/rendering/renderable.h @@ -36,7 +36,7 @@ namespace ghoul { class Dictionary; } namespace ghoul::opengl { class ProgramObject; class Texture; -} +} // namespace ghoul::opengl namespace openspace { @@ -72,6 +72,7 @@ public: virtual bool isReady() const = 0; bool isEnabled() const; + bool shouldUpdateIfDisabled() const; void setBoundingSphere(float boundingSphere); float boundingSphere() const; @@ -99,6 +100,8 @@ protected: properties::FloatProperty _boundingSphere; properties::StringProperty _renderableType; + bool _shouldUpdateIfDisabled = false; + void setRenderBinFromOpacity(); void registerUpdateRenderBinFromOpacity(); diff --git a/include/openspace/rendering/renderengine.h b/include/openspace/rendering/renderengine.h index 420491f030..08209e3ac8 100644 --- a/include/openspace/rendering/renderengine.h +++ b/include/openspace/rendering/renderengine.h @@ -250,6 +250,8 @@ private: glm::ivec4 zoom = glm::ivec4(0); glm::ivec4 roll = glm::ivec4(0); } _cameraButtonLocations; + + std::string _versionString; }; } // namespace openspace diff --git a/include/openspace/scene/assetloader.h b/include/openspace/scene/assetloader.h index 4d99b176f8..644acf671d 100644 --- a/include/openspace/scene/assetloader.h +++ b/include/openspace/scene/assetloader.h @@ -45,7 +45,6 @@ int onDeinitialize(lua_State* state); int onInitializeDependency(lua_State* state); int onDeinitializeDependency(lua_State* state); int require(lua_State* state); -int request(lua_State* state); int exists(lua_State* state); int localResource(lua_State* state); int syncedResource(lua_State* state); @@ -164,7 +163,6 @@ public: void assetUnrequested(Asset* parent, std::shared_ptr child); private: - std::shared_ptr request(const std::string& identifier); void unrequest(const std::string& identifier); void setUpAssetLuaTable(Asset* asset); @@ -194,7 +192,6 @@ private: friend int assetloader::onInitializeDependency(lua_State* state); friend int assetloader::onDeinitializeDependency(lua_State* state); friend int assetloader::require(lua_State* state); - friend int assetloader::request(lua_State* state); friend int assetloader::exists(lua_State* state); friend int assetloader::localResource(lua_State* state); friend int assetloader::syncedResource(lua_State* state); diff --git a/include/openspace/scene/profile.h b/include/openspace/scene/profile.h index 71473693ee..c70df31be3 100644 --- a/include/openspace/scene/profile.h +++ b/include/openspace/scene/profile.h @@ -121,7 +121,7 @@ public: * and all of the property & asset changes that were made since startup. */ void saveCurrentSettingsToProfile(const properties::PropertyOwner& rootOwner, - const std::string& currentTime, + std::string currentTime, interaction::NavigationHandler::NavigationState navState); /// If the value passed to this function is 'true', the addAsset and removeAsset @@ -151,6 +151,7 @@ private: std::vector properties; std::vector keybindings; std::optional