From bc647e8f23608dcb34cef04bc72c8e861afa3070 Mon Sep 17 00:00:00 2001
From: Malin E <malin.ejdbo@gmail.com>
Date: Wed, 1 Mar 2023 17:31:10 +0100
Subject: [PATCH] Some model asset files clean up

---
 data/assets/examples/approachevents.asset           |  6 ++++--
 data/assets/examples/globerotation.asset            |  7 +++++--
 data/assets/examples/globetranslation.asset         | 13 +++++++++----
 .../missions/apollo/8/launch_model.asset            |  2 +-
 .../scene/solarsystem/missions/apollo/8/model.asset |  6 +++---
 .../solarsystem/missions/apollo/8/trails.asset      |  6 +++---
 6 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/data/assets/examples/approachevents.asset b/data/assets/examples/approachevents.asset
index 3f69a0e350..4e99e963d3 100644
--- a/data/assets/examples/approachevents.asset
+++ b/data/assets/examples/approachevents.asset
@@ -32,14 +32,16 @@ local obj = {
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = model .. "BoxAnimated.glb",
-    ModelScale = 1.0,
+    ModelScale = 1000,
     LightSources = {
       sun.LightSource
     },
     PerformShading = true,
     EnableFaceCulling = true
   },
-  InteractionSphere = 1000.0,
+  InteractionSphere = 900,
+  ApproachFactor = 50.0,
+  ReachFactor = 5.0,
   OnApproach = { "os.example.generic" },
   OnReach = { "os.example.generic" },
   OnRecede = { "os.example.generic" },
diff --git a/data/assets/examples/globerotation.asset b/data/assets/examples/globerotation.asset
index 4ada35e386..b1aaec3951 100644
--- a/data/assets/examples/globerotation.asset
+++ b/data/assets/examples/globerotation.asset
@@ -1,3 +1,4 @@
+local sun = asset.require("scene/solarsystem/sun/sun")
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
@@ -35,8 +36,10 @@ local Example_GlobeRotation = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Body = "NEW HORIZONS",
-    GeometryFile = models .. "NewHorizonsCleanModel.obj"
+    GeometryFile = models .. "NewHorizonsCleanModel.obj",
+    LightSources = {
+      sun.LightSource
+    }
   },
   GUI = {
     Path = "/Example"
diff --git a/data/assets/examples/globetranslation.asset b/data/assets/examples/globetranslation.asset
index 2150c723d6..9421c0e9c5 100644
--- a/data/assets/examples/globetranslation.asset
+++ b/data/assets/examples/globetranslation.asset
@@ -1,3 +1,4 @@
+local sun = asset.require("scene/solarsystem/sun/sun")
 local earth = asset.require("scene/solarsystem/planets/earth/earth")
 local sunTransforms = asset.require("scene/solarsystem/sun/transforms")
 
@@ -22,8 +23,10 @@ local Example_Fixed_Height = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Body = "NEW HORIZONS",
-    GeometryFile = models .. "NewHorizonsCleanModel.obj"
+    GeometryFile = models .. "NewHorizonsCleanModel.obj",
+    LightSources = {
+      sun.LightSource
+    }
   },
   GUI = {
     Path = "/Example"
@@ -44,8 +47,10 @@ local Example_Adaptive_Height = {
   },
   Renderable = {
     Type = "RenderableModel",
-    Body = "NEW HORIZONS",
-    GeometryFile = models .. "NewHorizonsCleanModel.obj"
+    GeometryFile = models .. "NewHorizonsCleanModel.obj",
+    LightSources = {
+      sun.LightSource
+    }
   },
   GUI = {
     Path = "/Example"
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 946b72ad4f..5760d52161 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/launch_model.asset
@@ -30,7 +30,7 @@ local Apollo8Launch = {
   },
   GUI = {
     Name = "Apollo 8 Launch Capsule",
-    Path = "/Solar System/Missions/Apollo"
+    Path = "/Solar System/Missions/Apollo/8"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/model.asset b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
index 3f941633c7..740d4efb6e 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/model.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/model.asset
@@ -42,7 +42,7 @@ local Apollo8 = {
   },
   GUI = {
     Name = "Apollo 8",
-    Path = "/Solar System/Missions/Apollo"
+    Path = "/Solar System/Missions/Apollo/8"
   }
 }
 
@@ -73,7 +73,7 @@ local Apollo8Model = {
   GUI = {
     Hidden = true,
     Name = "Apollo 8 Model",
-    Path = "/Solar System/Missions/Apollo"
+    Path = "/Solar System/Missions/Apollo/8"
   }
 }
 
@@ -89,7 +89,7 @@ local Apollo8Pivot = {
   },
   GUI = {
     Name = "Apollo 8 Pivot",
-    Path = "/Solar System/Missions/Apollo"
+    Path = "/Solar System/Missions/Apollo/8"
   }
 }
 
diff --git a/data/assets/scene/solarsystem/missions/apollo/8/trails.asset b/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
index 6bc4398bef..d8d24ce58b 100644
--- a/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/8/trails.asset
@@ -25,7 +25,7 @@ local LaunchTrail = {
   },
   GUI = {
     Name = "Apollo 8 Launch Trail",
-    Path = "/Solar System/Missions/Apollo"
+    Path = "/Solar System/Missions/Apollo/8"
   }
 }
 
@@ -49,7 +49,7 @@ local MoonTrail = {
   },
   GUI = {
     Name = "Apollo 8 Moon Trail",
-    Path = "/Solar System/Missions/Apollo"
+    Path = "/Solar System/Missions/Apollo/8"
   }
 }
 
@@ -73,7 +73,7 @@ local EarthBarycenterTrail = {
   },
   GUI = {
     Name = "Apollo 8 Earth Barycenter Trail",
-    Path = "/Solar System/Missions/Apollo"
+    Path = "/Solar System/Missions/Apollo/8"
   }
 }