Extract multiverse from cmb asset

- Instead of always loading the multiverse cmb files, separate them into a new file
 - Don't load the new file on default in the digital universe catalogue

data/assets/base.asset

@@ -24,7 +24,44 @@ asset.require('util/launcher_images')
 local assetHelper = asset.require('util/asset_helper')
 asset.require('scene/milkyway/exoplanets/exoplanets_data')
 asset.require('scene/milkyway/exoplanets/exoplanets_textures')
-asset.require('scene/digitaluniverse/digitaluniverse')
+asset.require('scene/digitaluniverse/2dF')
+asset.require('scene/digitaluniverse/2mass')
+asset.require('scene/digitaluniverse/6dF')
+asset.require('scene/digitaluniverse/abell')
+asset.require('scene/digitaluniverse/alternatestarlabels')
+asset.require('scene/digitaluniverse/backgroundradiation')
+-- asset.require('scene/digitaluniverse/backgroundradiation_multiverse')
+asset.require('scene/digitaluniverse/clusters')
+asset.require('scene/digitaluniverse/constellationbounds')
+asset.require('scene/digitaluniverse/constellations')
+asset.require('scene/digitaluniverse/deepsky')
+asset.require('scene/digitaluniverse/dwarfs')
+asset.require('scene/digitaluniverse/exoplanets')
+asset.require('scene/digitaluniverse/globularclusters')
+asset.require('scene/digitaluniverse/grids')
+asset.require('scene/digitaluniverse/groups')
+asset.require('scene/digitaluniverse/h2regions')
+asset.require('scene/digitaluniverse/kepler')
+asset.require('scene/digitaluniverse/localdwarfs')
+asset.require('scene/digitaluniverse/milkyway')
+asset.require('scene/digitaluniverse/milkyway_arm_labels')
+asset.require('scene/digitaluniverse/milkyway_data')
+asset.require('scene/digitaluniverse/milkyway_label')
+asset.require('scene/digitaluniverse/milkyway_sphere')
+asset.require('scene/digitaluniverse/obassociations')
+asset.require('scene/digitaluniverse/openclusters')
+asset.require('scene/digitaluniverse/planetarynebulae')
+asset.require('scene/digitaluniverse/pulsars')
+asset.require('scene/digitaluniverse/quasars')
+asset.require('scene/digitaluniverse/sdss')
+asset.require('scene/digitaluniverse/starlabels')
+asset.require('scene/digitaluniverse/starorbits')
+asset.require('scene/digitaluniverse/stars')
+asset.require('scene/digitaluniverse/superclusters')
+asset.require('scene/digitaluniverse/supernovaremnants')
+asset.require('scene/digitaluniverse/tully')
+asset.require('scene/digitaluniverse/voids')
+
 
 asset.require('customization/globebrowsing')
 

data/assets/scene/digitaluniverse/6dF.asset

