mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-04-28 06:49:32 -05:00
New asset fixes with transforms/versions. Colortable changed
This commit is contained in:
@@ -1,6 +1,8 @@
|
||||
local transforms = asset.require('scene/solarsystem/planets/earth/transforms')
|
||||
local debugHelper = asset.require('util/debug_helper')
|
||||
local sun_transforms = asset.require('scene/solarsystem/sun/transforms')
|
||||
|
||||
local sunRadius = 6.957E8
|
||||
local earthRadius = 6.371E6
|
||||
|
||||
debugHelper.registerCartesianAxes(asset, {
|
||||
@@ -17,3 +19,8 @@ debugHelper.registerCartesianAxes(asset, {
|
||||
Parent = transforms.EarthIAU.Identifier,
|
||||
Scale = earthRadius * 1.5
|
||||
})
|
||||
|
||||
debugHelper.registerCartesianAxes(asset, {
|
||||
Parent = sun_transforms.SunIAU.Identifier,
|
||||
Scale = sunRadius * 300
|
||||
})
|
||||
|
||||
+1
-1
@@ -11,7 +11,7 @@ local TexturesPath = asset.syncedResource({
|
||||
Name = "PREDSCI MAS Bastille Day Textures",
|
||||
Type = "HttpSynchronization",
|
||||
Identifier = "mas_bastille_day_2000_sun_textures",
|
||||
Version = 1
|
||||
Version = 2
|
||||
})
|
||||
|
||||
asset.export("TexturesPath", TexturesPath)
|
||||
|
||||
+24
-17
@@ -1,14 +1,6 @@
|
||||
asset.info = {
|
||||
Name = "Predictive Science Inc. Volume Rendering Bastille Day",
|
||||
Version = "1.0",
|
||||
Description = " Volumetric rendering for the bastille day CME event ",
|
||||
Author = "Jonathan Grangien, Matthias Berg, Elon Olsson",
|
||||
URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
|
||||
License = ""
|
||||
}
|
||||
|
||||
local assetHelper = asset.require("util/asset_helper")
|
||||
local sunTransforms = asset.require('scene/solarsystem/sun/transforms')
|
||||
local transforms = asset.require('./transforms')
|
||||
|
||||
local densityDirectory = asset.syncedResource({
|
||||
Name = "Bastille Day MAS Density",
|
||||
@@ -21,17 +13,19 @@ local sunRadius = 6.957E8
|
||||
|
||||
local densityVolume = {
|
||||
Identifier = "MAS_MHD_density",
|
||||
--wrong Parent = sunTransforms.SolarSystemBarycenter.Identifier,
|
||||
-- wrong Parent = sunTransforms.SolarSystemBarycenter.Identifier,
|
||||
-- right
|
||||
Parent = sunTransforms.SunIAU.Identifier,
|
||||
-- wrong Parent = transforms.HNMReferenceFrame.Identifier,
|
||||
Renderable = {
|
||||
Type = "RenderableTimeVaryingVolume",
|
||||
Enabled = false,
|
||||
StepSize = 0.004,
|
||||
--Enabled = false,
|
||||
Opacity = 0.3,
|
||||
TransferFunction = asset.localResource("transferfunctions/mas_mhd_r_squared.txt"),
|
||||
TransferFunction = asset.localResource("transferfunctions/mas_mhd_r_squared.txt"), --test1
|
||||
SourceDirectory = densityDirectory,
|
||||
LowerValueBound = 0,
|
||||
UpperValueBound = 1,
|
||||
--LowerValueBound = 0,
|
||||
--UpperValueBound = 1,
|
||||
GridType = "Spherical",
|
||||
SecondsBefore = 24*60*60,
|
||||
SecondsAfter = 24*60*60
|
||||
@@ -41,13 +35,17 @@ local densityVolume = {
|
||||
Type = "StaticScale",
|
||||
Scale = sunRadius
|
||||
},
|
||||
Rotate = {
|
||||
Type = "FixedRotation",
|
||||
Rotation = {
|
||||
Type = "FixedRotation", --LuaRotation
|
||||
-- XAxis = {-1.0, 0.0, 0.0},
|
||||
-- YAxis = {0.0, -1.0, 0.0},
|
||||
|
||||
XAxis = {0.0, 1.0, 0.0},
|
||||
YAxis = {1.0, 0.0, 0.0},
|
||||
ZAxis = {0.0, 0.0, -1.0}
|
||||
}
|
||||
|
||||
--Script = asset.localResource("kernels/carringtonRotation.lua")
|
||||
}
|
||||
},
|
||||
GUI = {
|
||||
Name = "MAS Density",
|
||||
@@ -56,3 +54,12 @@ local densityVolume = {
|
||||
}
|
||||
|
||||
assetHelper.registerSceneGraphNodesAndExport(asset, { densityVolume })
|
||||
|
||||
asset.meta = {
|
||||
Name = "Predictive Science Inc. Volume Rendering Bastille Day",
|
||||
Version = "1.0",
|
||||
Description = " Volumetric rendering for the bastille day CME event ",
|
||||
Author = "OpenSpace team",
|
||||
URL = "https://dx.doi.org/10.3847/1538-4357/aab36d",
|
||||
License = ""
|
||||
}
|
||||
|
||||
@@ -29,8 +29,8 @@ local sunRadius = 6.957E8
|
||||
-- Fieldlies from binaries
|
||||
local fieldlines = {
|
||||
Identifier = "MAS_MHD_Fieldlines",
|
||||
--wrong Parent = transforms.HNMReferenceFrame.Identifier,
|
||||
Parent = sunTransforms.SunIAU.Identifier,
|
||||
Parent = transforms.HNMReferenceFrame.Identifier,
|
||||
--wrong Parent = sunTransforms.SunIAU.Identifier,
|
||||
Renderable = {
|
||||
Type = "RenderableFieldlinesSequence",
|
||||
SourceFolder = fieldlinesDirectory,
|
||||
@@ -64,6 +64,12 @@ local fieldlines = {
|
||||
Type = "StaticScale",
|
||||
Scale = sunRadius
|
||||
},
|
||||
Rotation = {
|
||||
Type = "FixedRotation",
|
||||
XAxis = {-0.63338087262755016203262119192353, -0.77384020972650618518999944537717, 0.0},
|
||||
YAxis = {0.77384020972650618518999944537717, -0.63338087262755016203262119192353, 0.0},
|
||||
ZAxis = {0.0, 0.0, 1.0}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -15,7 +15,7 @@ local TexturesPath = asset.syncedResource({
|
||||
Name = "Bastille Day Magnetogram",
|
||||
Type = "HttpSynchronization",
|
||||
Identifier = "bastille_day_magnetogram",
|
||||
Version = 1
|
||||
Version = 2
|
||||
})
|
||||
|
||||
asset.export("TexturesPath", TexturesPath)
|
||||
|
||||
+15
@@ -0,0 +1,15 @@
|
||||
|
||||
width 10
|
||||
lower 0.0
|
||||
upper 1.0
|
||||
|
||||
mappingkey 0.0 1 1 4 255
|
||||
mappingkey 0.083 30 30 100 255
|
||||
mappingkey 0.166 60 38 164 255
|
||||
mappingkey 0.332 106 43 167 255
|
||||
mappingkey 0.415 173 54 110 255
|
||||
mappingkey 0.498 253 64 40 255
|
||||
mappingkey 0.664 234 117 6 255
|
||||
mappingkey 0.830 230 169 16 255
|
||||
mappingkey 0.915 236 236 159 255
|
||||
mappingkey 1.0 251 251 235 255
|
||||
Reference in New Issue
Block a user