Move profiles to their own folder

This commit is contained in:
Alexander Bock
2020-06-22 09:33:00 +02:00
parent 42e4e0a75b
commit fbd903b4ff
18 changed files with 41 additions and 52 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -92,6 +92,7 @@ GlobalCustomizationScripts = {
Paths = {
DATA = "${BASE}/data",
ASSETS = "${DATA}/assets",
PROFILES = "${DATA}/profiles",
FONTS = "${DATA}/fonts",
TASKS = "${DATA}/tasks",
SYNC = "${BASE}/sync",

View File

@@ -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";

View File

@@ -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<bool>(L, 2) : false;