Apply transformation matrices to labels as well (closes #2650)

2026-01-05 19:19:39 -06:00 · 2023-05-09 22:59:08 +02:00
parent 58d7f3a41f
commit b1090dde69
6 changed files with 58 additions and 48 deletions
--- a/data/assets/scene/digitaluniverse/abell.asset
+++ b/data/assets/scene/digitaluniverse/abell.asset
@@ -12,6 +12,13 @@ local speck = asset.syncedResource({
  Version = 2
 })

+local transformMatrix = {
+  -0.7357425748,    0.67726129641,  0.0,           0.0,
+  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
+  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
+  0.0,              0.0,            0.0,           1.0
+}
+
 local object = {
  Identifier = "Abell",
  Renderable = {
@@ -23,7 +30,8 @@ local object = {
      Color = { 0.0, 0.8, 0.0 },
      Size = 22,
      MinMaxSize = { 10, 12 },
-      Unit = "Mpc"
+      Unit = "Mpc",
+      TransformationMatrix = transformMatrix
    },
    Color = { 1.0, 0.4, 0.2 },
    Opacity = 1.0,
@@ -31,12 +39,7 @@ local object = {
    File = speck .. "abell.speck",
    Texture = textures .. "point3A.png",
    Unit = "Mpc",
-    TransformationMatrix = {
-      -0.7357425748,    0.67726129641,  0.0,           0.0,
-      -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-      0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-      0.0,              0.0,            0.0,           1.0
-    },
+    TransformationMatrix = transformMatrix,
    ScaleFactor = 520.0,
    BillboardMinMaxSize = { 0.0, 7.0 },
    EnablePixelSizeControl = true
--- a/data/assets/scene/digitaluniverse/clusters.asset
+++ b/data/assets/scene/digitaluniverse/clusters.asset
@@ -5,6 +5,13 @@ local speck = asset.syncedResource({
  Version = 2
 })

+local transformMatrix = {
+  -0.7357425748,    0.67726129641,  0.0,           0.0,
+  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
+  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
+  0.0,              0.0,            0.0,           1.0
+}
+
 local object = {
  Identifier = "GalaxyClusterLabels",
  Renderable = {
@@ -16,17 +23,13 @@ local object = {
      Color = { 1.0, 0.44, 0.0 },
      Size = 22,
      MinMaxSize = { 8, 20 },
-      Unit = "Mpc"
+      Unit = "Mpc",
+      TransformationMatrix = transformMatrix
    },
    Color = { 1.0, 1.0, 1.0 },
    Opacity = 0.65,
    Unit = "Mpc",
-    TransformationMatrix = {
-      -0.7357425748,    0.67726129641,  0.0,           0.0,
-      -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-      0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-      0.0,              0.0,            0.0,           1.0
-    }
+    TransformationMatrix = transformMatrix
  },
  GUI = {
    Name = "Galaxy Cluster Labels",
--- a/data/assets/scene/digitaluniverse/groups.asset
+++ b/data/assets/scene/digitaluniverse/groups.asset
@@ -5,6 +5,13 @@ local speck = asset.syncedResource({
  Version = 1
 })

+local transformMatrix = {
+  -0.7357425748,    0.67726129641,  0.0,           0.0,
+  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
+  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
+  0.0,              0.0,            0.0,           1.0
+}
+
 local object = {
  Identifier = "NearbyGalaxyGroups",
  Renderable = {
@@ -16,18 +23,14 @@ local object = {
      Color = { 0.1, 0.6, 0.2 },
      Size = 21.5,
      MinMaxSize = { 8, 20 },
-      Unit = "Mpc"
+      Unit = "Mpc",
+      TransformationMatrix = transformMatrix
    },
    Color = { 1.0, 1.0, 1.0 },
    Opacity = 0.65,
    --ScaleFactor = 10.0,
    Unit = "Mpc",
-    TransformationMatrix = {
-      -0.7357425748,    0.67726129641,  0.0,           0.0,
-      -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-      0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-      0.0,              0.0,            0.0,           1.0
-    }
+    TransformationMatrix = transformMatrix
  },
  GUI = {
    Name = "Galaxy Group Labels",
--- a/data/assets/scene/digitaluniverse/milkyway_label.asset
+++ b/data/assets/scene/digitaluniverse/milkyway_label.asset
@@ -5,6 +5,13 @@ local homespeck = asset.syncedResource({
  Version = 1
 })

+local transformMatrix = {
+  -0.7357425748,    0.67726129641,  0.0,           0.0,
+  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
+  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
+  0.0,              0.0,            0.0,           1.0
+}
+
 local homeLabel = {
  Identifier = "HomeLabel",
  Renderable = {
@@ -16,18 +23,14 @@ local homeLabel = {
      Color = { 0.8, 0.8, 0.8 },
      Size = 20.50,
      MinMaxSize = { 16, 20 },
-      Unit = "Mpc"
+      Unit = "Mpc",
+      TransformationMatrix = transformMatrix
    },
    Color = { 1.0, 0.4, 0.2 },
    Opacity = 0.99,
    ScaleFactor = 500.0,
    Unit = "Mpc",
-    TransformationMatrix = {
-      -0.7357425748,    0.67726129641,  0.0,           0.0,
-      -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-      0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-      0.0,              0.0,            0.0,           1.0
-    },
+    TransformationMatrix = transformMatrix,
    FadeInDistances = { 0.05, 1.0 },
    BillboardMinMaxSize = { 0.0, 8.22 },
    EnablePixelSizeControl = true
--- a/data/assets/scene/digitaluniverse/starorbits.asset
+++ b/data/assets/scene/digitaluniverse/starorbits.asset
@@ -17,7 +17,7 @@ local sunOrbit = {
    Enabled = false,
    Opacity = 1.0,
    File = speck .. "starorbits-Sun.speck",
-    MeshColor = {{ 1.0, 0.65, 0.0 }},
+    MeshColor = { { 1.0, 0.65, 0.0 } },
    --LabelFile = speck .. "1ld.label",
    -- TextColor = { 0.0, 0.2, 0.5 },
    -- TextMinMaxSize = { 0, 30 },
@@ -38,7 +38,7 @@ local barnardsOrbit = {
    Enabled = false,
    Opacity = 1.0,
    File = speck .. "starorbits-BarnardsStar.speck",
-    MeshColor = {{0.39, 0.58, 0.93}},
+    MeshColor = { { 0.39, 0.58, 0.93 } },
    --LabelFile = speck .. "1ld.label",
    -- TextColor = { 0.0, 0.2, 0.5 },
    -- TextSize = 10.3,
@@ -60,7 +60,7 @@ local kapteynsOrbit = {
    Enabled = false,
    Opacity = 1.0,
    File = speck .. "starorbits-KapteynsStar.speck",
-    MeshColor = {{0.6, 0.6, 0.6}},
+    MeshColor = { { 0.6, 0.6, 0.6 } },
    --LabelFile = speck .. "1ld.label",
    -- TextColor = { 0.0, 0.2, 0.5 },
    -- TextSize = 10.3,
@@ -82,7 +82,7 @@ local lacaille9352Orbit = {
    Enabled = false,
    Opacity = 1.0,
    File = speck .. "starorbits-Lacaille9352.speck",
-    MeshColor = {{0.58, 0.0, 0.83}},
+    MeshColor = { { 0.58, 0.0, 0.83 } },
    --LabelFile = speck .. "1ld.label",
    -- TextColor = { 0.0, 0.2, 0.5 },
    -- TextSize = 10.3,
@@ -104,7 +104,7 @@ local lSR1826Orbit = {
    Enabled = false,
    Opacity = 1.0,
    File = speck .. "starorbits-LSR1826+3014.speck",
-    MeshColor = {{0.0, 0.39, 0.0}},
+    MeshColor = { { 0.0, 0.39, 0.0 } },
    --LabelFile = speck .. "1ld.label",
    -- TextColor = { 0.0, 0.2, 0.5 },
    -- TextSize = 10.3,
@@ -126,7 +126,7 @@ local lSRJ0822Orbit = {
    Enabled = false,
    Opacity = 1.0,
    File = speck .. "starorbits-LSRJ0822+1700.speck",
-    MeshColor = {{0.5, 1.0, 0.0}},
+    MeshColor = { { 0.5, 1.0, 0.0 } },
    --LabelFile = speck .. "1ld.label",
    -- TextColor = { 0.0, 0.2, 0.5 },
    -- TextSize = 10.3,
@@ -148,7 +148,7 @@ local pM_J13420Orbit = {
    Enabled = false,
    Opacity = 1.0,
    File = speck .. "starorbits-PM_J13420-3415.speck",
-    MeshColor = {{0.70, 0.13, 0.13}},
+    MeshColor = { { 0.70, 0.13, 0.13 } },
    --LabelFile = speck .. "1ld.label",
    -- TextColor = { 0.0, 0.2, 0.5 },
    -- TextSize = 10.3,
--- a/data/assets/scene/digitaluniverse/tully.asset
+++ b/data/assets/scene/digitaluniverse/tully.asset
@@ -12,6 +12,13 @@ local speck = asset.syncedResource({
  Version = 2
 })

+local transformMatrix = {
+  -0.7357425748,    0.67726129641,  0.0,           0.0,
+  -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
+  0.67314530211,    0.73127116582,  0.11008126223, 0.0,
+  0.0,              0.0,            0.0,           1.0
+}
+
 local tullyPoints = {
  Identifier = "TullyGalaxies",
  Renderable = {
@@ -22,7 +29,8 @@ local tullyPoints = {
      Color = { 0.7, 0.7, 0.7 },
      Size = 19.36,
      MinMaxSize = { 8, 20 },
-      Unit = "Mpc"
+      Unit = "Mpc",
+      TransformationMatrix = transformMatrix
    },
    Color = { 1.0, 0.4, 0.2 },
    Opacity = 0.99,
@@ -35,12 +43,7 @@ local tullyPoints = {
    ColorOption = { "prox5Mpc" },
    ColorRange = { { 1.0, 30.0 } },
    Unit = "Mpc",
-    TransformationMatrix = {
-      -0.7357425748,    0.67726129641,  0.0,           0.0,
-      -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-      0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-      0.0,              0.0,            0.0,           1.0
-    },
+    TransformationMatrix = transformMatrix,
    FadeInDistances = { 0.001, 1.0 }, -- Fade in value in the same unit as "Unit"
    BillboardMinMaxSize = { 0.0, 7.0 }, -- in pixels
    --CorrectionSizeEndDistance = 22.0,
@@ -81,12 +84,7 @@ local tullyImages = {
    TexturePath = textures,
    Luminosity = "diamkpc",
    ScaleLuminosity = 0.001,
-    TransformationMatrix = {
-      -0.7357425748,    0.67726129641,  0.0,           0.0,
-      -0.074553778365, -0.080991471307, 0.9939225904,  0.0,
-      0.67314530211,    0.73127116582,  0.11008126223, 0.0,
-      0.0,              0.0,            0.0,           1.0
-    },
+    TransformationMatrix = transformMatrix,
    Unit = "Mpc",
    -- Fade in value in the same unit as "Unit"
    FadeInDistances = {0.0005, 0.003},