From fbd903b4ff8396e69cbbcf90a0e3c1b596844301 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Mon, 22 Jun 2020 09:33:00 +0200 Subject: [PATCH] Move profiles to their own folder --- data/{assets => profiles}/apollo8.profile | 3 -- .../{assets => profiles}/apollo_sites.profile | 4 --- data/profiles/asteroids.profile | 34 +++++++++++++++++++ data/{assets => profiles}/dawn.profile | 4 --- data/{assets => profiles}/default.profile | 4 --- .../{assets => profiles}/default_full.profile | 8 ++--- data/{assets => profiles}/gaia.profile | 4 --- data/{assets => profiles}/insight.profile | 4 --- data/{assets => profiles}/juno.profile | 4 --- data/{assets => profiles}/messenger.profile | 4 --- data/{assets => profiles}/newhorizons.profile | 2 -- data/{assets => profiles}/osirisrex.profile | 3 -- data/{assets => profiles}/rosetta.profile | 2 -- data/{assets => profiles}/touch.profile | 4 --- data/{assets => profiles}/voyager.profile | 4 --- openspace.cfg | 1 + src/engine/openspaceengine.cpp | 2 +- src/scene/profile_lua.inl | 2 +- 18 files changed, 41 insertions(+), 52 deletions(-) rename data/{assets => profiles}/apollo8.profile (96%) rename data/{assets => profiles}/apollo_sites.profile (95%) create mode 100644 data/profiles/asteroids.profile rename data/{assets => profiles}/dawn.profile (67%) rename data/{assets => profiles}/default.profile (65%) rename data/{assets => profiles}/default_full.profile (76%) rename data/{assets => profiles}/gaia.profile (76%) rename data/{assets => profiles}/insight.profile (94%) rename data/{assets => profiles}/juno.profile (95%) rename data/{assets => profiles}/messenger.profile (95%) rename data/{assets => profiles}/newhorizons.profile (99%) rename data/{assets => profiles}/osirisrex.profile (97%) rename data/{assets => profiles}/rosetta.profile (97%) rename data/{assets => profiles}/touch.profile (77%) rename data/{assets => profiles}/voyager.profile (96%) diff --git a/data/assets/apollo8.profile b/data/profiles/apollo8.profile similarity index 96% rename from data/assets/apollo8.profile rename to data/profiles/apollo8.profile index 2c50610c09..2cc4658298 100644 --- a/data/assets/apollo8.profile +++ b/data/profiles/apollo8.profile @@ -2,10 +2,7 @@ 1.0 #Asset -util/asset_helper require assetHelper util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/planets/earth/moon/moon require scene/solarsystem/missions/apollo/8/apollo8 require diff --git a/data/assets/apollo_sites.profile b/data/profiles/apollo_sites.profile similarity index 95% rename from data/assets/apollo_sites.profile rename to data/profiles/apollo_sites.profile index 5b1bcc786d..1f76bc864b 100644 --- a/data/assets/apollo_sites.profile +++ b/data/profiles/apollo_sites.profile @@ -2,10 +2,6 @@ 1.0 #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/planets/earth/moon/moon require scene/solarsystem/missions/apollo/8/apollo8 require diff --git a/data/profiles/asteroids.profile b/data/profiles/asteroids.profile new file mode 100644 index 0000000000..f7e1b1a0d1 --- /dev/null +++ b/data/profiles/asteroids.profile @@ -0,0 +1,34 @@ +#Version +1.0 + +#Asset +base require +scene/solarsystem/planets/earth/earth require +scene/solarsystem/sssb/amor_asteroid require +scene/solarsystem/sssb/apollo_asteroid require +scene/solarsystem/sssb/aten_asteroid require +scene/solarsystem/sssb/atira_asteroid require +scene/solarsystem/sssb/centaur_asteroid require +scene/solarsystem/sssb/chiron-type_comet require +scene/solarsystem/sssb/encke-type_comet require +scene/solarsystem/sssb/halley-type_comet require +scene/solarsystem/sssb/inner_main_belt_asteroid require +scene/solarsystem/sssb/jupiter_trojan_asteroid require +scene/solarsystem/sssb/jupiter-family_comet require +scene/solarsystem/sssb/main_belt_asteroid require +scene/solarsystem/sssb/mars-crossing_asteroid require +scene/solarsystem/sssb/outer_main_belt_asteroid require +scene/solarsystem/sssb/transneptunian_object_asteroid require +scene/solarsystem/sssb/pha require + +#Time +relative -1d + +#Camera +goToGeo Earth 58.5877 16.1924 2.7e12 + +#MarkNodes +Earth +Mars +Moon +Sun diff --git a/data/assets/dawn.profile b/data/profiles/dawn.profile similarity index 67% rename from data/assets/dawn.profile rename to data/profiles/dawn.profile index 603ad0d504..50a32b80d8 100644 --- a/data/assets/dawn.profile +++ b/data/profiles/dawn.profile @@ -2,10 +2,6 @@ 1.0 #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/missions/dawn/ceres require scene/solarsystem/missions/dawn/dawn require diff --git a/data/assets/default.profile b/data/profiles/default.profile similarity index 65% rename from data/assets/default.profile rename to data/profiles/default.profile index 33831bef7c..8c8d98a9f7 100644 --- a/data/assets/default.profile +++ b/data/profiles/default.profile @@ -2,10 +2,6 @@ 1.0 #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/planets/earth/earth require scene/solarsystem/planets/earth/satellites/satellites require diff --git a/data/assets/default_full.profile b/data/profiles/default_full.profile similarity index 76% rename from data/assets/default_full.profile rename to data/profiles/default_full.profile index 76721f3a73..927f28e460 100644 --- a/data/assets/default_full.profile +++ b/data/profiles/default_full.profile @@ -2,12 +2,9 @@ 1.0 #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/planets/earth/earth require +scene/solarsystem/planets/earth/satellites/satellites require scene/solarsystem/planets/jupiter/minor_moons require scene/solarsystem/planets/saturn/minor_moons require scene/solarsystem/planets/uranus/minor_moons require @@ -15,6 +12,9 @@ scene/solarsystem/planets/neptune/inner_moons require scene/solarsystem/planets/neptune/irregular_prograde_moons require scene/solarsystem/planets/neptune/irregular_retrograde_moons require +#Property +setPropertyValue {earth_satellites}.Renderable.Enabled false + #Time relative -1d diff --git a/data/assets/gaia.profile b/data/profiles/gaia.profile similarity index 76% rename from data/assets/gaia.profile rename to data/profiles/gaia.profile index 54e49d9593..d4f7d4a34a 100644 --- a/data/assets/gaia.profile +++ b/data/profiles/gaia.profile @@ -5,10 +5,6 @@ Gaia openspace.printFatal('Could not load scene due to missing module "gaia"') #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/planets/earth/earth require scene/milkyway/gaia/gaiastars require diff --git a/data/assets/insight.profile b/data/profiles/insight.profile similarity index 94% rename from data/assets/insight.profile rename to data/profiles/insight.profile index 7b30dba282..c0cd3f5542 100644 --- a/data/assets/insight.profile +++ b/data/profiles/insight.profile @@ -2,10 +2,6 @@ 1.0 #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/missions/insight/edl require diff --git a/data/assets/juno.profile b/data/profiles/juno.profile similarity index 95% rename from data/assets/juno.profile rename to data/profiles/juno.profile index 3b38739df0..b5f448526b 100644 --- a/data/assets/juno.profile +++ b/data/profiles/juno.profile @@ -2,10 +2,6 @@ 1.0 #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/missions/juno/juno require diff --git a/data/assets/messenger.profile b/data/profiles/messenger.profile similarity index 95% rename from data/assets/messenger.profile rename to data/profiles/messenger.profile index 3d268995e7..044eee35f8 100644 --- a/data/assets/messenger.profile +++ b/data/profiles/messenger.profile @@ -5,10 +5,6 @@ Volume asset.require('scene/solarsystem/missions/messenger/mercurymagnetosphere') openspace.printWarning("Volume module is not loaded, skipping asset: mercurymagnetosphere") #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/missions/messenger/messengerSC require diff --git a/data/assets/newhorizons.profile b/data/profiles/newhorizons.profile similarity index 99% rename from data/assets/newhorizons.profile rename to data/profiles/newhorizons.profile index 1b96e05c7b..6222c7f042 100644 --- a/data/assets/newhorizons.profile +++ b/data/profiles/newhorizons.profile @@ -2,9 +2,7 @@ 1.0 #Asset -util/asset_helper require assetHelper util/property_helper require propertyHelper -util/scene_helper require sceneHelper util/renderable_helper require renderableHelper base require scene/solarsystem/missions/newhorizons/newhorizons require diff --git a/data/assets/osirisrex.profile b/data/profiles/osirisrex.profile similarity index 97% rename from data/assets/osirisrex.profile rename to data/profiles/osirisrex.profile index 8077989134..f212a45801 100644 --- a/data/assets/osirisrex.profile +++ b/data/profiles/osirisrex.profile @@ -2,10 +2,7 @@ 1.0 #Asset -util/asset_helper require assetHelper util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/missions/osirisrex/model require scene/solarsystem/missions/osirisrex/osirisrex require diff --git a/data/assets/rosetta.profile b/data/profiles/rosetta.profile similarity index 97% rename from data/assets/rosetta.profile rename to data/profiles/rosetta.profile index 206e3b0a1e..d12e834dd1 100644 --- a/data/assets/rosetta.profile +++ b/data/profiles/rosetta.profile @@ -5,9 +5,7 @@ Volume asset.require('scene/solarsystem/missions/messenger/mercurymagnetosphere') openspace.printWarning("Volume module is not loaded, skipping asset: mercurymagnetosphere") #Asset -util/asset_helper require assetHelper util/property_helper require propertyHelper -util/scene_helper require sceneHelper util/renderable_helper require renderableHelper base require scene/solarsystem/missions/rosetta/67p require diff --git a/data/assets/touch.profile b/data/profiles/touch.profile similarity index 77% rename from data/assets/touch.profile rename to data/profiles/touch.profile index f296c95fc3..4333b9f155 100644 --- a/data/assets/touch.profile +++ b/data/profiles/touch.profile @@ -5,10 +5,6 @@ Touch local webGui = asset.require('util/webgui'); webGui.setCefRoute("ontouch") openspace.printFatal('Could not load scene due to missing module "touch"') #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/planets/earth/earth require util/webgui require diff --git a/data/assets/voyager.profile b/data/profiles/voyager.profile similarity index 96% rename from data/assets/voyager.profile rename to data/profiles/voyager.profile index c2f50a2acb..0a2a0ec9c4 100644 --- a/data/assets/voyager.profile +++ b/data/profiles/voyager.profile @@ -2,10 +2,6 @@ 1.0 #Asset -util/asset_helper require assetHelper -util/property_helper require propertyHelper -util/scene_helper require sceneHelper -util/renderable_helper require renderableHelper base require scene/solarsystem/planets/jupiter/minor_moons require scene/solarsystem/planets/saturn/minor_moons require diff --git a/openspace.cfg b/openspace.cfg index 3e7c453418..d8f3b1d237 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -92,6 +92,7 @@ GlobalCustomizationScripts = { Paths = { DATA = "${BASE}/data", ASSETS = "${DATA}/assets", + PROFILES = "${DATA}/profiles", FONTS = "${DATA}/fonts", TASKS = "${DATA}/tasks", SYNC = "${BASE}/sync", diff --git a/src/engine/openspaceengine.cpp b/src/engine/openspaceengine.cpp index 71891051bf..6df77dbd64 100644 --- a/src/engine/openspaceengine.cpp +++ b/src/engine/openspaceengine.cpp @@ -299,7 +299,7 @@ void OpenSpaceEngine::initialize() { // Convert profile to scene file (if was provided in configuration file) if (!global::configuration.profile.empty()) { - std::string inputProfilePath = absPath("${ASSETS}"); + std::string inputProfilePath = absPath("${PROFILES}"); std::string outputScenePath = absPath("${TEMPORARY}"); std::string inputProfile = inputProfilePath + "/" + global::configuration.profile + ".profile"; diff --git a/src/scene/profile_lua.inl b/src/scene/profile_lua.inl index 050f1ad260..1c2c904ee7 100644 --- a/src/scene/profile_lua.inl +++ b/src/scene/profile_lua.inl @@ -95,7 +95,7 @@ int saveSettingsToProfile(lua_State* L) { else if (saveFilePath.find('.') != std::string::npos) { return luaL_error(L, "Only provide the filename to save without file extension"); } - const std::string absFilename = absPath("${ASSETS}/" + saveFilePath + ".profile"); + const std::string absFilename = absPath("${PROFILES}/" + saveFilePath + ".profile"); const bool overwrite = (n == 2) ? ghoul::lua::value(L, 2) : false;