diff --git a/data/assets/test.scene b/data/assets/test.scene index 7ddf889626..d3e4a2cf57 100644 --- a/data/assets/test.scene +++ b/data/assets/test.scene @@ -5,18 +5,18 @@ local propertyHelper = asset.require('util/property_helper') -- Specifying which other assets should be loaded in this scene asset.require('spice/base') assetHelper.requestAll(asset, 'scene/solarsystem/sun') -asset.require('scene/solarsystem/planets') -asset.require('scene/solarsystem/planets/mars/moons/phobos') -asset.require('scene/solarsystem/planets/mars/moons/deimos') -asset.require('scene/solarsystem/dwarf_planets/pluto/system') -assetHelper.requestAll(asset, 'scene/digitaluniverse') +-- asset.require('scene/solarsystem/planets') +-- asset.require('scene/solarsystem/planets/mars/moons/phobos') +-- asset.require('scene/solarsystem/planets/mars/moons/deimos') +-- asset.require('scene/solarsystem/dwarf_planets/pluto/system') +-- assetHelper.requestAll(asset, 'scene/digitaluniverse') -- Load default key bindings applicable to most scenes asset.require('util/default_keybindings') asset.require('util/default_dashboard') -asset.require('util/default_joystick') +-- asset.require('util/default_joystick') -asset.require('util/webgui') +-- asset.require('util/webgui') --asset.request('customization/globebrowsing') @@ -25,31 +25,19 @@ local sunAsset = asset.require('scene/solarsystem/sun/sun') local sunRadius = 695508000 --- The actual fieldlines ---asset.require('./bastille_day/fieldlines') - -- Selected field lines + some additional field lines --- asset.require('./testwsa/scs_oi') --- asset.require('./testwsa/pfss_oi') --- asset.require('./testwsa/pfss_io') +asset.require('./testwsa/scs_oi') +asset.require('./testwsa/pfss_oi') +asset.require('./testwsa/pfss_io') -- Sun earth connection --- asset.require('./testwsa/scs_oi_540') --- asset.require('./testwsa/pfss_oi_540') - --- Only selected field lines --- asset.require('./testwsa/scs_oi_boundary') --- asset.require('./testwsa/pfss_oi_boundary') +-- asset.require('./testwsa/sun_earth') -- Every N:th WSA field line --- asset.require('./testwsa/scs_oi_25') --- asset.require('./testwsa/pfss_oi_25') -asset.require('./testwsa/pfss_io_25') +-- asset.require('./testwsa/pfss_io_25') asset.onInitialize(function () local now = openspace.time.currentWallTime() - -- Jump to bastille day - --openspace.time.setTime("2000 JUL 14 08:33:37.100") -- Sun magnetogram texture testing openspace.time.setTime("2019 MAY 2 7:59:57.000") diff --git a/data/assets/testwsa/pfss_io.asset b/data/assets/testwsa/pfss_io.asset index 3d03c3b3c1..d7a5ec7eb4 100755 --- a/data/assets/testwsa/pfss_io.asset +++ b/data/assets/testwsa/pfss_io.asset @@ -3,7 +3,7 @@ local transforms = asset.require('./transforms') local fieldlinesDirectory = asset.localResource("fl_pfss_io") local transferFunctions = asset.localResource("transferfunctions") -local polarityColorTable = transferFunctions .. "/pfss_spec.txt" +local polarityColorTable = transferFunctions .. "/openness_spec.txt" local sunRadius = 695508000 @@ -21,7 +21,7 @@ local fieldlines = { polarityColorTable }, ColorTableRanges = { - { -0.6, 0.6 }, + { -1.0, 1.0 }, }, LoadAtRuntime = true, ScaleToMeters = 1.0, @@ -29,13 +29,13 @@ local fieldlines = { SecondsAfter = 24*60*60, SimulationModel = "wsa", Color = { - Uniform = {0.1, 0.725, 0, 1} + Uniform = {0.725, 0.1, 0, 1} }, - ColoringMethod = "Uniform", + ColoringMethod = "Quantity" }, GUI = { Path = "/Solar System/Heliosphere", - Name = "WSA PFSS In to Out Closed Lines Step 3" + Name = "WSA PFSS In to Out Lines" }, Transform = { Scale = { diff --git a/data/assets/testwsa/pfss_io_25.asset b/data/assets/testwsa/pfss_io_25.asset index a8074ac851..e378ab50b5 100755 --- a/data/assets/testwsa/pfss_io_25.asset +++ b/data/assets/testwsa/pfss_io_25.asset @@ -14,7 +14,6 @@ local fieldlines = { Renderable = { Type = "RenderableFieldlinesSequence", WebFieldlines = true, - --SourceFolder = fieldlinesDirectory, FlowEnabled = false, AlphaBlendlingEnabled = false, InputFileType = "osfls", diff --git a/data/assets/testwsa/pfss_oi_25.asset b/data/assets/testwsa/pfss_oi_25.asset deleted file mode 100755 index af07aaed7a..0000000000 --- a/data/assets/testwsa/pfss_oi_25.asset +++ /dev/null @@ -1,47 +0,0 @@ -local assetHelper = asset.require('util/asset_helper') -local transforms = asset.require('./transforms') - -local transferFunctions = asset.localResource("transferfunctions") -local fieldlinesDirectory = asset.localResource("fl_pfss_oi_25") -local polarityColorTable = transferFunctions .. "/pfss_spec.txt" - -local sunRadius = 695508000 - --- Fieldlies from json -local fieldlines = { - Identifier = "WSA_Fieldlines_PFSS_OI_25", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - SourceFolder = fieldlinesDirectory, - FlowEnabled = false, - AlphaBlendlingEnabled = false, - InputFileType = "osfls", - ColorTablePaths = { - polarityColorTable - }, - ColorTableRanges = { - { -0.6, 0.6 }, - }, - LoadAtRuntime = true, - ScaleToMeters = 1.0, - SecondsBefore = 24*60*60, - SecondsAfter = 24*60*60, - SimulationModel = "wsa", - Color = { - Uniform = {0.725, 0.1, 0, 1} - } - }, - GUI = { - Path = "/Solar System/Heliosphere", - Name = "WSA PFSS Out to In Step 25" - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = sunRadius - }, - } -} - -assetHelper.registerSceneGraphNodesAndExport(asset, { fieldlines }) diff --git a/data/assets/testwsa/scs_oi_25.asset b/data/assets/testwsa/scs_oi_25.asset deleted file mode 100755 index 29546d8d57..0000000000 --- a/data/assets/testwsa/scs_oi_25.asset +++ /dev/null @@ -1,47 +0,0 @@ -local assetHelper = asset.require('util/asset_helper') -local transforms = asset.require('./transforms') - -local transferFunctions = asset.localResource("transferfunctions") -local fieldlinesDirectory = asset.localResource("fl_scs_oi_25") -local polarityColorTable = transferFunctions .. "/scs_spec.txt" - -local sunRadius = 695508000 - --- Fieldlies from json -local fieldlines = { - Identifier = "WSA_Fieldlines_SCS_OI_25", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - SourceFolder = fieldlinesDirectory, - FlowEnabled = false, - AlphaBlendlingEnabled = false, - InputFileType = "osfls", - ColorTablePaths = { - polarityColorTable - }, - ColorTableRanges = { - { -0.02, 0.02 }, - }, - LoadAtRuntime = true, - ScaleToMeters = 1.0, - SecondsBefore = 24*60*60, - SecondsAfter = 24*60*60, - SimulationModel = "wsa", - Color = { - Uniform = {0, 0.725, 0.75, 1} - } - }, - GUI = { - Path = "/Solar System/Heliosphere", - Name = "WSA SCS Out to In Step 25" - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = sunRadius - }, - } -} - -assetHelper.registerSceneGraphNodesAndExport(asset, { fieldlines }) diff --git a/data/assets/testwsa/transferfunctions/openness_spec.txt b/data/assets/testwsa/transferfunctions/openness_spec.txt new file mode 100644 index 0000000000..8685af8d23 --- /dev/null +++ b/data/assets/testwsa/transferfunctions/openness_spec.txt @@ -0,0 +1,7 @@ +width 3.0 +lower -1.0 +upper 1.0 + +mappingkey 0.0 0 0 255 255 +mappingkey 0.5 255 255 0 255 +mappingkey 1.0 255 0 0 255 \ No newline at end of file