diff --git a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset index 29a7d0495e..9c3a5b99ba 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/jupiter.asset @@ -5,7 +5,7 @@ asset.require('./trail') local Jupiter = { Identifier = "Jupiter", - Parent = transforms.JupiterBarycenter.Identifier, + Parent = transforms.JupiterCenter.Identifier, Transform = { Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail.asset b/data/assets/scene/solarsystem/planets/jupiter/trail.asset index 7f5c7347b1..ef0ea4dc2a 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail.asset @@ -11,8 +11,8 @@ local JupiterTrail = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "JUPITER BARYCENTER", - Observer = "SUN" + Target = "JUPITER", + Observer = "SSB" }, Color = { 0.8, 0.7, 0.7 }, Period = 4330.595, diff --git a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset index 50dd1cf706..bffd3012b4 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/trail_earth.asset @@ -12,7 +12,7 @@ local JupiterTrailEarth = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "JUPITER BARYCENTER", + Target = "JUPITER", Observer = "EARTH" }, Color = { 1.0, 0.5, 0.2 }, diff --git a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset index 371cad76da..67811c0e29 100644 --- a/data/assets/scene/solarsystem/planets/jupiter/transforms.asset +++ b/data/assets/scene/solarsystem/planets/jupiter/transforms.asset @@ -21,15 +21,32 @@ local JupiterBarycenter = { } } -assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterBarycenter }) +local JupiterCenter = { + Identifier = "JupiterCenter", + Parent = JupiterBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "JUPITER", + Observer = "JUPITER BARYCENTER" + } + }, + GUI = { + Name = "Jupiter Center", + Path = "/Solar System/Planets/Jupiter", + Hidden = true + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { JupiterBarycenter, JupiterCenter }) asset.meta = { Name = "Jupiter Transforms", Version = "1.0", - Description = [[ Jupiter Barycenter transform]], + Description = [[ Jupiter Barycenter and Center transform ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = {"JupiterBarycenter"} + Identifiers = {"JupiterBarycenter", "JupiterCenter"} } diff --git a/data/assets/scene/solarsystem/planets/mars/mars.asset b/data/assets/scene/solarsystem/planets/mars/mars.asset index 977d986e99..e90fefb9d2 100644 --- a/data/assets/scene/solarsystem/planets/mars/mars.asset +++ b/data/assets/scene/solarsystem/planets/mars/mars.asset @@ -9,7 +9,7 @@ local marsRadii = { 3396190.0, 3396190.0, 3396190.0 } local Mars = { Identifier = "Mars", - Parent = transforms.MarsBarycenter.Identifier, + Parent = transforms.MarsCenter.Identifier, Transform = { Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/mars/trail.asset b/data/assets/scene/solarsystem/planets/mars/trail.asset index 1922c582ea..78e8eea805 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail.asset @@ -11,8 +11,8 @@ local MarsTrail = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "MARS BARYCENTER", - Observer = "SUN" + Target = "MARS", + Observer = "SSB" }, Color = { 0.814, 0.305, 0.220 }, Period = 686.973, diff --git a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset index 62286cbae2..0863042ef5 100644 --- a/data/assets/scene/solarsystem/planets/mars/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mars/trail_earth.asset @@ -12,7 +12,7 @@ local MarsTrailEarth = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "MARS BARYCENTER", + Target = "MARS", Observer = "EARTH" }, Color = { 1.0, 0.5, 0.2 }, diff --git a/data/assets/scene/solarsystem/planets/mars/transforms.asset b/data/assets/scene/solarsystem/planets/mars/transforms.asset index 7b8fb79dbf..45159a2487 100644 --- a/data/assets/scene/solarsystem/planets/mars/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mars/transforms.asset @@ -20,15 +20,33 @@ local MarsBarycenter = { } } -assetHelper.registerSceneGraphNodesAndExport(asset, { MarsBarycenter }) +local MarsCenter = { + Identifier = "MarsCenter", + Parent = MarsBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "MARS", + Observer = "MARS BARYCENTER" + } + }, + GUI = { + Name = "Mars Center", + Path = "/Solar System/Planets/Mars", + Hidden = true, + Description = [[ SPICE Translation for targeting Mars Center]], + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { MarsBarycenter, MarsCenter }) asset.meta = { Name = "Mars Transforms", Version = "1.0", - Description = [[ Transform with position for Mars.]], + Description = [[ Transforms with positions for Mars.]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = {"MarsBarycenter"} + Identifiers = {"MarsBarycenter", "MarsCenter"} } diff --git a/data/assets/scene/solarsystem/planets/mercury/mercury.asset b/data/assets/scene/solarsystem/planets/mercury/mercury.asset index ceb774f5ac..d1605b6b79 100644 --- a/data/assets/scene/solarsystem/planets/mercury/mercury.asset +++ b/data/assets/scene/solarsystem/planets/mercury/mercury.asset @@ -7,7 +7,7 @@ asset.require('./trail') local Mercury = { Identifier = "Mercury", - Parent = transforms.MercuryBarycenter.Identifier, + Parent = transforms.MercuryCenter.Identifier, Transform = { Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset index 1b0a35d935..1d44518f34 100644 --- a/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/mercury/trail_earth.asset @@ -12,7 +12,7 @@ local MercuryTrailEarth = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "MERCURY BARYCENTER", + Target = "MERCURY", Observer = "EARTH" }, Color = { 1.0, 0.5, 0.2 }, diff --git a/data/assets/scene/solarsystem/planets/mercury/transforms.asset b/data/assets/scene/solarsystem/planets/mercury/transforms.asset index 21b85f696b..834f61d7c8 100644 --- a/data/assets/scene/solarsystem/planets/mercury/transforms.asset +++ b/data/assets/scene/solarsystem/planets/mercury/transforms.asset @@ -8,8 +8,8 @@ local MercuryBarycenter = { Transform = { Translation = { Type = "SpiceTranslation", - Target = "MERCURY", - Observer = "SUN" + Target = "MERCURY BARYCENTER", + Observer = "SSB" } }, GUI = { @@ -20,15 +20,33 @@ local MercuryBarycenter = { } } -assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryBarycenter }) +local MercuryCenter = { + Identifier = "MercuryCenter", + Parent = MercuryBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "MERCURY", + Observer = "MERCURY BARYCENTER" + } + }, + GUI = { + Name = "Mercury Center", + Path = "/Solar System/Planets/Mercury", + Hidden = true, + Description = [[ Mercury Center position]], + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { MercuryBarycenter, MercuryCenter }) asset.meta = { Name = "Mercury Transforms", Version = "1.0", - Description = [[ Mercury Barycenter transform]], + Description = [[ Mercury Barycenter and Center transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = {"MercuryBarycenter"} + Identifiers = {"MercuryBarycenter", "MercuryCenter"} } diff --git a/data/assets/scene/solarsystem/planets/neptune/neptune.asset b/data/assets/scene/solarsystem/planets/neptune/neptune.asset index 5700797e14..e9a250dc68 100644 --- a/data/assets/scene/solarsystem/planets/neptune/neptune.asset +++ b/data/assets/scene/solarsystem/planets/neptune/neptune.asset @@ -5,7 +5,7 @@ asset.require('./trail') local Neptune = { Identifier = "Neptune", - Parent = transforms.NeptuneBarycenter.Identifier, + Parent = transforms.NeptuneCenter.Identifier, Transform = { Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/neptune/trail.asset b/data/assets/scene/solarsystem/planets/neptune/trail.asset index 86e554b33d..a20febb561 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail.asset @@ -11,8 +11,8 @@ local NeptuneTrail = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "NEPTUNE BARYCENTER", - Observer = "SUN" + Target = "NEPTUNE", + Observer = "SSB" }, Color = { 0.2, 0.5, 1.0 }, -- Period = 60200, diff --git a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset index 93b96735a5..520fc1a366 100644 --- a/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/neptune/trail_earth.asset @@ -12,7 +12,7 @@ local NeptuneTrailEarth = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "NEPTUNE BARYCENTER", + Target = "NEPTUNE", Observer = "EARTH" }, Color = { 1.0, 0.5, 0.2 }, diff --git a/data/assets/scene/solarsystem/planets/neptune/transforms.asset b/data/assets/scene/solarsystem/planets/neptune/transforms.asset index 6ad969535d..a463830fa6 100644 --- a/data/assets/scene/solarsystem/planets/neptune/transforms.asset +++ b/data/assets/scene/solarsystem/planets/neptune/transforms.asset @@ -20,15 +20,33 @@ local NeptuneBarycenter = { } } -assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneBarycenter }) +local NeptuneCenter = { + Identifier = "NeptuneCenter", + Parent = NeptuneBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "NEPTUNE", + Observer = "NEPTUNE BARYCENTER" + } + }, + GUI = { + Name = "Neptune Center", + Path = "/Solar System/Planets/Neptune", + Hidden = true, + Description = [[ Neptune Center position]], + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { NeptuneBarycenter, NeptuneCenter }) asset.meta = { Name = "Neptune Transforms", Version = "1.0", - Description = [[ Neptune Barycenter transform]], + Description = [[ Neptune Barycenter and Center transform ]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = {"NeptuneBarycenter"} + Identifiers = {"NeptuneBarycenter", "NeptuneCenter"} } diff --git a/data/assets/scene/solarsystem/planets/saturn/saturn.asset b/data/assets/scene/solarsystem/planets/saturn/saturn.asset index 8a92299d59..e7ce962fdc 100644 --- a/data/assets/scene/solarsystem/planets/saturn/saturn.asset +++ b/data/assets/scene/solarsystem/planets/saturn/saturn.asset @@ -7,7 +7,7 @@ local texturesPath = asset.require("./saturn_textures").TexturesPath local Saturn = { Identifier = "Saturn", - Parent = transforms.SaturnBarycenter.Identifier, + Parent = transforms.SaturnCenter.Identifier, Transform = { Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/saturn/trail.asset b/data/assets/scene/solarsystem/planets/saturn/trail.asset index 907eb7ae94..d2f09c1362 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail.asset @@ -10,8 +10,8 @@ local SaturnTrail = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "SATURN BARYCENTER", - Observer = "SUN" + Target = "SATURN", + Observer = "SSB" }, Color = { 0.85, 0.75, 0.51 }, Period = 10746.94, diff --git a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset index 90a686abbb..37f5fa26f8 100644 --- a/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/saturn/trail_earth.asset @@ -12,7 +12,7 @@ local SaturnTrailEarth = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "SATURN BARYCENTER", + Target = "SATURN", Observer = "EARTH" }, Color = { 1.0, 0.5, 0.2 }, diff --git a/data/assets/scene/solarsystem/planets/saturn/transforms.asset b/data/assets/scene/solarsystem/planets/saturn/transforms.asset index 066c700e44..1e0561e4f0 100644 --- a/data/assets/scene/solarsystem/planets/saturn/transforms.asset +++ b/data/assets/scene/solarsystem/planets/saturn/transforms.asset @@ -20,15 +20,33 @@ local SaturnBarycenter = { } } -assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnBarycenter }) +local SaturnCenter = { + Identifier = "SaturnCenter", + Parent = SaturnBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "SATURN", + Observer = "SATURN BARYCENTER" + } + }, + GUI = { + Name = "Saturn Center", + Path = "/Solar System/Planets/Saturn", + Hidden = true, + Description = [[ Saturn Center position]] + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { SaturnBarycenter, SaturnCenter }) asset.meta = { Name = "Saturn Transforms", Version = "1.0", - Description = [[ Saturn Barycenter transform]], + Description = [[ Saturn Barycenter and Center transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = {"SaturnBarycenter"} + Identifiers = {"SaturnBarycenter", "SaturnCenter"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/trail.asset b/data/assets/scene/solarsystem/planets/uranus/trail.asset index 76d6996599..ad24d25221 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail.asset @@ -10,8 +10,8 @@ local UranusTrail = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "URANUS BARYCENTER", - Observer = "SUN" + Target = "URANUS", + Observer = "SSB" }, Color = { 0.60, 0.95, 1.00 }, Period = 30588.740, diff --git a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset index 5c5d4d775d..b1589707e2 100644 --- a/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/uranus/trail_earth.asset @@ -12,7 +12,7 @@ local UranusTrailEarth = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "URANUS BARYCENTER", + Target = "URANUS", Observer = "EARTH" }, Color = { 1.0, 0.5, 0.2 }, diff --git a/data/assets/scene/solarsystem/planets/uranus/transforms.asset b/data/assets/scene/solarsystem/planets/uranus/transforms.asset index 8a01b2847b..f1fd8f99e8 100644 --- a/data/assets/scene/solarsystem/planets/uranus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/uranus/transforms.asset @@ -22,14 +22,33 @@ local UranusBarycenter = { } } -assetHelper.registerSceneGraphNodesAndExport(asset, { UranusBarycenter }) +local UranusCenter = { + Identifier = "UranusCenter", + Parent = UranusBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "URANUS", + Observer = "URANUS BARYCENTER" + } + }, + GUI = { + Name = "Uranus Center", + Path = "/Solar System/Planets/Uranus", + Hidden = true, + Description = [[ Uranus Center position]], + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { UranusBarycenter, UranusCenter }) asset.meta = { Name = "Uranus Transforms", Version = "1.0", - Description = [[ Uranus Barycenter transform]], + Description = [[ Uranus Barycenter and Center transform]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", - License = "MIT license" + License = "MIT license", + Identifiers = {"UranusBarycenter", "UranusCenter"} } diff --git a/data/assets/scene/solarsystem/planets/uranus/uranus.asset b/data/assets/scene/solarsystem/planets/uranus/uranus.asset index 80d6add8f7..74e30d0e68 100644 --- a/data/assets/scene/solarsystem/planets/uranus/uranus.asset +++ b/data/assets/scene/solarsystem/planets/uranus/uranus.asset @@ -5,7 +5,7 @@ asset.require('./trail') local Uranus = { Identifier = "Uranus", - Parent = transforms.UranusBarycenter.Identifier, + Parent = transforms.UranusCenter.Identifier, Transform = { Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/planets/venus/trail.asset b/data/assets/scene/solarsystem/planets/venus/trail.asset index 8abf07815f..5d0ad9fc1e 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail.asset @@ -11,8 +11,8 @@ local VenusTrail = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "VENUS BARYCENTER", - Observer = "SUN" + Target = "VENUS", + Observer = "SSB" }, Color = { 1.0, 0.5, 0.2 }, Period = 224.695, diff --git a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset index 3af7aecaaa..79e78aa2bb 100644 --- a/data/assets/scene/solarsystem/planets/venus/trail_earth.asset +++ b/data/assets/scene/solarsystem/planets/venus/trail_earth.asset @@ -11,7 +11,7 @@ local VenusTrailEarth = { Type = "RenderableTrailOrbit", Translation = { Type = "SpiceTranslation", - Target = "VENUS BARYCENTER", + Target = "VENUS", Observer = "EARTH" }, Color = { 1.0, 0.5, 0.2 }, diff --git a/data/assets/scene/solarsystem/planets/venus/transforms.asset b/data/assets/scene/solarsystem/planets/venus/transforms.asset index 79f947d1cc..672b7c28e2 100644 --- a/data/assets/scene/solarsystem/planets/venus/transforms.asset +++ b/data/assets/scene/solarsystem/planets/venus/transforms.asset @@ -20,15 +20,33 @@ local VenusBarycenter = { } } -assetHelper.registerSceneGraphNodesAndExport(asset, { VenusBarycenter }) +local VenusCenter = { + Identifier = "VenusCenter", + Parent = VenusBarycenter.Identifier, + Transform = { + Translation = { + Type = "SpiceTranslation", + Target = "VENUS", + Observer = "VENUS BARYCENTER" + } + }, + GUI = { + Name = "Venus Center", + Path = "/Solar System/Planets/Venus", + Hidden = true, + Description = "Position for Venus Center" + } +} + +assetHelper.registerSceneGraphNodesAndExport(asset, { VenusBarycenter, VenusCenter }) asset.meta = { Name = "Venus Transforms", Version = "1.0", - Description = [[ Spice translation for Venus Barycenter]], + Description = [[ Spice translation for Venus Barycenter and Center]], Author = "OpenSpace Team", URL = "http://openspaceproject.com", License = "MIT license", - Identifiers = {"VenusBarycenter"} + Identifiers = {"VenusBarycenter", "VenusCenter"} } diff --git a/data/assets/scene/solarsystem/planets/venus/venus.asset b/data/assets/scene/solarsystem/planets/venus/venus.asset index 2e1c74df2a..c261416f85 100644 --- a/data/assets/scene/solarsystem/planets/venus/venus.asset +++ b/data/assets/scene/solarsystem/planets/venus/venus.asset @@ -6,7 +6,7 @@ local labelsPath = asset.require('./venus_globelabels').LabelsPath local Venus = { Identifier = "Venus", - Parent = transforms.VenusBarycenter.Identifier, + Parent = transforms.VenusCenter.Identifier, Transform = { Rotation = { Type = "SpiceRotation", diff --git a/data/assets/scene/solarsystem/sun/glare.asset b/data/assets/scene/solarsystem/sun/glare.asset index c565d81004..5c20267d0b 100644 --- a/data/assets/scene/solarsystem/sun/glare.asset +++ b/data/assets/scene/solarsystem/sun/glare.asset @@ -7,7 +7,7 @@ asset.require("spice/base") local SunGlare = { Identifier = "SunGlare", - Parent = transforms.SolarSystemBarycenter.Identifier, + Parent = transforms.SunIAU.Identifier, Renderable = { Type = "RenderablePlaneImageLocal", Size = 1.3*10^10.5,