From 892a474a200b62f116769bf65375b10de8ac6677 Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Tue, 26 Mar 2024 01:12:56 +0100 Subject: [PATCH] Move Sun light source specification from sun.asset to transforms.asset --- data/assets/educational/scale/arc_de_triomphe.asset | 2 +- data/assets/educational/scale/big_ben.asset | 2 +- data/assets/educational/scale/burj_khalifa.asset | 2 +- data/assets/educational/scale/eiffeltower.asset | 2 +- .../educational/scale/empire_state_building.asset | 2 +- data/assets/educational/scale/gateway_arch.asset | 2 +- .../educational/scale/golden_gate_bridge.asset | 2 +- .../educational/scale/kuala_lumpur_tower.asset | 2 +- data/assets/educational/scale/rose_bowl.asset | 2 +- data/assets/educational/scale/school_bus.asset | 2 +- data/assets/educational/scale/scientist.asset | 2 +- .../educational/scale/statue_of_liberty.asset | 2 +- data/assets/examples/animation.asset | 2 +- data/assets/examples/approachevents.asset | 2 +- .../geojson/geojson_extruded_shaded_polygon.asset | 2 +- data/assets/examples/globerotation.asset | 2 +- data/assets/examples/globetranslation.asset | 2 +- .../scene/milkyway/objects/orionnebula/nebula.asset | 2 +- .../solarsystem/dwarf_planets/eris/planet.asset | 2 +- .../solarsystem/dwarf_planets/gonggong/planet.asset | 1 - .../solarsystem/dwarf_planets/haumea/planet.asset | 2 +- .../solarsystem/dwarf_planets/makemake/planet.asset | 2 +- .../solarsystem/dwarf_planets/orcus/planet.asset | 2 +- .../solarsystem/dwarf_planets/sedna/planet.asset | 1 - .../solarsystem/dwarf_planets/vesta/planet.asset | 2 +- .../solarsystem/missions/apollo/11/apollo11.asset | 2 +- .../scene/solarsystem/missions/apollo/11/lem.asset | 2 +- .../solarsystem/missions/apollo/15/apollo15.asset | 2 +- .../missions/apollo/17/bouldersstation2.asset | 2 +- .../missions/apollo/17/bouldersstation6.asset | 2 +- .../missions/apollo/17/bouldersstation7.asset | 2 +- .../scene/solarsystem/missions/apollo/17/lem.asset | 2 +- .../missions/apollo/8/launch_model.asset | 2 +- .../scene/solarsystem/missions/apollo/8/model.asset | 2 +- .../scene/solarsystem/missions/artemis/model.asset | 2 +- .../solarsystem/missions/bepicolombo/model.asset | 2 +- .../scene/solarsystem/missions/dawn/dawn.asset | 2 +- .../scene/solarsystem/missions/insight/edl.asset | 2 +- .../scene/solarsystem/missions/juno/juno.asset | 2 +- .../solarsystem/missions/messenger/messenger.asset | 2 +- .../solarsystem/missions/newhorizons/model.asset | 2 +- .../solarsystem/missions/osirisrex/bennu.asset | 2 +- .../solarsystem/missions/osirisrex/model.asset | 2 +- .../solarsystem/missions/perseverance/model.asset | 2 +- .../solarsystem/missions/pioneer/pioneermodel.asset | 2 +- .../solarsystem/missions/rosetta/rosetta.asset | 2 +- .../solarsystem/missions/voyager/voyager1.asset | 5 ++--- .../solarsystem/missions/voyager/voyager2.asset | 5 ++--- .../planets/earth/satellites/misc/iss.asset | 2 +- .../planets/earth/satellites/misc/tiangong.asset | 2 +- .../solarsystem/planets/mars/moons/deimos.asset | 2 +- .../solarsystem/planets/mars/moons/phobos.asset | 2 +- data/assets/scene/solarsystem/sssb/itokawa.asset | 3 +-- data/assets/scene/solarsystem/sun/sun.asset | 13 +++++-------- data/assets/scene/solarsystem/sun/transforms.asset | 8 ++++++++ .../scene/solarsystem/telescopes/euclid/model.asset | 2 +- .../scene/solarsystem/telescopes/gaia/gaia.asset | 2 +- .../scene/solarsystem/telescopes/jwst/jwst.asset | 3 +-- 58 files changed, 69 insertions(+), 70 deletions(-) diff --git a/data/assets/educational/scale/arc_de_triomphe.asset b/data/assets/educational/scale/arc_de_triomphe.asset index 1669995813..a3d0b5eb8d 100644 --- a/data/assets/educational/scale/arc_de_triomphe.asset +++ b/data/assets/educational/scale/arc_de_triomphe.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/big_ben.asset b/data/assets/educational/scale/big_ben.asset index 20cce7e0e2..327711fd91 100644 --- a/data/assets/educational/scale/big_ben.asset +++ b/data/assets/educational/scale/big_ben.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/burj_khalifa.asset b/data/assets/educational/scale/burj_khalifa.asset index 5215a971d7..762af22a95 100644 --- a/data/assets/educational/scale/burj_khalifa.asset +++ b/data/assets/educational/scale/burj_khalifa.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/eiffeltower.asset b/data/assets/educational/scale/eiffeltower.asset index 5495949158..99c4aaae31 100644 --- a/data/assets/educational/scale/eiffeltower.asset +++ b/data/assets/educational/scale/eiffeltower.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/empire_state_building.asset b/data/assets/educational/scale/empire_state_building.asset index eec3bf3c24..21eb832497 100644 --- a/data/assets/educational/scale/empire_state_building.asset +++ b/data/assets/educational/scale/empire_state_building.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/gateway_arch.asset b/data/assets/educational/scale/gateway_arch.asset index 3946149d10..973d4ef50b 100644 --- a/data/assets/educational/scale/gateway_arch.asset +++ b/data/assets/educational/scale/gateway_arch.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/golden_gate_bridge.asset b/data/assets/educational/scale/golden_gate_bridge.asset index 75df110e7f..6c15a3e2e7 100644 --- a/data/assets/educational/scale/golden_gate_bridge.asset +++ b/data/assets/educational/scale/golden_gate_bridge.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/kuala_lumpur_tower.asset b/data/assets/educational/scale/kuala_lumpur_tower.asset index 3d64296e95..f872ae5b45 100644 --- a/data/assets/educational/scale/kuala_lumpur_tower.asset +++ b/data/assets/educational/scale/kuala_lumpur_tower.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/rose_bowl.asset b/data/assets/educational/scale/rose_bowl.asset index 46e30ccf9f..ddf3019dc0 100644 --- a/data/assets/educational/scale/rose_bowl.asset +++ b/data/assets/educational/scale/rose_bowl.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/school_bus.asset b/data/assets/educational/scale/school_bus.asset index ef2875b6a9..3e6c95f75a 100644 --- a/data/assets/educational/scale/school_bus.asset +++ b/data/assets/educational/scale/school_bus.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/scientist.asset b/data/assets/educational/scale/scientist.asset index 621654dea5..c67a7cc94a 100644 --- a/data/assets/educational/scale/scientist.asset +++ b/data/assets/educational/scale/scientist.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/educational/scale/statue_of_liberty.asset b/data/assets/educational/scale/statue_of_liberty.asset index e40bf4a21a..8688e777dd 100644 --- a/data/assets/educational/scale/statue_of_liberty.asset +++ b/data/assets/educational/scale/statue_of_liberty.asset @@ -1,5 +1,5 @@ local earthAsset = asset.require("scene/solarsystem/planets/earth/earth") -local sunAsset = asset.require("scene/solarsystem/sun/sun") +local sunAsset = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/examples/animation.asset b/data/assets/examples/animation.asset index 6406ae0e96..ed70f9b6bd 100644 --- a/data/assets/examples/animation.asset +++ b/data/assets/examples/animation.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("scene/solarsystem/planets/earth/transforms") diff --git a/data/assets/examples/approachevents.asset b/data/assets/examples/approachevents.asset index 46e71fd254..6083ab4ccb 100644 --- a/data/assets/examples/approachevents.asset +++ b/data/assets/examples/approachevents.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("scene/solarsystem/planets/earth/transforms") diff --git a/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset b/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset index f192dec785..7efae986d7 100644 --- a/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset +++ b/data/assets/examples/geojson/geojson_extruded_shaded_polygon.asset @@ -1,5 +1,5 @@ local earth = asset.require("scene/solarsystem/planets/earth/earth") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset index 25bfe9258f..f3b903fc5f 100644 --- a/data/assets/examples/globerotation.asset +++ b/data/assets/examples/globerotation.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local earth = asset.require("scene/solarsystem/planets/earth/earth") diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset index 7cccfb64f5..e1006b2cd4 100644 --- a/data/assets/examples/globetranslation.asset +++ b/data/assets/examples/globetranslation.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local earth = asset.require("scene/solarsystem/planets/earth/earth") diff --git a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset index 0845c6dfae..5c6d4bbd20 100644 --- a/data/assets/scene/milkyway/objects/orionnebula/nebula.asset +++ b/data/assets/scene/milkyway/objects/orionnebula/nebula.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset index 29248d81fd..8d49133b3f 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/eris/planet.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset index e07a4d695f..4bcc0d6d2f 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/gonggong/planet.asset @@ -1,4 +1,3 @@ -local sun = asset.require("scene/solarsystem/sun/sun") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset index 6f3acf92ff..3737f5c710 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/haumea/planet.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset index 22e1780f5b..c2072f119f 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/makemake/planet.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset index a96bfc62e8..6805642f4f 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/orcus/planet.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset index 1ca65a678d..795c7fe36f 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/sedna/planet.asset @@ -1,4 +1,3 @@ -local sun = asset.require("scene/solarsystem/sun/sun") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset b/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset index 25c6c13c16..ea5bda4d06 100644 --- a/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset +++ b/data/assets/scene/solarsystem/dwarf_planets/vesta/planet.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset index 94bc748185..aa059a69ba 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/apollo11.asset @@ -1,6 +1,6 @@ asset.require("../actions") asset.require("./actions") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon") local descentKeyframes = asset.require("./lem_descent") local descentRotationKeyframes = asset.require("./lem_descent_rotation") diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset index 74e36012d0..dfdf7e861e 100644 --- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset +++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local moon_asset = asset.require("scene/solarsystem/planets/earth/moon/moon") diff --git a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset index 73aeabc4f4..acfae57516 100644 --- a/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset +++ b/data/assets/scene/solarsystem/missions/apollo/15/apollo15.asset @@ -1,6 +1,6 @@ asset.require("../actions") local moonTransforms = asset.require("scene/solarsystem/planets/earth/moon/moon") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset index a00bc27562..c082eaac53 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation2.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon") diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset index 3626401732..b971c3dbe2 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation6.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon") diff --git a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset index bcaa71aa44..9ddf9748e8 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/bouldersstation7.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon") diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset index a5b5189c44..d1a8daca1e 100644 --- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset +++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local moonAsset = asset.require("scene/solarsystem/planets/earth/moon/moon") diff --git a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset index 5ea9f835e5..b231d1ffb8 100644 --- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset @@ -1,5 +1,5 @@ local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset index ca61a6c91e..a4f89cff77 100644 --- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset +++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset @@ -1,5 +1,5 @@ local earth_transforms = asset.require("scene/solarsystem/planets/earth/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/artemis/model.asset b/data/assets/scene/solarsystem/missions/artemis/model.asset index 8d7e8665df..1d3cd6974b 100644 --- a/data/assets/scene/solarsystem/missions/artemis/model.asset +++ b/data/assets/scene/solarsystem/missions/artemis/model.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") diff --git a/data/assets/scene/solarsystem/missions/bepicolombo/model.asset b/data/assets/scene/solarsystem/missions/bepicolombo/model.asset index 05aec4d10e..d0d4fd8db5 100644 --- a/data/assets/scene/solarsystem/missions/bepicolombo/model.asset +++ b/data/assets/scene/solarsystem/missions/bepicolombo/model.asset @@ -1,5 +1,5 @@ local transform = asset.require("scene/solarsystem/sun/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/dawn/dawn.asset b/data/assets/scene/solarsystem/missions/dawn/dawn.asset index 3a841bdb9d..07984361d6 100644 --- a/data/assets/scene/solarsystem/missions/dawn/dawn.asset +++ b/data/assets/scene/solarsystem/missions/dawn/dawn.asset @@ -1,6 +1,6 @@ asset.require("scene/solarsystem/missions/dawn/mission") local transforms = asset.require("scene/solarsystem/sun/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/insight/edl.asset b/data/assets/scene/solarsystem/missions/insight/edl.asset index 0e69fdb4a2..039f473695 100644 --- a/data/assets/scene/solarsystem/missions/insight/edl.asset +++ b/data/assets/scene/solarsystem/missions/insight/edl.asset @@ -1,6 +1,6 @@ asset.require("./actions") asset.require("scene/solarsystem/planets/mars/default_layers") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local mars = asset.require("scene/solarsystem/planets/mars/mars") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/juno/juno.asset b/data/assets/scene/solarsystem/missions/juno/juno.asset index 2dd5272206..89eef4a490 100644 --- a/data/assets/scene/solarsystem/missions/juno/juno.asset +++ b/data/assets/scene/solarsystem/missions/juno/juno.asset @@ -1,7 +1,7 @@ asset.require("scene/solarsystem/missions/juno/mission") asset.require("scene/solarsystem/planets/jupiter/layers/colorlayers/jupiter_video") local transforms = asset.require("scene/solarsystem/planets/jupiter/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/messenger/messenger.asset b/data/assets/scene/solarsystem/missions/messenger/messenger.asset index e2b6821054..e779b7177c 100644 --- a/data/assets/scene/solarsystem/missions/messenger/messenger.asset +++ b/data/assets/scene/solarsystem/missions/messenger/messenger.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") local mercuryTransforms = asset.require("scene/solarsystem/planets/mercury/transforms") local kernels = asset.require("./kernels") diff --git a/data/assets/scene/solarsystem/missions/newhorizons/model.asset b/data/assets/scene/solarsystem/missions/newhorizons/model.asset index da1e5f6901..f6e3ef6109 100644 --- a/data/assets/scene/solarsystem/missions/newhorizons/model.asset +++ b/data/assets/scene/solarsystem/missions/newhorizons/model.asset @@ -1,5 +1,5 @@ local transforms = asset.require("./transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset index 9c7e223645..bafdcab1f2 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/bennu.asset @@ -1,5 +1,5 @@ local transforms = asset.require("./transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/osirisrex/model.asset b/data/assets/scene/solarsystem/missions/osirisrex/model.asset index 2d1da05bc7..ac98b5bee2 100644 --- a/data/assets/scene/solarsystem/missions/osirisrex/model.asset +++ b/data/assets/scene/solarsystem/missions/osirisrex/model.asset @@ -1,5 +1,5 @@ local transforms = asset.require("./transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") local earthTransforms = asset.require("scene/solarsystem/planets/earth/transforms") local kernels = asset.require("./kernels") diff --git a/data/assets/scene/solarsystem/missions/perseverance/model.asset b/data/assets/scene/solarsystem/missions/perseverance/model.asset index dc2cc3d92b..36a73de73a 100644 --- a/data/assets/scene/solarsystem/missions/perseverance/model.asset +++ b/data/assets/scene/solarsystem/missions/perseverance/model.asset @@ -1,6 +1,6 @@ local trail = asset.require("./trail") local marsTransforms = asset.require("scene/solarsystem/planets/mars/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset index ce63f52782..b1a7935e87 100644 --- a/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset +++ b/data/assets/scene/solarsystem/missions/pioneer/pioneermodel.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset index c2bed9f39b..a531ac30a0 100644 --- a/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset +++ b/data/assets/scene/solarsystem/missions/rosetta/rosetta.asset @@ -1,4 +1,4 @@ -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./67p") local kernels = asset.require("./kernels") diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset index 0fafe2af1d..0ed2011173 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager1.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager1.asset @@ -1,4 +1,3 @@ -local sun = asset.require("scene/solarsystem/sun/sun") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") local coreKernels = asset.require("spice/core") @@ -73,7 +72,7 @@ local Voyager1Main = { GeometryFile = models .. "voyager-main.obj", ModelTransform = RotationMatrix, LightSources = { - sun.LightSource, + sunTransforms.LightSource, { Identifier = "Camera", Type = "CameraLightSource", @@ -97,7 +96,7 @@ local Voyager1Antenna = { GeometryFile = models .. "voyager-antenna.obj", ModelTransform = RotationMatrix, LightSources = { - sun.LightSource, + sunTransforms.LightSource, { Identifier = "Camera", Type = "CameraLightSource", diff --git a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset index 169d7fbe06..a521bbeb2d 100644 --- a/data/assets/scene/solarsystem/missions/voyager/voyager2.asset +++ b/data/assets/scene/solarsystem/missions/voyager/voyager2.asset @@ -1,4 +1,3 @@ -local sun = asset.require("scene/solarsystem/sun/sun") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") local coreKernels = asset.require("spice/core") @@ -76,7 +75,7 @@ local Voyager2Main = { GeometryFile = models .. "voyager-main.obj", ModelTransform = RotationMatrix, LightSources = { - sun.LightSource, + sunTransforms.LightSource, { Identifier = "Camera", Type = "CameraLightSource", @@ -100,7 +99,7 @@ local Voyager2Antenna = { GeometryFile = models .. "voyager-antenna.obj", ModelTransform = RotationMatrix, LightSources = { - sun.LightSource, + sunTransforms.LightSource, { Identifier = "Camera", Type = "CameraLightSource", diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset index a62df31c6f..b920308d81 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/iss.asset @@ -1,5 +1,5 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset index 7e38ed719e..620f7b2ce9 100644 --- a/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset +++ b/data/assets/scene/solarsystem/planets/earth/satellites/misc/tiangong.asset @@ -1,5 +1,5 @@ local transforms = asset.require("scene/solarsystem/planets/earth/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset index b4d428b8cf..f8fa99883e 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/deimos.asset @@ -1,6 +1,6 @@ local transforms = asset.require("scene/solarsystem/planets/mars/transforms") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset index 8e3fb4ecd8..f40f8e6bce 100644 --- a/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset +++ b/data/assets/scene/solarsystem/planets/mars/moons/phobos.asset @@ -1,6 +1,6 @@ local transforms = asset.require("scene/solarsystem/planets/mars/transforms") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/sssb/itokawa.asset b/data/assets/scene/solarsystem/sssb/itokawa.asset index 758ff32a7f..ce47b20119 100644 --- a/data/assets/scene/solarsystem/sssb/itokawa.asset +++ b/data/assets/scene/solarsystem/sssb/itokawa.asset @@ -1,5 +1,4 @@ local sunTransforms = asset.require("scene/solarsystem/sun/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") @@ -68,7 +67,7 @@ local ItokawaModel = { Type = "RenderableModel", GeometryFile = model .. "itokawa.glb", LightSources = { - sun.LightSource + sunTransforms.LightSource }, PerformShading = true, SpecularIntensity = 0.0 diff --git a/data/assets/scene/solarsystem/sun/sun.asset b/data/assets/scene/solarsystem/sun/sun.asset index e50dc5ace6..5188eb0748 100644 --- a/data/assets/scene/solarsystem/sun/sun.asset +++ b/data/assets/scene/solarsystem/sun/sun.asset @@ -11,6 +11,11 @@ local Sun = { Radii = { 695700000, 695700000, 695700000 }, SegmentsPerPatch = 64, Layers = {}, + LightSource = { + Identifier = "Camera", + Type = "CameraLightSource", + Intensity = 1.0 + }, PerformShading = false }, ApproachFactor = 15.0, @@ -46,13 +51,6 @@ local SunLabel = { } } -local LightSource = { - Type = "SceneGraphLightSource", - Identifier = "Sun", - Node = Sun.Identifier, - Intensity = 1.0 -} - asset.onInitialize(function() openspace.addSceneGraphNode(Sun) @@ -66,7 +64,6 @@ end) asset.export(Sun) asset.export(SunLabel) -asset.export("LightSource", LightSource) diff --git a/data/assets/scene/solarsystem/sun/transforms.asset b/data/assets/scene/solarsystem/sun/transforms.asset index 5bd3152753..173973ad9b 100644 --- a/data/assets/scene/solarsystem/sun/transforms.asset +++ b/data/assets/scene/solarsystem/sun/transforms.asset @@ -81,6 +81,13 @@ local SunEclipJ2000 = { } } +local LightSource = { + Type = "SceneGraphLightSource", + Identifier = "Sun", + Node = SunIAU.Identifier, + Intensity = 1.0 +} + asset.onInitialize(function() openspace.addSceneGraphNode(SolarSystemBarycenter) @@ -100,6 +107,7 @@ asset.export(SolarSystemBarycenter) asset.export(SunCenter) asset.export(SunIAU) asset.export(SunEclipJ2000) +asset.export("LightSource", LightSource) diff --git a/data/assets/scene/solarsystem/telescopes/euclid/model.asset b/data/assets/scene/solarsystem/telescopes/euclid/model.asset index a809d2f482..1b2f2976aa 100644 --- a/data/assets/scene/solarsystem/telescopes/euclid/model.asset +++ b/data/assets/scene/solarsystem/telescopes/euclid/model.asset @@ -1,5 +1,5 @@ local transform = asset.require("scene/solarsystem/planets/earth/transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") local kernels = asset.require("./kernels") local coreKernels = asset.require("spice/core") diff --git a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset index de2a916640..7a141b65c9 100644 --- a/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset +++ b/data/assets/scene/solarsystem/telescopes/gaia/gaia.asset @@ -1,5 +1,5 @@ local transforms = asset.require("./transforms") -local sun = asset.require("scene/solarsystem/sun/sun") +local sun = asset.require("scene/solarsystem/sun/transforms") diff --git a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset index 333329a0bd..e6a242a38b 100644 --- a/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset +++ b/data/assets/scene/solarsystem/telescopes/jwst/jwst.asset @@ -1,6 +1,5 @@ asset.require("./actions") asset.require("./mission") -local sun = asset.require("scene/solarsystem/sun/sun") local sunTransforms = asset.require("scene/solarsystem/sun/transforms") local transforms = asset.require("./transforms") @@ -74,7 +73,7 @@ local JWSTModel = { AnimationTimeScale = "Millisecond", AnimationMode = "Once", LightSources = { - sun.LightSource + sunTransforms.LightSource }, PerformShading = true },