mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

changed viewline paths to use user folders

Browse Source
This commit is contained in:
lundkvistarn
2024-11-14 15:50:08 -05:00
parent bb6262a730
commit ecfc5484eb
4 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
local earth = asset.require("scene/solarsystem/planets/earth/earth")
--TODO: Change this to user asset folder
local geojsonPath = asset.resource("C:/Users/alundkvi/Documents/work/OpenSpace/user/data/assets/aurorasaurus/geojson/northern_viewline_geojsons/")
local geojsonPath = "${USER_ASSETS}/aurorasaurus/geojson/northern_viewline_geojsons/"
local Viewline_1 = {

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

@@ -1,7 +1,7 @@
local earth = asset.require("scene/solarsystem/planets/earth/earth")
--TODO: Change this to user asset folder
local geojsonPath = asset.resource("C:/Users/alundkvi/Documents/work/OpenSpace/user/data/assets/aurorasaurus/geojson/southern_viewline_geojsons/")
local geojsonPath = "${USER_ASSETS}/aurorasaurus/geojson/southern_viewline_geojsons/"
local southern_viewline_1 = {
Identifier = "southern_viewline_2024-05-10 15-00-00_1",

4
data/profiles/aurorasaurus.profile
View File

@@ -55,10 +55,6 @@
"action": "sky-camera_setup_loop",
"key": "R"
},
{
"action": "os.solarsystem.Toggleskycamera",
"key": "E"
},
{
"action": "os.disableAllAuroras",
"key": "D"

4
modules/globebrowsing/src/geojson/geojsoncomponent.cpp
View File

@@ -201,7 +201,7 @@ namespace {
std::optional<bool> preventHeightUpdate;
// [[codegen::verbatim(FileInfo.description)]]
std::filesystem::path file;
std::string file;
// [[codegen::verbatim(HeightOffsetInfo.description)]]
std::optional<float> heightOffset;
@@ -334,7 +334,7 @@ GeoJsonComponent::GeoJsonComponent(const ghoul::Dictionary& dictionary,
addProperty(_opacity);
addProperty(_fade);
_geoJsonFile = p.file.string();
_geoJsonFile = absPath(p.file).string();
_geoJsonFile.setReadOnly(true);
addProperty(_geoJsonFile);