@@ -30,7 +30,7 @@ local object = {
         ColorRange = { { 0.0, 0.075 }, { 1.0, 10.0 } },
         Unit = "Mpc",
         ScaleFactor = 534.0,
-        BillboardMaxSize = 7.0,
+        BillboardMaxSize = 9.0,
         EnablePixelSizeControl = true,
     },
     GUI = {

data/assets/scene/digitaluniverse/backgroundradiation.asset

@@ -1,13 +1,5 @@
 local assetHelper = asset.require('util/asset_helper')
-
-
-
-local textures = asset.syncedResource({
-    Name = "Background Radiation Textures",
-    Type = "HttpSynchronization",
-    Identifier = "digitaluniverse_backgroundradiation_textures",
-    Version = 2
-})
+local textures = asset.require('./backgroundradiation_textures').textures
 
 local speck = asset.syncedResource({
     Name = "Background Radiation Speck Files",
@@ -94,126 +86,6 @@ local planck = {
     }
 }
 
-local multiverse_planck_1 = {
-    Identifier = "PlanckMultiverse1",
-    Transform = {
-        Translation = {
-            Type = "StaticTranslation",
-            Position = { 0.0, 0.0, 2000E23}
-        },
-        Rotation = {
-            Type = "StaticRotation",
-            Rotation = { 0, 0, 3.14159265359 }
-        }
-    },
-    Renderable = {
-        Type = "RenderableSphere",
-        Enabled = false,
-        Size = 3975.41417036064E23,
-        Segments = 80,
-        Opacity = 0.3,
-        Texture = textures .. "/cmb4k.jpg",
-        Orientation = "Both",
-        MirrorTexture = true,
-        UseAdditiveBlending = true,
-        FadeInThreshold = 0.4
-    },
-    GUI = {
-        Name = "Planck Multiverse 1",
-        Path = "/Universe/Cosmic Microwave Background"
-    }
-}
-
-local multiverse_planck_2 = {
-    Identifier = "PlanckMultiverse2",
-    Transform = {
-        Translation = {
-            Type = "StaticTranslation",
-            Position = { 2500E23, 0.0, 2000E23}
-        },
-        Rotation = {
-            Type = "StaticRotation",
-            Rotation = { 0, 0, 3.14159265359 }
-        }
-    },
-    Renderable = {
-        Type = "RenderableSphere",
-        Enabled = false,
-        Size = 3975.41417036064E23,
-        Segments = 80,
-        Opacity = 0.3,
-        Texture = textures .. "/cmb4k.jpg",
-        Orientation = "Both",
-        MirrorTexture = true,
-        UseAdditiveBlending = true,
-        FadeInThreshold = 0.4
-    },
-    GUI = {
-        Name = "Planck Multiverse 2",
-        Path = "/Universe/Cosmic Microwave Background"
-    }
-}
-
-local multiverse_planck_3 = {
-    Identifier = "PlanckMultiverse3",
-    Transform = {
-        Translation = {
-            Type = "StaticTranslation",
-            Position = { 2500E23, 5000E23, 2000E23}
-        },
-        Rotation = {
-            Type = "StaticRotation",
-            Rotation = { 0, 0, 3.14159265359 }
-        }
-    },
-    Renderable = {
-        Type = "RenderableSphere",
-        Enabled = false,
-        Size = 3975.41417036064E23,
-        Segments = 80,
-        Opacity = 0.3,
-        Texture = textures .. "/cmb4k.jpg",
-        Orientation = "Both",
-        MirrorTexture = true,
-        UseAdditiveBlending = true,
-        FadeInThreshold = 0.4
-    },
-    GUI = {
-        Name = "Planck Multiverse 3",
-        Path = "/Universe/Cosmic Microwave Background"
-    }
-}
-
-local multiverse_planck_4 = {
-    Identifier = "PlanckMultiverse4",
-    Transform = {
-        Translation = {
-            Type = "StaticTranslation",
-            Position = { 0.0, 10000E23, 0.0 }
-        },
-        Rotation = {
-            Type = "StaticRotation",
-            Rotation = { 0, 0, 3.14159265359 }
-        }
-    },
-    Renderable = {
-        Type = "RenderableSphere",
-        Enabled = false,
-        Size = 3975.41417036064E23,
-        Segments = 80,
-        Opacity = 0.3,
-        Texture = textures .. "/cmb4k.jpg",
-        Orientation = "Both",
-        MirrorTexture = true,
-        UseAdditiveBlending = true,
-        FadeInThreshold = 0.4
-    },
-    GUI = {
-        Name = "Planck Multiverse 4",
-        Path = "/Universe/Cosmic Microwave Background"
-    }
-}
-
 
 local Halpha = {
     Identifier = "HAlpha",
@@ -244,8 +116,7 @@ local Halpha = {
 
 
 assetHelper.registerSceneGraphNodesAndExport(asset, {
-    wmap, cbe, planck, multiverse_planck_1, multiverse_planck_2, multiverse_planck_3,
-    multiverse_planck_4, Halpha
+    wmap, cbe, planck, Halpha
 })
 
 
@@ -254,12 +125,11 @@ asset.meta = {
     Version = "2.0",
     Description = [[Various AllSky images for the Milky Way and observable Universe.
         Included: Wilkinson Microwave Anisotropy Probe (WMAP), Cosmic Background Explorer,
-        Planck, Planck Multiverse 1-4, and H Alpha <br><br> Data Reference: Planck/ESA and
-        the Planck Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
+        Planck, and H Alpha <br><br> Data Reference: Planck/ESA and the Planck
+        Collaboration, Wilkinson Microwave Anisotropy Probe/NASA, Doug
         Finkbeiner (Princeton)]],
     Author = "Brian Abbott (AMNH), OpenSpace Team",
     URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
     License = "AMNH Digital Universe",
-    Identifiers = {"WMAP", "CBE", "Planck", "PlanckMultiverse1", "PlanckMultiverse2",
-        "PlanckMultiverse3", "PlanckMultiverse4", "HAlpha"}
+    Identifiers = {"WMAP", "CBE", "Planck", "HAlpha"}
 }

data/assets/scene/digitaluniverse/backgroundradiation_multiverse.asset

@@ -0,0 +1,141 @@
+local assetHelper = asset.require('util/asset_helper')
+local textures = asset.require('./backgroundradiation_textures').textures
+
+local multiverse_planck_1 = {
+    Identifier = "PlanckMultiverse1",
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = { 0.0, 0.0, 2000E23}
+        },
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = { 0, 0, 3.14159265359 }
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphere",
+        Enabled = false,
+        Size = 3975.41417036064E23,
+        Segments = 80,
+        Opacity = 0.3,
+        Texture = textures .. "/cmb4k.jpg",
+        Orientation = "Both",
+        MirrorTexture = true,
+        UseAdditiveBlending = true,
+        FadeInThreshold = 0.4
+    },
+    GUI = {
+        Name = "Planck Multiverse 1",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
+}
+
+local multiverse_planck_2 = {
+    Identifier = "PlanckMultiverse2",
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = { 2500E23, 0.0, 2000E23}
+        },
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = { 0, 0, 3.14159265359 }
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphere",
+        Enabled = false,
+        Size = 3975.41417036064E23,
+        Segments = 80,
+        Opacity = 0.3,
+        Texture = textures .. "/cmb4k.jpg",
+        Orientation = "Both",
+        MirrorTexture = true,
+        UseAdditiveBlending = true,
+        FadeInThreshold = 0.4
+    },
+    GUI = {
+        Name = "Planck Multiverse 2",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
+}
+
+local multiverse_planck_3 = {
+    Identifier = "PlanckMultiverse3",
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = { 2500E23, 5000E23, 2000E23}
+        },
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = { 0, 0, 3.14159265359 }
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphere",
+        Enabled = false,
+        Size = 3975.41417036064E23,
+        Segments = 80,
+        Opacity = 0.3,
+        Texture = textures .. "/cmb4k.jpg",
+        Orientation = "Both",
+        MirrorTexture = true,
+        UseAdditiveBlending = true,
+        FadeInThreshold = 0.4
+    },
+    GUI = {
+        Name = "Planck Multiverse 3",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
+}
+
+local multiverse_planck_4 = {
+    Identifier = "PlanckMultiverse4",
+    Transform = {
+        Translation = {
+            Type = "StaticTranslation",
+            Position = { 0.0, 10000E23, 0.0 }
+        },
+        Rotation = {
+            Type = "StaticRotation",
+            Rotation = { 0, 0, 3.14159265359 }
+        }
+    },
+    Renderable = {
+        Type = "RenderableSphere",
+        Enabled = false,
+        Size = 3975.41417036064E23,
+        Segments = 80,
+        Opacity = 0.3,
+        Texture = textures .. "/cmb4k.jpg",
+        Orientation = "Both",
+        MirrorTexture = true,
+        UseAdditiveBlending = true,
+        FadeInThreshold = 0.4
+    },
+    GUI = {
+        Name = "Planck Multiverse 4",
+        Path = "/Universe/Cosmic Microwave Background"
+    }
+}
+
+
+assetHelper.registerSceneGraphNodesAndExport(asset, {
+    multiverse_planck_1, multiverse_planck_2, multiverse_planck_3, multiverse_planck_4
+})
+
+
+asset.meta = {
+    Name = "Multiverse Background Radiation",
+    Version = "2.0",
+    Description = [[ Non-physical representation of the location of hypothetical 
+        cosmic microwave background radiation images how they would be observed from other
+        locations in the universe. <br> This is not a measured dataset!]],
+    Author = "Brian Abbott (AMNH), OpenSpace Team",
+    URL = "https://www.amnh.org/research/hayden-planetarium/digital-universe",
+    License = "AMNH Digital Universe",
+    Identifiers = { "PlanckMultiverse1", "PlanckMultiverse2",
+        "PlanckMultiverse3", "PlanckMultiverse4" }
+}

data/assets/scene/digitaluniverse/backgroundradiation_textures.asset

@@ -0,0 +1,8 @@
+local textures = asset.syncedResource({
+    Name = "Background Radiation Textures",
+    Type = "HttpSynchronization",
+    Identifier = "digitaluniverse_backgroundradiation_textures",
+    Version = 2
+})
+
+asset.export('textures', textures)

data/assets/scene/digitaluniverse/digitaluniverse.asset

@@ -4,6 +4,7 @@ asset.require('./6dF')
 asset.require('./abell')
 asset.require('./alternatestarlabels')
 asset.require('./backgroundradiation')
+asset.require('./backgroundradiation_multiverse')
 asset.require('./clusters')
 asset.require('./constellationbounds')
 asset.require('./constellations')