From 709cb24bbb2ac37ad1fe87f8b3aac47a4e4d3363 Mon Sep 17 00:00:00 2001
From: Emma Broman <emma.broman@liu.se>
Date: Thu, 9 Nov 2023 11:18:45 +0100
Subject: [PATCH] Simplify Apollo LEM Model Rotation - Allows using
 IdleBehavior to orbit around up (#2916)

* Simplify Apollo LEM Model Rotation and allow using IdleBehavior to orbit around up-vector

* Add rotation values from Carter
---
 .../assets/scene/solarsystem/missions/apollo/11/lem.asset | 8 +++++++-
 .../assets/scene/solarsystem/missions/apollo/17/lem.asset | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
index 4be3fd6f8c..17ddb2c21b 100644
--- a/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/11/lem.asset
@@ -22,6 +22,12 @@ local Apollo11Lem = {
       Latitude = 0.67402,
       Altitude = -1927.65,
       UseHeightMap = false
+    },
+    Rotation = {
+      Type = "GlobeRotation",
+      Globe = moon_asset.Moon.Identifier,
+      Longitude = -360+23.47306,
+      Latitude = 0.67402,
     }
   },
   GUI = {
@@ -42,7 +48,7 @@ local Apollo11LemModel = {
   Renderable = {
     Type = "RenderableModel",
     GeometryFile = lem_model .. "LM-2_ver2clean.obj",
-    RotationVector = { 91.044090, 171.229706, 111.666664 },
+    RotationVector = { -90.0, 283.86999, 0 },
     LightSources = {
       sun.LightSource,
       {
diff --git a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
index 10a72ddd3c..eb7158df4f 100644
--- a/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
+++ b/data/assets/scene/solarsystem/missions/apollo/17/lem.asset
@@ -21,6 +21,12 @@ local Apollo17Lem = {
       Longitude = -329.22833,
       Latitude = 20.19092,
       UseHeightmap = true
+    },
+    Rotation = {
+      Type = "GlobeRotation",
+      Globe = moonAsset.Moon.Identifier,
+      Longitude = -329.22833,
+      Latitude = 20.19092,
     }
   },
   GUI = {
@@ -43,7 +49,7 @@ local Apollo17LemModel = {
     Type = "RenderableModel",
     GeometryFile = model .. "LM-2_ver2clean.obj",
     SpecularIntensity = 0.0,
-    RotationVector = { 110.255219, 171.229706, 126.666664 },
+    RotationVector = { -90.0, 283.86999, 0 },
     LightSources = {
       sun.LightSource,
       {