mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix inconsistent naming of imported moon asset in moon mission assets

Browse Source 
And import asset in trail keyframe asset
This commit is contained in:
Emma Broman
2025-06-05 10:43:32 +02:00
parent 1c8cb30b12
commit 1278ab69a0
11 changed files with 267 additions and 266 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset
View File

@@ -1,7 +1,7 @@
asset.require("../actions")
asset.require("./actions")
local sun = asset.require("scene/solarsystem/sun/transforms")
local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
local descentKeyframes = asset.require("./lem_descent")
local descentRotationKeyframes = asset.require("./lem_descent_rotation")
local kernels = asset.require("./kernels")
@@ -28,7 +28,7 @@ local lemModel = asset.resource({
local Apollo11Position = {
Identifier = "Apollo11Position",
Parent = moonTransforms.Moon.Identifier,
Parent = moon.Moon.Identifier,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "1969 JUL 19 19:38:29.183",
@@ -83,7 +83,7 @@ local Apollo11Model = {
local Apollo11MoonTrail = {
Identifier = "Apollo11MoonTrail",
Parent = moonTransforms.Moon.Identifier,
Parent = moon.Moon.Identifier,
Renderable = {
Type = "RenderableTrailTrajectory",
Enabled = false,
@@ -132,7 +132,7 @@ local lemRotation = {
local Apollo11LemTrail = {
Identifier = "Apollo11LemTrail",
Parent = moonTransforms.Moon.Identifier,
Parent = moon.Moon.Identifier,
Renderable = {
Type = "RenderableTrailTrajectory",
Enabled = false,
@@ -152,7 +152,7 @@ local Apollo11LemTrail = {
local Apollo11LemPosition = {
Identifier = "Apollo11LemPosition",
Parent = moonTransforms.Moon.Identifier,
Parent = moon.Moon.Identifier,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "1969 JUL 20 19:10:25.183"

8
data/assets/scene/solarsystem/missions/apollo/11/lem.asset
View File

@@ -1,5 +1,5 @@
local sun = asset.require("scene/solarsystem/sun/transforms")
local moon_asset = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
@@ -13,11 +13,11 @@ local lem_model = asset.resource({
local Apollo11Lem = {
Identifier = "Apollo11Lem",
Parent = moon_asset.Moon.Identifier,
Parent = moon.Moon.Identifier,
Transform = {
Translation = {
Type = "GlobeTranslation",
Globe = moon_asset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = 23.47306,
Latitude = 0.67402,
Altitude = -1927.65,
@@ -25,7 +25,7 @@ local Apollo11Lem = {
},
Rotation = {
Type = "GlobeRotation",
Globe = moon_asset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = 23.47306,
Latitude = 0.67402
}

455
data/assets/scene/solarsystem/missions/apollo/11/lem_descent.asset
View File

File diff suppressed because it is too large Load Diff

4
data/assets/scene/solarsystem/missions/apollo/11/lem_flipbook.asset
View File

@@ -1,10 +1,10 @@
local helper = asset.require("util/vrt_flipbook_helper")
local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
local assetPrefix = "A11flip"
local assetGlobe = moonAsset.Moon.Identifier
local assetGlobe = moon.Moon.Identifier
local flipbookCount = 19
local flipbook = nil

6
data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset
View File

@@ -1,5 +1,5 @@
asset.require("../actions")
local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
local sun = asset.require("scene/solarsystem/sun/transforms")
local kernels = asset.require("./kernels")
local coreKernels = asset.require("spice/core")
@@ -16,7 +16,7 @@ local models = asset.resource({
local Apollo15 = {
Identifier = "Apollo15",
Parent = moonTransforms.Moon.Identifier,
Parent = moon.Moon.Identifier,
TimeFrame = {
Type = "TimeFrameInterval",
Start = "1971-07-30T02:22:00.00",
@@ -52,7 +52,7 @@ local Apollo15 = {
local Apollo15Trail = {
Identifier = "Apollo15Trail",
Parent = moonTransforms.Moon.Identifier,
Parent = moon.Moon.Identifier,
Renderable = {
Type = "RenderableTrailTrajectory",
Translation = {

14
data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset
View File

@@ -1,5 +1,5 @@
local sun = asset.require("scene/solarsystem/sun/transforms")
local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
@@ -13,11 +13,11 @@ local models = asset.resource({
local Station2Boulder1Holder = {
Identifier = "Station_2_Boulder1",
Parent = moonAsset.Moon.Identifier,
Parent = moon.Moon.Identifier,
Transform = {
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = -360 + 30.5294692,
Latitude = 20.098824,
Altitude = -2442.8,
@@ -62,11 +62,11 @@ local Station2Boulder1Model = {
local Station2Boulder2Holder = {
Identifier = "Station_2_Boulder2",
Parent = moonAsset.Moon.Identifier,
Parent = moon.Moon.Identifier,
Transform = {
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = -360 + 30.5287892,
Latitude = 20.098240,
Altitude = -2434.6,
@@ -111,11 +111,11 @@ local Station2Boulder2Model = {
local Station2Boulder3Holder = {
Identifier = "Station_2_Boulder3",
Parent = moonAsset.Moon.Identifier,
Parent = moon.Moon.Identifier,
Transform = {
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = -360 + 30.5294692,
Latitude = 20.098610,
Altitude = -2441.55,

14
data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset
View File

@@ -1,5 +1,5 @@
local sun = asset.require("scene/solarsystem/sun/transforms")
local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
@@ -13,11 +13,11 @@ local models = asset.resource({
local Station6Frag1Holder = {
Identifier = "Station_6_Fragment1",
Parent = moonAsset.Moon.Identifier,
Parent = moon.Moon.Identifier,
Transform = {
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = -360 + 30.80068,
Latitude = 20.2903,
Altitude = -2562.6,
@@ -36,7 +36,7 @@ local Station6Frag1Model = {
Transform = {
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = -360 + 30.8007,
Latitude = 20.2903,
Altitude = -2562.6,
@@ -70,7 +70,7 @@ local Station6Frag1Model = {
local Station6Frag23Holder = {
Identifier = "Station_6_Fragments_2_3",
Parent = moonAsset.Moon.Identifier,
Parent = moon.Moon.Identifier,
GUI = {
Name = "Station 6 Fragments 2 & 3 Holder",
Path = "/Solar System/Missions/Apollo/17/Station 6"
@@ -87,7 +87,7 @@ local Station6Frag2Model = {
},
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = -360 + 30.80055,
Latitude = 20.289808,
Altitude = -2566.5,
@@ -125,7 +125,7 @@ local Station6Frag3Model = {
},
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = -360 + 30.80053,
Latitude = 20.29030,
Altitude = -2563.0,

6
data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset
View File

@@ -1,5 +1,5 @@
local sun = asset.require("scene/solarsystem/sun/transforms")
local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
@@ -13,11 +13,11 @@ local models = asset.resource({
local Station7BoulderHolder = {
Identifier = "Station_7_Boulder",
Parent = moonAsset.Moon.Identifier,
Parent = moon.Moon.Identifier,
Transform = {
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = -360 + 30.8165882,
Latitude = 20.2908556,
Altitude = -2593.5,

8
data/assets/scene/solarsystem/missions/apollo/17/lem.asset
View File

@@ -1,5 +1,5 @@
local sun = asset.require("scene/solarsystem/sun/transforms")
local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
@@ -13,18 +13,18 @@ local model = asset.resource({
local Apollo17Lem = {
Identifier = "Apollo17Lem",
Parent = moonAsset.Moon.Identifier,
Parent = moon.Moon.Identifier,
Transform = {
Translation = {
Type = "GlobeTranslation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = 30.77167,
Latitude = 20.19092,
UseHeightmap = true
},
Rotation = {
Type = "GlobeRotation",
Globe = moonAsset.Moon.Identifier,
Globe = moon.Moon.Identifier,
Longitude = 30.77167,
Latitude = 20.19092
}

4
data/assets/scene/solarsystem/missions/apollo/8/trails.asset
View File

@@ -1,5 +1,5 @@
local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms")
local moon_transforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
local kernels = asset.require("./kernels")
local coreKernels = asset.require("spice/core")
@@ -31,7 +31,7 @@ local LaunchTrail = {
local MoonTrail = {
Identifier = "Apollo8MoonTrail",
Parent = moon_transforms.Moon.Identifier,
Parent = moon.Moon.Identifier,
Renderable = {
Type = "RenderableTrailTrajectory",
Enabled = false,

4
data/assets/scene/solarsystem/missions/artemis/trail.asset
View File

@@ -1,5 +1,5 @@
local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms")
local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon")
local moon = asset.require("scene/solarsystem/planets/earth/moon/moon")
local kernels = asset.require("./kernels")
local coreKernels = asset.require("spice/core")
@@ -32,7 +32,7 @@ local ArtemisEarthTrail = {
local ArtemisMoonTrail = {
Identifier = "ArtemisMoonTrail",
Parent = moonTransforms.Moon.Identifier,
Parent = moon.Moon.Identifier,
Renderable = {
Type = "RenderableTrailTrajectory",
Translation = {