diff --git a/data/assets/bastille-mas-model.scene b/data/assets/bastille-mas-model.scene index c43f548b7a..8008616389 100644 --- a/data/assets/bastille-mas-model.scene +++ b/data/assets/bastille-mas-model.scene @@ -13,19 +13,18 @@ assetHelper.requestAll(asset, 'scene/solarsystem/sun/heliosphere') textureIndex = 2; local Keybindings = { --- the Shift+s key, might not reset as it is now because it simply --- inverts multiple things that can be inverted indivitually ---[[ { + { Key = "Shift+s", Command = - propertyHelper.invert('Scene.MAS_MHD_Fieldlines.Renderable.Enabled') .. - propertyHelper.invert('Scene.MAS_MHD_density.Renderable.Enabled') .. - propertyHelper.invert('Scene.SunGlare.Renderable.Enabled'), + "openspace.setPropertyValueSingle('Scene.SunGlare.Renderable.Enabled', true);" .. + "openspace.setPropertyValueSingle('Scene.Sun.Renderable.Enabled', false);" .. + "openspace.setPropertyValueSingle('Scene.MAS_MHD_density.Renderable.Enabled', false);" .. + "openspace.setPropertyValueSingle('Scene.MAS_MHD_Fieldlines.Renderable.Enabled', false);" Documentation = "Resets the subscene for showing the Sun volume rendering + fieldlines", Name = "Reset MHD back", GuiPath = "/CCMC/MHD", Local = false - },--]] + }, { Key = "F6", Command = propertyHelper.invert('Scene.MAS_MHD_density.Renderable.Enabled'), diff --git a/data/assets/mas.scene b/data/assets/mas.scene deleted file mode 100644 index 0656759def..0000000000 --- a/data/assets/mas.scene +++ /dev/null @@ -1,179 +0,0 @@ -local assetHelper = asset.require('util/asset_helper') -local sceneHelper = asset.require('util/scene_helper') -local propertyHelper = asset.require('util/property_helper') - -asset.require('util/default_dashboard') -asset.require('spice/base') - -assetHelper.requestAll(asset, 'scene/solarsystem/sun') -assetHelper.requestAll(asset, 'scene/digitaluniverse') --- asset.require('scene/solarsystem/planets') --- asset.require('scene/digitaluniverse/stars') - --- Load default key bindings applicable to most scenes -asset.require('util/default_keybindings') -asset.require('util/default_dashboard') --- asset.request('customization/globebrowsing') - -local sunAsset = asset.require('scene/solarsystem/sun/sun') --- local masMhdAsset = asset.require('scene/solarsystem/model/mas/mas_mhd') -asset.require('scene/solarsystem/model/mas/mas_mhd') - --- Namespaced global lua state -MasScene = { - Options = { - TexIndex = 1 - }, - SunTextures = { - asset.require('../mas/bastille_day_sun_textures').TexturesPath .. "/br_photo_bas05_trans_20G_offset.png", - asset.require('../mas/bastille_day_sun_textures').TexturesPath .. "/br_photo_bas05_trans_100G_offset.png", - asset.require('../mas/bastille_day_sun_textures').TexturesPath .. "/br_photo_bas05_trans_1000G_offset.png", - asset.require('../mas/bastille_day_sun_textures').TexturesPath .. "/black.png", - asset.require('./scene/solarsystem/sun/sun_textures').TexturesPath .. "/sun.jpg", - } -} - --- This causes crash because the renderable is not removed properly before the next frame -local toggleMas = function () - return - -- "openspace.removeSceneGraphNode('Mas_MHD');" .. - "openspace.assset.remove('Mas_MHD');" .. - "openspace.asset.add('Mas_MHD');" -end - -local setup = function () - return - "openspace.setPropertyValueSingle('Scene.FL_MAS.renderable.aBlendingEnabled', false);" .. - "openspace.setPropertyValueSingle('Scene.FL_MAS.renderable.Flow.particleSize', 7);" .. - "openspace.setPropertyValueSingle('Scene.FL_MAS.renderable.Flow.particleSpacing', 59);" .. - "openspace.setPropertyValueSingle('Scene.FL_MAS.renderable.Flow.speed', 19);" .. - "openspace.setPropertyValueSingle('Scene.FL_MAS.renderable.Color.uniform', {0.575, 0, 0.75, 1});" .. - "openspace.setPropertyValueSingle('Scene.FL_MAS.renderable.Flow.color', {1, 0, 0.65, 1});" .. - "openspace.setPropertyValueSingle('Scene.Sun.renderable.ColorTexture', MasScene.SunTextures[1]);" -end - -local Keybindings = { - { - Key = "F5", - Command = "openspace.time.setTime('2000 JUL 14 08:33:37.100');", - Documentation = "Jumps to first of the MAS-fieldline timesteps", - Local = true - }, - { - Key = "F6", - Command = "openspace.time.setTime('2000 JUL 14 10:11:50.100');", - Documentation = "Set time close to when bastille eruption starts", - Local = false - }, - { - Key = "F7", - Command = "openspace.time.setTime('2012 JUL 01 00:07:00.000');", - Documentation = "Jumps to first of the Enlil-fieldline timesteps", - Local = true - }, - { - Key = "F8", - Command = propertyHelper.invert('Scene.SunGlare.Renderable.Enabled'), - Documentation = "Toggle sun glare", - Local = false - }, - { - Key = "F9", - Command = propertyHelper.invert('Scene.Sun.Renderable.Enabled'), - Documentation = "Toggle sun", - Local = false - }, - { - Key = "F10", - Command = setup(), - Documentation = "Setup scene property values after initialization", - Local = false - }, - { - Key = "i", - Command = [[ - if (MasScene.Options.TexIndex == nil) then - MasScene.Options.TexIndex = 1 - end; - - MasScene.Options.TexIndex = MasScene.Options.TexIndex + 1 - if (MasScene.Options.TexIndex > #MasScene.SunTextures) then - MasScene.Options.TexIndex = 1 - end; - - openspace.setPropertyValueSingle('Scene.Sun.renderable.ColorTexture', MasScene.SunTextures[MasScene.Options.TexIndex]); - ]], - Documentation = "Display next sun texture in list of textures", - Local = false - }, - { - Key = "t", - Command = propertyHelper.invert('Scene.Mas_MHD_temperature.renderable.Enabled'), - Documentation = "Toggle mas temperature asset on/off", - Local = true - }, - { - Key = "d", - Command = propertyHelper.invert('Scene.Mas_MHD_rho.renderable.Enabled'), - Documentation = "Toggle mas rho asset on/off", - Local = true - }, -} - --- FIELDLINES -- - --- We need to specify paths to the prepared fieldline files before requesting the BATSRUS, ENLIL, and PFSS fieldline assets: --- local FieldLineBasePath = "E:/FieldlineBinaries/" --- ENLILPaths = { --- EqPlane011AU1 = FieldLineBasePath .. "enlil/july2012/downsampled40/011AU_eq_plane_1/", --- EqPlane011AU2 = FieldLineBasePath .. "enlil/july2012/downsampled40/011AU_eq_plane_2/", --- Lat4011AU1 = FieldLineBasePath .. "enlil/july2012/downsampled40/011AU_lat4_1/", --- Lat4011AU2 = FieldLineBasePath .. "enlil/july2012/downsampled40/011AU_lat4_2/", --- Earth = FieldLineBasePath .. "enlil/july2012/downsampled40/earth/", --- StereoA = FieldLineBasePath .. "enlil/july2012/downsampled40/stereoa/" --- } --- asset.require('./fieldlines/enlil') -asset.require('./fieldlines/mas') - -asset.onInitialize(function () - -- openspace.time.setTime("2017 JUN 01 00:00:00") - openspace.time.setTime("2000 JUL 14 08:33:37.100") - - -- openspace.time.setTime(openspace.time.currentWallTime()) - sceneHelper.bindKeys(Keybindings) - - openspace.setPropertyValueSingle('Scene.SunGlare.renderable.Enabled', false); - - openspace.setDefaultGuiSorting() - - openspace.markInterestingNodes({ - "Earth", "Sun", "Moon", "FL_ENLIL_earth", "FL_MAS", "Mas_MHD" - }) - - openspace.addVirtualProperty( - "BoolProperty", - "Show Trails", - "Scene.*Trail.renderable.Enabled", - "Disable or enable all trails of the scene at the same time", - true, - nil, - nil - ) - - openspace.navigation.setCameraState({ - Focus = sunAsset.Sun.Identifier, - Position = {-92160702466.762482, 188131804731.671265, -27180258494.341042}, - Rotation = {0.655461, -0.629141, -0.410504, -0.077712}, - }) - -end) - -asset.onDeinitialize(function () - sceneHelper.unbindKeys(Keybindings) - - openspace.removeInterestingNodes({ - "Earth", "Sun", "Moon", "FL_ENLIL_earth", "FL_MAS", "Mas_MHD" - }) - - openspace.removeVirtualProperty("*Trail.renderable.Enabled") -end) diff --git a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines.asset b/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines.asset deleted file mode 100644 index 813b9d7ec7..0000000000 --- a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines.asset +++ /dev/null @@ -1,54 +0,0 @@ -asset.require("./sun_earth_2012_fieldlines_enlil") -asset.require("./sun_earth_2012_fieldlines_batsrus") -asset.require("./sun_earth_2012_fieldlines_pfss") - - --- local sceneHelper = asset.require('util/scene_helper') --- local Keybindings = { --- { --- Key = "p", --- Command = --- "openspace.setPropertyValueSingle('Scene.FL_PFSS.Renderable.Color.uniform', { 0.35, 0.51, 0.875, 0.22 })".. --- "openspace.setPropertyValueSingle('Scene.FL_PFSS.Renderable.Flow.color', { 1, 0.9, 1, 0.74 })".. --- "openspace.setPropertyValueSingle('Scene.FL_PFSS.Renderable.Flow.particleSize', 5)".. --- "openspace.setPropertyValueSingle('Scene.FL_PFSS.Renderable.Flow.particleSpacing', 250)".. --- "openspace.setPropertyValueSingle('Scene.FL_PFSS.Renderable.Flow.speed', 75.0)".. --- "openspace.setPropertyValueSingle('Scene.FL_PFSS.Renderable.Flow.reversed', true)".. --- "openspace.setPropertyValue('Scene.FL_ENLIL*.Renderable.Color.colorMethod', 1)".. --- "openspace.setPropertyValue('Scene.FL_ENLIL*.Renderable.Color.colorQuantityMax', '225000')".. --- "openspace.setPropertyValueSingle('Scene.FL_ENLIL_earth.Renderable.Flow.color', { 1, 1, 1, 1.0 })".. --- "openspace.setPropertyValueSingle('Scene.FL_ENLIL_earth.Renderable.Flow.particleSize', 5)".. --- "openspace.setPropertyValueSingle('Scene.FL_ENLIL_earth.Renderable.Flow.particleSpacing', 25)".. --- "openspace.setPropertyValueSingle('Scene.FL_ENLIL_earth.Renderable.Flow.speed', 25.0)".. --- "openspace.setPropertyValueSingle('Scene.FL_ENLIL_earth.Renderable.Flow.reversed', true)".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Color.colorMethod', 1) ".. -- Color by Quantity --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Color.colorQuantity', 4) ".. -- Topology --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Domain.limitsY', { -30.61, 30.61 })".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Domain.limitsY', { -30.61, 30.61 })".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_OpenClosed.Renderable.maskingEnabled', true)".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Masking.maskingQuantity', 4) ".. -- Topology --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Masking.maskingMinLimit', '2.5')".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Masking.maskingMaxLimit', '3.0')".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.colorMethod', 1) ".. -- Color by Quantity --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.colorQuantity', 3)".. -- Velocity --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.colorQuantityMin', '75')".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.colorQuantityMax', '350')".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.uniform', { 1, 1, 1, 0.12 })".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Flow.particleSize', 2)".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Flow.particleSize', 2)".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Flow.particleSpacing', 60)".. --- "openspace.setPropertyValueSingle('Scene.FL_BATSRUS_J12_FlowLines.Renderable.Flow.speed', 20)", --- Documentation = "Setup various variables for 2012 fieldline scene", --- Name = "Setup 2012 fieldlines", --- GuiPath = "/CCMC/2012", --- Local = false --- } --- } - --- asset.onInitialize(function () --- sceneHelper.bindKeys(Keybindings) --- end) - --- asset.onDeinitialize(function () --- sceneHelper.unbindKeys(Keybindings) --- end) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_batsrus.asset b/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_batsrus.asset deleted file mode 100644 index 82a3257759..0000000000 --- a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_batsrus.asset +++ /dev/null @@ -1,201 +0,0 @@ ---sun_earth_2012.asset -local assetHelper = asset.require('util/asset_helper') - -local transforms = asset.require('../heliosphere/mas/bastille_day/transforms') - --- Specifying transfer functions -local transferFunctions = asset.syncedResource({ - Name = "Fieldlines Transfer Functions", - Type = "HttpSynchronization", - Identifier = "sun_earth_event-fieldlines-transferfunctions", - Version = 1 -}) - --- Specifying transfer functions -local fieldlineData = asset.syncedResource({ - Name = "Fieldlines Data", - Type = "HttpSynchronization", - Identifier = "sun_earth_event-fieldlines-data", - Version = 1 -}) - -local batsrusTemperatureColorTable = transferFunctions .. "/batsrus_temperature.txt" -local batsrusDensityColorTable = transferFunctions .. "/batsrus_density.txt" -local batsrusCurrentColorTable = transferFunctions .. "/batsrus_current2.txt" -local batsrusVelocityColorTable = transferFunctions .. "/batsrus_velocity.txt" -local batsrusTopologyColorTable = transferFunctions .. "/batsrus_topology.txt" - -BATSRUSPaths = { - MagneticOpenClosed = fieldlineData .. "/batsrus/lutz_july_event/downsampled4/magnetic_fieldlines/open-closed/", - VelocityFlowlinesUpstream = fieldlineData .. "/batsrus/lutz_july_event/downsampled4/velocity_flowlines/upstream/", - AsherStaticSeeds = fieldlineData .. "/batsrus/asher_static_seeds/downsampled4/" -} - -----------------------LUTZ's JULY TRACES------------------------- -local BatsrusJ12OpenClosed = { - Identifier = "FL_BATSRUS_J12_OpenClosed", - Parent = transforms.GSMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = BATSRUSPaths.MagneticOpenClosed, - InputFileType = "osfls", - -- StartStateOffset = 1908, - -- StateStepSize = 100, - -- MaxNumStates = 12, - LoadBinariesAtRuntime = true, - ColorTablePaths = { - batsrusTemperatureColorTable, - batsrusDensityColorTable, - batsrusCurrentColorTable, - batsrusVelocityColorTable, - batsrusTopologyColorTable, - }, - ColorTableMinMax = { - { 0, 100000000 }, - { 0, 60 }, - { -0.015, 0.015 }, - { 150, 900 }, - { 0, 3 }, - }, - ExtraMinMaxLimits = { - { 0, 1000000000 }, - { -1, 150 }, - { -0.2, 0.2 }, - { 0, 6000 }, - { 0, 3 }, - }, - DefaultColor = { 0.7, 0.4, 0.0, 0.6 }, - RadialDomainLimits = { 0, 350 }, - CartesianDomainLimits = { - { -400, 60 }, - { -80, 80 }, - { -100, 100 } - }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines BATSRUS J12 Open/Closed", - Path = "/Solar System/Heliosphere" - } -} - ---------------------- VELOCITY FLOWLINES ------------------------ -local BatsrusJ12FlowLines = { - Identifier = "FL_BATSRUS_J12_FlowLines", - Parent = transforms.GSMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = BATSRUSPaths.VelocityFlowlinesUpstream, - InputFileType = "osfls", - -- StartStateOffset = 650, - -- StateStepSize = 100, - -- MaxNumStates = 12, - LoadBinariesAtRuntime = true, - ColorTablePaths = { - batsrusTemperatureColorTable, - batsrusDensityColorTable, - batsrusCurrentColorTable, - batsrusVelocityColorTable, - batsrusTopologyColorTable, - }, - ColorTableMinMax = { - { 0, 100000000 }, - { 0, 60 }, - { -0.015, 0.015 }, - { 150, 900 }, - { 0, 3 }, - }, - ExtraMinMaxLimits = { - { 0, 1000000000 }, - { -1, 150 }, - { -0.2, 0.2 }, - { 0, 6000 }, - { 0, 3 }, - }, - DefaultColor = { 0.7, 0.4, 0.0, 0.6 }, - RadialDomainLimits = { 0, 350 }, - CartesianDomainLimits = { { -400, 60 }, { -80, 80 }, { -100, 100 } }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines BATSRUS J12 Flowlines", - Path = "/Solar System/Heliosphere" - } -} - ---------------------- VELOCITY FLOWLINES ------------------------ -local BatsrusAsherStaticSeedsFlowLines = { - Identifier = "FL_BATSRUS_ASHER_STATIC_SSEDS_FlowLines", - Parent = transforms.GSMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = BATSRUSPaths.AsherStaticSeeds, - InputFileType = "osfls", - -- StartStateOffset = 650, - -- StateStepSize = 100, - -- MaxNumStates = 12, - LoadBinariesAtRuntime = true, - ColorTablePaths = { - batsrusTemperatureColorTable, - batsrusDensityColorTable, - batsrusCurrentColorTable, - batsrusVelocityColorTable, - batsrusTopologyColorTable, - }, - ColorTableMinMax = { - { 0, 100000000 }, - { 0, 60 }, - { -0.015, 0.015 }, - { 150, 900 }, - { 0, 3 }, - }, - ExtraMinMaxLimits = { - { 0, 1000000000 }, - { -1, 150 }, - { -0.2, 0.2 }, - { 0, 6000 }, - { 0, 3 }, - }, - DefaultColor = { 0.7, 0.4, 0.0, 0.6 }, - RadialDomainLimits = { 0, 350 }, - CartesianDomainLimits = { { -400, 60 }, { -80, 80 }, { -100, 100 } }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines BATSRUS Asher Static", - Path = "/Solar System/Heliosphere" - } -} - -assetHelper.registerSceneGraphNodesAndExport(asset, { - BatsrusJ12OpenClosed, - BatsrusJ12FlowLines, - BatsrusAsherStaticSeedsFlowLines -}) - -asset.onInitialize(function () - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Color.colorMethod", 1) -- Color by Quantity - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Color.colorQuantity", 4) -- Topology - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Domain.limitsY", { -30.61, 30.61 }) - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Domain.limitsY", { -30.61, 30.61 }) - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_OpenClosed.Renderable.maskingEnabled", true) - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Masking.maskingQuantity", 4) -- Topology - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Masking.maskingMinLimit", "2.5") - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_OpenClosed.Renderable.Masking.maskingMaxLimit", "3.0") - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.colorMethod", 1) -- Color by Quantity - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.colorQuantity", 3) -- Velocity - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.colorQuantityMin", "75") - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.colorQuantityMax", "350") - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Color.uniform", { 1, 1, 1, 0.12 }) - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Flow.particleSize", 2) - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Flow.particleSize", 2) - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Flow.particleSpacing", 60) - -- openspace.setPropertyValueSingle("Scene.FL_BATSRUS_J12_FlowLines.Renderable.Flow.speed", 20) -end) - -asset.onDeinitialize(function () - -end) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_enlil.asset b/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_enlil.asset deleted file mode 100644 index 644e74b2d5..0000000000 --- a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_enlil.asset +++ /dev/null @@ -1,283 +0,0 @@ ---sun_earth_2012.asset -local assetHelper = asset.require('util/asset_helper') - -local transforms = asset.require('../heliosphere/mas/bastille_day/transforms') - --- Specifying transfer functions -local transferFunctions = asset.syncedResource({ - Name = "Fieldlines Transfer Functions", - Type = "HttpSynchronization", - Identifier = "sun_earth_event-fieldlines-transferfunctions", - Version = 1 -}) - --- Specifying transfer functions -local fieldlineData = asset.syncedResource({ - Name = "Fieldlines Data", - Type = "HttpSynchronization", - Identifier = "sun_earth_event-fieldlines-data", - Version = 1 -}) - -local enlilVelocityColorTable = transferFunctions .. "/kroyw.txt" -local enlilDensityColorTable = transferFunctions .. "/enlil_density.txt" - -ENLILPaths = { - EqPlane011AU1 = fieldlineData .. "/enlil/july2012/downsampled40/011AU_eq_plane_1/", - EqPlane011AU2 = fieldlineData .. "/enlil/july2012/downsampled40/011AU_eq_plane_2/", - Lat4011AU1 = fieldlineData .. "/enlil/july2012/downsampled40/011AU_lat4_1/", - Lat4011AU2 = fieldlineData .. "/enlil/july2012/downsampled40/011AU_lat4_2/", - Earth = fieldlineData .. "/enlil/july2012/downsampled40/earth/", - StereoA = fieldlineData .. "/enlil/july2012/downsampled40/stereoa/" -} - - -local ENLILSliceEqPlane11AU1 = { - Identifier = "FL_ENLIL_slice_eqPlane_011AU_1", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = ENLILPaths.EqPlane011AU1, - InputFileType = "osfls", - -- StartStateOffset = 309, - -- MaxNumStates = 1, - ColorTablePaths = { - enlilDensityColorTable, - enlilVelocityColorTable, - }, - DefaultColor = { 0.4, 0.15, 0.4, 0.60 }, - ColorTableMinMax = { - { 0, 1000000 }, - { 100, 2000 } - }, - ExtraMinMaxLimits = { - { -1, 10000000 }, - { 0, 5000 } - }, - RadialDomainLimits = { 0, 5 }, - CartesianDomainLimits = { - { -2.5, 2.5 }, - { -2.5, 2.5 }, - { -2.5, 2.5} - }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines ENLIL Slice Equatorial Plane 0.11 AU 1", - Path = "/Solar System/Heliosphere" - } - -- Tag = {"fieldline_sequence", "fieldline_enlil"}, -} - -local ENLILSliceEqPlane11AU2 = { - Identifier = "FL_ENLIL_slice_eqPlane_011AU_2", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = ENLILPaths.EqPlane011AU2, - InputFileType = "osfls", - -- StartStateOffset = 309, - -- MaxNumStates = 1, - ColorTablePaths = { - enlilDensityColorTable, - enlilVelocityColorTable, - }, - DefaultColor = { 0.4, 0.15, 0.4, 0.60 }, - ColorTableMinMax = { - { 0, 1000000 }, - { 100, 2000 } - }, - ExtraMinMaxLimits = { - { -1, 10000000 }, - { 0, 5000 } - }, - RadialDomainLimits = { 0, 5 }, - CartesianDomainLimits = { - { -2.5, 2.5 }, - { -2.5, 2.5 }, - { -2.5, 2.5 } - }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines ENLIL Slice Equatorial Plane 0.11 AU 2", - Path = "/Solar System/Heliosphere" - } - -- Tag = {"fieldline_sequence", "fieldline_enlil"}, -} - -local ENLILSliceLat411AU1 = { - Identifier = "FL_ENLIL_slice_lat4_011AU_1", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = ENLILPaths.Lat4011AU1, - InputFileType = "osfls", - -- StartStateOffset = 309, - -- MaxNumStates = 1, - ColorTablePaths = { - enlilDensityColorTable, - enlilVelocityColorTable, - }, - DefaultColor = { 0.4, 0.15, 0.4, 0.60 }, - ColorTableMinMax = { - { 0, 1000000 }, - { 100, 2000 } - }, - ExtraMinMaxLimits = { - { -1, 10000000 }, - { 0, 5000 } - }, - RadialDomainLimits = { 0, 5 }, - CartesianDomainLimits = { - { -2.5, 2.5 }, - { -2.5, 2.5 }, - { -2.5, 2.5 } - }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines ENLIL Slice Latitude 4 0.11 AU 1", - Path = "/Solar System/Heliosphere" - } - -- Tag = {"fieldline_sequence", "fieldline_enlil"}, -} - -local ENLILSliceLat411AU2 = { - Identifier = "FL_ENLIL_slice_lat4_011AU_2", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = ENLILPaths.Lat4011AU2, - InputFileType = "osfls", - -- StartStateOffset = 309, - -- MaxNumStates = 1, - ColorTablePaths = { - enlilDensityColorTable, - enlilVelocityColorTable, - }, - DefaultColor = { 0.4, 0.15, 0.4, 0.60 }, - ColorTableMinMax = { - { 0, 1000000 }, - { 100, 2000 } - }, - ExtraMinMaxLimits = { - { -1, 10000000 }, - { 0, 5000 } - }, - RadialDomainLimits = { 0, 5 }, - CartesianDomainLimits = { - { -2.5, 2.5 }, - { -2.5, 2.5 }, - { -2.5, 2.5} - }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines ENLIL Slice Latitude 4 0.11 AU 2", - Path = "/Solar System/Heliosphere" - } - -- Tag = {"fieldline_sequence", "fieldline_enlil"}, -} - -local ENLILEarth = { - Identifier = "FL_ENLIL_earth", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = ENLILPaths.Earth, - InputFileType = "osfls", - -- StartStateOffset = 309, - -- MaxNumStates = 1, - ColorTablePaths = { - enlilDensityColorTable, - enlilVelocityColorTable, - }, - DefaultColor = { 1.0, 1.0, 1.0, 0.60 }, - ColorTableMinMax = { - { 0, 1000000 }, - { 100, 2000 } - }, - ExtraMinMaxLimits = { - { -1, 10000000 }, - { 0, 5000 } - }, - RadialDomainLimits = { 0, 5 }, - CartesianDomainLimits = { - { -2.5, 2.5 }, - { -2.5, 2.5 }, - { -2.5, 2.5 } - }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines ENLIL Earth", - Path = "/Solar System/Heliosphere" - } - -- Tag = {"fieldline_sequence", "fieldline_enlil"}, -} - -local ENLILStereoA = { - Identifier = "FL_ENLIL_stereoa", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = ENLILPaths.StereoA, - InputFileType = "osfls", - -- StartStateOffset = 309, - -- MaxNumStates = 1, - ColorTablePaths = { - enlilDensityColorTable, - enlilVelocityColorTable, - }, - DefaultColor = { 1.0, 1.0, 1.0, 0.60 }, - ColorTableMinMax = { - { 0, 1000000 }, - { 100, 2000 } - }, - ExtraMinMaxLimits = { - { -1, 10000000 }, - { 0, 5000 } - }, - RadialDomainLimits = { 0, 5 }, - CartesianDomainLimits = { - { -2.5, 2.5 }, - { -2.5, 2.5 }, - { -2.5, 2.5} - }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines ENLIL STEREO A", - Path = "/Solar System/Heliosphere" - } -} - -assetHelper.registerSceneGraphNodesAndExport(asset, { - ENLILSliceEqPlane11AU1, - ENLILSliceEqPlane11AU2, - ENLILSliceLat411AU1, - ENLILSliceLat411AU2, - ENLILEarth, - ENLILStereoA -}) - -asset.onInitialize(function () - -- openspace.setPropertyValue("Scene.FL_ENLIL*.Renderable.Color.colorMethod", 1) - -- openspace.setPropertyValue("Scene.FL_ENLIL*.Renderable.Color.colorQuantityMax", "225000") - -- openspace.setPropertyValueSingle("Scene.FL_ENLIL_earth.Renderable.Flow.color", { 1, 1, 1, 1.0 }) - -- openspace.setPropertyValueSingle("Scene.FL_ENLIL_earth.Renderable.Flow.particleSize", 5) - -- openspace.setPropertyValueSingle("Scene.FL_ENLIL_earth.Renderable.Flow.particleSpacing", 25) - -- openspace.setPropertyValueSingle("Scene.FL_ENLIL_earth.Renderable.Flow.speed", 25.0) - -- openspace.setPropertyValueSingle("Scene.FL_ENLIL_earth.Renderable.Flow.reversed", true) -end) - -asset.onDeinitialize(function () - -end) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_pfss.asset b/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_pfss.asset deleted file mode 100644 index 450a10a4ff..0000000000 --- a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_fieldlines_pfss.asset +++ /dev/null @@ -1,87 +0,0 @@ ---sun_earth_2012.asset -local assetHelper = asset.require('util/asset_helper') - -local transforms = asset.require('../heliosphere/mas/bastille_day/transforms') - --- Specifying transfer functions -local transferFunctions = asset.syncedResource({ - Name = "Fieldlines Transfer Functions", - Type = "HttpSynchronization", - Identifier = "sun_earth_event-fieldlines-transferfunctions", - Version = 1 -}) - - --- Specifying transfer functions -local fieldlineData = asset.syncedResource({ - Name = "Fieldlines Data", - Type = "HttpSynchronization", - Identifier = "sun_earth_event-fieldlines-data", - Version = 1 -}) - -local pfssTransitionColorTable = transferFunctions .. "/pfss_transition.txt"; -local pfssTopologyColorTable = transferFunctions .. "/pfss_topology.txt"; -local pfssBsignColorTable = transferFunctions .. "/pfss_bsign.txt"; - -PFSSPaths = { - SolarSoft = fieldlineData .. "/pfss/leilas_solar_soft_july_12_2012/" -} - -local PFSS = { - Identifier = "FL_PFSS", - Parent = transforms.HNMReferenceFrame.Identifier, - Renderable = { - Type = "RenderableFieldlinesSequence", - -- TracingMethod = "PreTracedBinary", - SourceFolder = PFSSPaths.SolarSoft, - InputFileType = "osfls", - -- StartStateOffset = 515, - -- StateStepSize = 100, - -- MaxNumStates = 55, - ColorTablePaths = { - --pfssTransitionColorTable, - pfssTopologyColorTable, - pfssBsignColorTable, - }, - ColorTableMinMax = { - --{0, 1}, - { 0, 2 }, - { -1, 1 }, - }, - ExtraMinMaxLimits = { - --{-1, 1}, - { 0, 2 }, - { -1, 1 }, - }, - DefaultColor = { 0.3861, 1.0, 0.92174, 0.18644}, - RadialDomainLimits = { 0, 50 }, - CartesianDomainLimits = { - { -50, 50 }, - { -50, 50 }, - { -50, 50 } - }, - LoadAtRuntime = true - }, - GUI = { - Name = "Fieldlines PFSS", - Path = "/Solar System/Heliosphere" - } -} - -assetHelper.registerSceneGraphNodesAndExport(asset, { - PFSS -}) - -asset.onInitialize(function () - -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Color.uniform", { 0.35, 0.51, 0.875, 0.22 }) - -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.color", { 1, 0.9, 1, 0.74 }) - -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.particleSize", 5) - -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.particleSpacing", 250) - -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.speed", 75.0) - -- openspace.setPropertyValueSingle("Scene.FL_PFSS.Renderable.Flow.reversed", true) -end) - -asset.onDeinitialize(function () - -end) \ No newline at end of file diff --git a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_transforms.asset b/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_transforms.asset deleted file mode 100644 index b9488d7f86..0000000000 --- a/data/assets/scene/solarsystem/sun/fieldlines/sun_earth_2012_transforms.asset +++ /dev/null @@ -1,55 +0,0 @@ -local assetHelper = asset.require('util/asset_helper') - -local sunTransforms = asset.require('scene/solarsystem/sun/transforms') -local earthTransforms = asset.require('scene/solarsystem/planets/earth/transforms') - -local kernels = asset.syncedResource({ - Name = "Fieldlines Kernels", - Type = "HttpSynchronization", - Identifier = "sun_earth_event-fieldlines-kernels", - Version = 1 -}) - - -local HNMKernel = kernels .. "/HNM.tf" -local GSMKernel = kernels .. "/GSM.ti" - -local HNMReferenceFrame = { - Identifier = "HNMReferenceFrame", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "HEEQ180", - DestinationFrame = "GALACTIC", - Kernels = HNMKernel - } - }, - GUI = { - Name = "HNM Reference Frame" - } -} - -local GSMReferenceFrame = { - Identifier = "GSMReferenceFrame", - Parent = earthTransforms.EarthBarycenter.Identifier, - Transform = { - Rotation = { - Type = "SpiceRotation", - SourceFrame = "GSM", - DestinationFrame = "GALACTIC", - Kernels = GSMKernel - } - }, - GUI = { - Name = "GSM Reference Frame" - } -} - - -local objects = { - HNMReferenceFrame, - GSMReferenceFrame -} - -assetHelper.registerSceneGraphNodesAndExport(asset, objects) diff --git a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/bastille_day_sun_textures.asset b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/bastille_day_sun_textures.asset index 0725d818df..8b5706b704 100644 --- a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/bastille_day_sun_textures.asset +++ b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/bastille_day_sun_textures.asset @@ -18,4 +18,4 @@ local TexturesPath = asset.syncedResource({ Version = 1 }) -asset.export("TexturesPath", TexturesPath) \ No newline at end of file +asset.export("TexturesPath", TexturesPath) diff --git a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/density_volume.asset b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/density_volume.asset index 219f7c77f8..ba4a44c689 100644 --- a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/density_volume.asset +++ b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/density_volume.asset @@ -20,26 +20,26 @@ local densityDirectory = asset.syncedResource({ local sunRadius = 6.957E8 local densityVolume = { - Identifier = "MAS_MHD_density", - Parent = sunTransforms.SolarSystemBarycenter.Identifier, - Renderable = { - Type = "RenderableTimeVaryingVolume", - StepSize = 0.004, - Opacity = 0.3, - TransferFunction = asset.localResource("transferfunctions/mas_mhd_r_squared.txt"), - SourceDirectory = densityDirectory, - LowerValueBound = 0, - UpperValueBound = 1, - GridType = "Spherical", - SecondsBefore = 24*60*60, - SecondsAfter = 24*60*60 - }, - Transform = { - Scale = { - Type = "StaticScale", - Scale = sunRadius - } - }, + Identifier = "MAS_MHD_density", + Parent = sunTransforms.SolarSystemBarycenter.Identifier, + Renderable = { + Type = "RenderableTimeVaryingVolume", + StepSize = 0.004, + Opacity = 0.3, + TransferFunction = asset.localResource("transferfunctions/mas_mhd_r_squared.txt"), + SourceDirectory = densityDirectory, + LowerValueBound = 0, + UpperValueBound = 1, + GridType = "Spherical", + SecondsBefore = 24*60*60, + SecondsAfter = 24*60*60 + }, + Transform = { + Scale = { + Type = "StaticScale", + Scale = sunRadius + } + }, GUI = { Name = "MAS Density", Path = "/Solar System/Heliosphere" diff --git a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/kernels/GSM.ti b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/kernels/GSM.ti deleted file mode 100644 index 28cf175a5a..0000000000 --- a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/kernels/GSM.ti +++ /dev/null @@ -1,33 +0,0 @@ -Geocentric Solar Magnetospheric (GSM) frame: -Used by the BATSRUS model -This Kernel's ID is not a valid ID! - - +X is parallel to the geometric earth-sun position vector. - - +Z axis is normalized component of north centered geomagnetic dipole - vector orthogonal to GSM +X axis. - - +Y completes the right-handed frame. - -\begindata - - FRAME_GSM = 13371333 - FRAME_13371333_NAME = 'GSM' - FRAME_13371333_CLASS = 5 - FRAME_13371333_CLASS_ID = 13371333 - FRAME_13371333_CENTER = 399 - FRAME_13371333_RELATIVE = 'GALACTIC' - FRAME_13371333_DEF_STYLE = 'PARAMETERIZED' - FRAME_13371333_FAMILY = 'TWO-VECTOR' - FRAME_13371333_PRI_AXIS = 'X' - FRAME_13371333_PRI_VECTOR_DEF = 'OBSERVER_TARGET_POSITION' - FRAME_13371333_PRI_OBSERVER = 'EARTH' - FRAME_13371333_PRI_TARGET = 'SUN' - FRAME_13371333_PRI_ABCORR = 'NONE' - FRAME_13371333_SEC_AXIS = 'Z' - FRAME_13371333_SEC_VECTOR_DEF = 'CONSTANT' - FRAME_13371333_SEC_FRAME = 'ECLIPJ2000' - FRAME_13371333_SEC_SPEC = 'LATITUDINAL' - FRAME_13371333_SEC_UNITS = 'DEGREES' - FRAME_13371333_SEC_LONGITUDE = 288.43 - FRAME_13371333_SEC_LATITUDE = 79.54 diff --git a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/kernels/HNM.tf b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/kernels/HNM.tf deleted file mode 100644 index 6363f4a521..0000000000 --- a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/kernels/HNM.tf +++ /dev/null @@ -1,42 +0,0 @@ -\begintext - -Heliocentric Earth Equatorial (HEEQ+180) Frame -Used by the BATSRUS model -This Kernel's ID is not a valid ID! - Definition of the Heliocentric Earth Equatorial frame: - - All vectors are geometric: no aberration corrections are - used. - - The solar rotation axis is the primary vector: the Z axis points - in the solar north direction. - - The position of the sun relative to the earth is the secondary - vector: the X axis is the component of this position vector - orthogonal to the Z axis. - - The Y axis is Z cross X, completing the right-handed - reference frame. - -\begindata - - FRAME_HEEQ180 = 6666666 - FRAME_6666666_NAME = 'HEEQ180' - FRAME_6666666_CLASS = 5 - FRAME_6666666_CLASS_ID = 6666666 - FRAME_6666666_CENTER = 10 - FRAME_6666666_RELATIVE = 'J2000' - FRAME_6666666_DEF_STYLE = 'PARAMETERIZED' - FRAME_6666666_FAMILY = 'TWO-VECTOR' - FRAME_6666666_PRI_AXIS = 'Z' - FRAME_6666666_PRI_VECTOR_DEF = 'CONSTANT' - FRAME_6666666_PRI_FRAME = 'IAU_SUN' - FRAME_6666666_PRI_SPEC = 'RECTANGULAR' - FRAME_6666666_PRI_VECTOR = ( 0, 0, 1 ) - FRAME_6666666_SEC_AXIS = 'X' - FRAME_6666666_SEC_VECTOR_DEF = 'OBSERVER_TARGET_POSITION' - FRAME_6666666_SEC_OBSERVER = 'EARTH' - FRAME_6666666_SEC_TARGET = 'SUN' - FRAME_6666666_SEC_ABCORR = 'NONE' - FRAME_6666666_SEC_FRAME = 'IAU_SUN' - diff --git a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/transferfunctions/mas_mhd_r_squared - Copy.txt b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/transferfunctions/mas_mhd_r_squared - Copy.txt deleted file mode 100644 index ed07552974..0000000000 --- a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/transferfunctions/mas_mhd_r_squared - Copy.txt +++ /dev/null @@ -1,18 +0,0 @@ -width 2048 -lower 0.0 -upper 1.0 - -mappingkey 0.005 0 54 135 0 -mappingkey 0.06 0 145 255 15 -mappingkey 0.1 0 130 255 70 -mappingkey 0.13 0 200 255 120 -mappingkey 0.16 0 255 255 255 -mappingkey 0.2 90 210 255 130 -mappingkey 0.3 90 200 255 250 -mappingkey 0.4 200 200 230 150 -mappingkey 0.5 92 177 242 200 -mappingkey 0.6 137 223 255 0 -mappingkey 0.7 94 255 214 0 -mappingkey 0.8 255 200 180 0 -mappingkey 0.9 249 199 150 0 -mappingkey 1.0 255 140 100 0 diff --git a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/transferfunctions/mas_mhd_r_squared.txt b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/transferfunctions/mas_mhd_r_squared.txt index 7b8b9011f9..ed07552974 100644 --- a/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/transferfunctions/mas_mhd_r_squared.txt +++ b/data/assets/scene/solarsystem/sun/heliosphere/mas/bastille_day/transferfunctions/mas_mhd_r_squared.txt @@ -2,17 +2,17 @@ width 2048 lower 0.0 upper 1.0 -mappingkey 0.005 0 54 135 0 -mappingkey 0.06 0 85 125 11 -mappingkey 0.1 140 30 70 50 -mappingkey 0.13 160 160 0 45 -mappingkey 0.16 150 150 150 150 -mappingkey 0.2 180 210 255 190 -mappingkey 0.3 190 200 255 250 -mappingkey 0.4 255 255 255 0 -mappingkey 0.5 0 0 0 0 -mappingkey 0.6 137 223 255 0 -mappingkey 0.7 94 255 214 0 -mappingkey 0.8 255 200 180 0 -mappingkey 0.9 249 199 150 0 -mappingkey 1.0 255 140 100 0 +mappingkey 0.005 0 54 135 0 +mappingkey 0.06 0 145 255 15 +mappingkey 0.1 0 130 255 70 +mappingkey 0.13 0 200 255 120 +mappingkey 0.16 0 255 255 255 +mappingkey 0.2 90 210 255 130 +mappingkey 0.3 90 200 255 250 +mappingkey 0.4 200 200 230 150 +mappingkey 0.5 92 177 242 200 +mappingkey 0.6 137 223 255 0 +mappingkey 0.7 94 255 214 0 +mappingkey 0.8 255 200 180 0 +mappingkey 0.9 249 199 150 0 +mappingkey 1.0 255 140 100 0 diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index 032c18f02a..10c0ff4aec 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -8,7 +8,7 @@ local Sun = { Parent = transforms.SunIAU.Identifier, Renderable = { Type = "RenderableGlobe", - Enabled = true, + Enabled = false, Radii = { 6.957E8, 6.957E8, 6.957E8 }, SegmentsPerPatch = 64, Layers = { diff --git a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp index 6b2eb162d3..d5f7b92117 100644 --- a/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp +++ b/modules/fieldlinessequence/rendering/renderablefieldlinessequence.cpp @@ -684,7 +684,6 @@ void RenderableFieldlinesSequence::setupProperties() { _pMaskingGroup.addProperty(_pMaskingMin); _pMaskingGroup.addProperty(_pMaskingMax); _pMaskingGroup.addProperty(_pMaskingQuantity); - // --------------------- Add Options to OptionProperties --------------------- // _pColorMethod.addOption(static_cast(ColorMethod::Uniform), "Uniform"); @@ -1139,11 +1138,6 @@ void RenderableFieldlinesSequence::render(const RenderData& data, RendererTasks& } glBindVertexArray(_vertexArrayObject); - /* #ifdef __APPLE__ - glLineWidth(1.f); - #else - glLineWidth(ceil((2.f * 1.f + _pLineWidth) * std::sqrt(2.f))); - #endif*/ glLineWidth(_pLineWidth); glMultiDrawArrays( diff --git a/openspace.cfg b/openspace.cfg index d813d57015..6c8e53d485 100644 --- a/openspace.cfg +++ b/openspace.cfg @@ -45,7 +45,7 @@ SGCTConfig = sgct.config.single{} -- Sets the scene that is to be loaded by OpenSpace. A scene file is a description -- of all entities that will be visible during an instance of OpenSpace --- Asset = "default" +Asset = "default" -- Asset = "asteroids" -- Asset = "default_full" -- Asset = "newhorizons" @@ -60,8 +60,7 @@ SGCTConfig = sgct.config.single{} -- Asset = "apollo_sites" -- Asset = "touch" -- Asset = "dawn" --- Asset = "mas" -Asset = "bastille-mas-model" +-- Asset = "bastille-mas-model" -- Sets the profile that should be loaded by OpenSpace. Profiles are going to replace -- assets in a future versions and shouldn't be used at the same time as the 'Asset'