Merge remote-tracking branch 'origin/master' into feature/loadingscreen-refactor

# Conflicts: # modules/volume/rendering/renderabletimevaryingvolume.cpp
2026-04-28 23:09:32 -05:00 · 2017-11-12 10:50:11 -05:00
parent 7e4bb0b2c6 76b26c0128
commit f227767492
187 changed files with 10004 additions and 4565 deletions
@@ -0,0 +1,35 @@
+return {
+    -- Earth barycenter module
+    {
+        Name = "Fixed Rotation",
+        Parent = "EarthBarycenter",
+        Transform = {
+            Rotation = {
+                Type = "FixedRotation",
+                Attached = "Fixed Rotation",
+                XAxis = { 0.0, 1.0, 0.0 },
+                XAxisOrthogonal = true,
+                YAxis = "EarthBarycenter"
+            },
+            Translation = {
+                Type = "SpiceTranslation",
+                Target = "MOON",
+                Observer = "EARTH BARYCENTER",
+                Kernels = "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+            },
+            Scale = {
+                Type = "StaticScale",
+                Scale = 10000000
+            }
+        },
+        Renderable = {
+            Type = "RenderableModel",
+            Geometry = {
+                Type = "MultiModelGeometry",
+                GeometryFile = "teapot.obj",
+                -- Magnification = 4,
+            },
+            ColorTexture = "placeholder.png",
+        }
+    }
+}