Move Sun light source specification from sun.asset to transforms.asset

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 
 

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")
 
 

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")
 
 

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")
 
 
 

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")
 
 

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")
 
 

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")
 
 

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")
 
 

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")
 
 

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")
 
 

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")
 
 

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")
 
 

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")
 
 

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")
 
 

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")

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")
 
 

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")
 

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")
 
 

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")
 
 

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")
 
 

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")
 
 

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")
 

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")
 

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")
 
 

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")
 

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")
 

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")

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")
 

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")

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")
 
 
 

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")
 

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")

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")
 

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")
 
 
 

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")

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",

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",

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")
 
 

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")
 
 

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")
 

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")
 

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

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)
 
 
 

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)
 
 
 

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")
 

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")
 
 
 

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
   },