diff --git a/data/assets/scene/solarsystem/sun/heliosphere/bastille_day/fieldlinesCDF.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/fieldlinesCDF.asset similarity index 85% rename from data/assets/scene/solarsystem/sun/heliosphere/bastille_day/fieldlinesCDF.asset rename to data/assets/scene/solarsystem/planets/earth/magnetosphere/fieldlinesCDF.asset index 10ba2029d7..c540e8f98b 100644 --- a/data/assets/scene/solarsystem/sun/heliosphere/bastille_day/fieldlinesCDF.asset +++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/fieldlinesCDF.asset @@ -2,19 +2,15 @@ local assetHelper = asset.require('util/asset_helper') local sunTransforms = asset.require('scene/solarsystem/sun/transforms') local transforms = asset.require('scene/solarsystem/planets/earth/transforms') -local transferFunctions = asset.localResource("transferfunctions") +local transferFunctions = asset.localResource("../../../sun/heliosphere/bastille_day/transferfunctions") local masVelocityColorTable = transferFunctions .. "/velocity_fieldlines.txt" local masDensityColorTable = transferFunctions .. "/density_fieldlines.txt" local fieldlinesDirectory = 'D:/data/2000_01_01_event/cdf' ---local fieldlinesDirectory = 'C:/Users/eolsson/Documents/openspace/data/20000101/osfls' ---local seedPointDirectory = 'D:/data/2000_01_01_event/seedpoints' local seedPointDirectory = 'D:/data/2000_01_01_event/seedpoints' ---local sunRadius = 6.957E8 local earthRadius = 6378137 - -- Fieldlies from binaries local fieldlines = { Identifier = "Earth_BATSRUS_Fieldlines", @@ -43,7 +39,7 @@ local fieldlines = { ExtraVariables = { "rho", "p", - "T = p/rho" + "T" }, ManualTimeOffset = -14400.0, LoadAtRuntime = true, @@ -56,8 +52,8 @@ local fieldlines = { } }, GUI = { - Path = "/Solar System/Heliosphere", - Name = "Batsrus Fieldlines" + Path = "/Solar System/Planets/Earth/Magnetosphere", + Name = "Fieldlines 2000-01-01" }, Transform = { Scale = { diff --git a/data/assets/scene/solarsystem/planets/earth/magnetosphere.asset b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset similarity index 87% rename from data/assets/scene/solarsystem/planets/earth/magnetosphere.asset rename to data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset index e126682c04..7144dd8f44 100644 --- a/data/assets/scene/solarsystem/planets/earth/magnetosphere.asset +++ b/data/assets/scene/solarsystem/planets/earth/magnetosphere/magnetosphere.asset @@ -1,5 +1,5 @@ local assetHelper = asset.require('util/asset_helper') -local transforms = asset.require('../../planets/earth/transforms') +local transforms = asset.require('../transforms') --local fieldlinesDirectory = "C:/Users/elono/Documents/OpenSpace/data/earthMagnetoSphere" local fieldlinesDirectory = asset.syncedResource({ @@ -9,7 +9,6 @@ local fieldlinesDirectory = asset.syncedResource({ Version = 1 }) ---local sunRadius = 6.957E8 local earthRadius = 6378137 -- Fieldlies from binaries @@ -21,7 +20,7 @@ local earthMagnetosphere = { Type = "RenderableFieldlinesSequence", SourceFolder = fieldlinesDirectory, -- FlowEnabled = false, - LineWidth = 3.0, + LineWidth = 2.0, AlphaBlendlingEnabled = false, InputFileType = "osfls", -- openspace Field lines Sequence --ColorTablePaths = { @@ -32,8 +31,8 @@ local earthMagnetosphere = { -- { 0, 1000000 }, -- { 100, 2000 } --}, - --maskingEnabled = true, - --MaskingRanges = {0.0, 0.0}, -- this seem to map it to an int =0 which correspond to the topology=closed (fieldlines) + MaskingEnabled = true, + MaskingRanges = {{0.0, 0.0}}, -- this seem to map it to an int =0 which correspond to the topology=closed (fieldlines) LoadAtRuntime = true, ScaleToMeters = 1.0, SecondsBefore = 24*60*60*365*100, @@ -44,7 +43,7 @@ local earthMagnetosphere = { } }, GUI = { - Path = "/Solar System/Planets/Earth", + Path = "/Solar System/Planets/Earth/Magnetosphere", Name = "Magnetosphere" }, --Transform = { diff --git a/data/assets/scene/solarsystem/sun/heliosphere/bastille_day/fieldlines.asset b/data/assets/scene/solarsystem/sun/heliosphere/bastille_day/fieldlines.asset index a6f426b2c6..cd43811497 100644 --- a/data/assets/scene/solarsystem/sun/heliosphere/bastille_day/fieldlines.asset +++ b/data/assets/scene/solarsystem/sun/heliosphere/bastille_day/fieldlines.asset @@ -13,7 +13,6 @@ local fieldlinesDirectory = asset.syncedResource({ Version = 2 }) - local sunRadius = 6.957E8 -- Fieldlies from binaries