Merge branch 'master' into feature/jwst-update

2026-05-04 01:39:47 -05:00 · 2022-03-07 15:16:25 +01:00
parent e30e9ee4cc 235e37d2e6
commit 49ed676144
180 changed files with 3153 additions and 1493 deletions
@@ -29,7 +29,7 @@ local wmap = {
    Texture = textures .. "wmap_ilc_7yr_v4_200uK_RGB_sos.png",
    Orientation = "Both",
    MirrorTexture = true,
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    FadeInThreshold = 0.4
  },
  GUI = {
@@ -55,7 +55,7 @@ local cbe = {
    Texture = textures .. "COBErect.png",
    Orientation = "Both",
    MirrorTexture = true,
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    FadeInThreshold = 0.4
  },
  GUI = {
@@ -81,7 +81,7 @@ local planck = {
    Texture = textures .. "cmb4k.jpg",
    Orientation = "Both",
    MirrorTexture = true,
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    FadeInThreshold = 0.4
  },
  GUI = {
@@ -107,7 +107,7 @@ local Halpha = {
    Opacity = 0.4,
    Texture = textures .. "mwHalpha-f.png",
    Orientation = "Inside",
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    MirrorTexture = true,
    FadeOutThreshold = 0.025,
    Background = true
@@ -26,7 +26,7 @@ local multiverse_planck_1 = {
    Texture = textures .. "cmb4k.jpg",
    Orientation = "Both",
    MirrorTexture = true,
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    FadeInThreshold = 0.4
  },
  GUI = {
@@ -56,7 +56,7 @@ local multiverse_planck_2 = {
    Texture = textures .. "cmb4k.jpg",
    Orientation = "Both",
    MirrorTexture = true,
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    FadeInThreshold = 0.4
  },
  GUI = {
@@ -86,7 +86,7 @@ local multiverse_planck_3 = {
    Texture = textures .. "cmb4k.jpg",
    Orientation = "Both",
    MirrorTexture = true,
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    FadeInThreshold = 0.4
  },
  GUI = {
@@ -116,7 +116,7 @@ local multiverse_planck_4 = {
    Texture = textures .. "cmb4k.jpg",
    Orientation = "Both",
    MirrorTexture = true,
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    FadeInThreshold = 0.4
  },
  GUI = {
@@ -21,7 +21,7 @@ local sphere = {
    Opacity = 0.35,
    Texture = sphereTextures .. "DarkUniverse_mellinger_4k.jpg",
    Orientation = "Inside",
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    MirrorTexture = true,
    FadeOutThreshold = 0.0015,
    Background = true
@@ -19,7 +19,7 @@ local object = {
    Segments = 40,
    Opacity = 0.4,
    Texture = textures .. "eso0932a_blend.png",
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
    Orientation = "Inside",
    MirrorTexture = true,
    FadeOutThreshold = 0.01,
@@ -41,7 +41,7 @@ local JWSTBand = {
    DisableFadeInOut = true,
    Orientation = "Inside",
    Opacity = 0.05,
-    UseAdditiveBlending = true,
+    RenderBinMode = "PreDeferredTransparent",
  },
  Tag = { "mission_jwst_fov" },
  GUI = {
@@ -1,4 +1,5 @@
 -- Color layers
+asset.require("./layers/colorlayers/blue_marble")
 local colorLayer = asset.require("./layers/colorlayers/esri_viirs_combo")
 asset.require("./layers/colorlayers/esri_world_imagery") 
 asset.require("./layers/colorlayers/esri_imagery_world_2D")
@@ -13,9 +14,11 @@ asset.require("./layers/colorlayers/ghrsst_l4_g1sst_sea_surface_temperature_temp
 asset.require("./layers/colorlayers/ghrsst_l4_mur_sea_surface_temperature_temporal")

 -- Height layers
+asset.require("./layers/heightlayers/blue_marble_height")
 local heightLayer = asset.require("./layers/heightlayers/terrain_tileset")

 -- Night layers
+asset.require("./layers/nightlayers/earth_night_texture")
 local nightLayer = asset.require("./layers/nightlayers/earth_at_night_2012")
 asset.require("./layers/nightlayers/earth_at_night_temporal")

@@ -39,7 +39,7 @@ local L1 = {
  Parent = L1Position.Identifier,
  Renderable = {
    Type = "RenderablePlaneImageLocal",
-    RenderableType = "Opaque",
+    RenderBinMode = "Opaque",
    Billboard = true,
    Size = 700E5,
    Texture = circle .. "circle.png",
@@ -39,7 +39,7 @@ local L2Small = {
  Parent = L2Position.Identifier,
  Renderable = {
    Type = "RenderablePlaneImageLocal",
-    RenderableType = "Opaque",
+    RenderBinMode = "Opaque",
    Billboard = true,
    Size = 400E4,
    Texture = circle .. "circle.png",
@@ -57,7 +57,7 @@ local L2 = {
  Parent = L2Position.Identifier,
  Renderable = {
    Type = "RenderablePlaneImageLocal",
-    RenderableType = "Opaque",
+    RenderBinMode = "Opaque",
    Billboard = true,
    Size = 700E5,
    Texture = circle .. "circle.png",
@@ -39,7 +39,7 @@ local L4 = {
  Parent = L4Position.Identifier,
  Renderable = {
    Type = "RenderablePlaneImageLocal",
-    RenderableType = "Opaque",
+    RenderBinMode = "Opaque",
    Billboard = true,
    Size = 800E6,
    Texture = circle .. "circle.png",
@@ -39,7 +39,7 @@ local L5 = {
  Parent = L5Position.Identifier,
  Renderable = {
    Type = "RenderablePlaneImageLocal",
-    RenderableType = "Opaque",
+    RenderBinMode = "Opaque",
    Billboard = true,
    Size = 800E6,
    Texture = circle .. "circle.png",
@@ -1,4 +1,4 @@
-local globeIdentifier = asset.require("../../../earth").Earth.Identifier
+local globeIdentifier = asset.require("../../earth").Earth.Identifier

 local texturesPath = asset.syncedResource({
  Name = "Earth Textures",
@@ -14,6 +14,15 @@ local layer = {
  Description = [[ Earth image from Blue Marble Next Generation ]],
 }

+
+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
 asset.export("layer", layer)


@@ -1,7 +1,5 @@
 local globeIdentifier = asset.require("../../earth").Earth.Identifier

-local fallBackLayer = asset.require("./fallbacks/blue_marble").layer
-
 local layer = {
  Identifier = "ESRI_VIIRS_Combo",
  Name = "ESRI VIIRS Combo",
@@ -41,7 +39,6 @@ local layer = {
    },
  },
  PadTiles = false,
-  Fallback = fallBackLayer,
  Description = [[Level based layer combining "VIIRS SNPP (Temporal)" and ESRI World
    Imagery. "VIIRS SNPP (Temporal)" is faded out at tile level 4]]
 }
@@ -0,0 +1,18 @@
+local globeIdentifier = asset.require("../../earth").Earth.Identifier
+
+local layer = {
+  Identifier = "TextureSpout",
+  SpoutName = "SPOUT_TERRA_RECEIVER",
+  Type = "SpoutImageTileLayer"
+}
+
+asset.onInitialize(function () 
+  openspace.globebrowsing.addLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "ColorLayers", layer)
+end)
+
+asset.export("layer", layer)
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("../../earth").Earth.Identifier
+
 local texturesPath = asset.syncedResource({
  Name = "Earth Textures",
  Type = "HttpSynchronization",
@@ -12,6 +14,14 @@ local layer = {
  Description = [[ Topographic layer from Blue Marble Next Generation]]
 }

+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "HeightLayers", layer)
+end)
+
 asset.export("layer", layer)


@@ -1,12 +1,10 @@
 local globeIdentifier = asset.require("../../earth").Earth.Identifier
-local fallBackLayer = asset.require("./fallbacks/blue_marble_height").layer

 local layer = {
  Identifier = "Terrain_tileset",
  Name = "Terrain tileset",
  FilePath = asset.localResource("terrain_tileset.wms"),
  TilePixelSize = 64,
-  Fallback = fallBackLayer,
  Description = [[This globe layer presents elevation data at approximately 90m or 1km
    per pixel resolution for the world. The elevation data includes 90m Shuttle Radar
    Topography Mission (SRTM) elevation data from NASA and National
@@ -1,12 +1,9 @@
 local globeIdentifier = asset.require("../../earth").Earth.Identifier

-local fallBackLayer = asset.require("./fallbacks/earth_night_texture").layer
-
 local layer = {
  Identifier = "Earth_at_Night_2012",
  Name = "Earth at Night 2012",
  FilePath = asset.localResource("earth_at_night_2012.wms"),
-  Fallback = fallBackLayer,
  Description = [[ The lights of cities and villages trace the outlines of civilization
    in this global view. ]],
 }
@@ -1,3 +1,5 @@
+local globeIdentifier = asset.require("../../earth").Earth.Identifier
+
 local texturesPath = asset.syncedResource({
  Name = "Earth Textures",
  Type = "HttpSynchronization",
@@ -12,6 +14,14 @@ local layer = {
  Description = [[ Earth's city lights are clearly visible from space ]]
 }

+asset.onInitialize(function()
+  openspace.globebrowsing.addLayer(globeIdentifier, "NightLayers", layer)
+end)
+
+asset.onDeinitialize(function()
+  openspace.globebrowsing.deleteLayer(globeIdentifier, "NightLayers", layer)
+end)
+
 asset.export("layer", layer)


@@ -23,6 +23,7 @@ local initializeAndAddNodes = function()
  local iss = {
    Identifier = "ISS",
    Parent = transforms.EarthInertial.Identifier,
+    BoundingSphere = 54.5, -- half the width
    InteractionSphere = 30,
    Transform = {
      Translation = {
@@ -88,8 +89,8 @@ local initializeAndAddNodes = function()
        Observer = transforms.EarthInertial.Identifier,
        File = path,
        LineNumber = 1,
-        RenderBinMode = "PostDeferredTransparent"
      },
+      RenderBinMode = "PostDeferredTransparent",
      Color = { 0.9, 0.6715, 0.0 },
      Fade = 1.5,
      Period = period,
@@ -49,8 +49,8 @@ asset.onInitialize(function ()
        Observer = transforms.EarthInertial.Identifier,
        File = path,
        LineNumber = 1,
-        RenderBinMode = "PostDeferredTransparent"
      },
+      RenderBinMode = "PostDeferredTransparent"
      Color = { 0.9, 0.6715, 0.0 },
      Fade = 1.5,
      Period = period,
@@ -51,8 +51,8 @@ asset.onInitialize(function ()
        Observer = transforms.EarthInertial.Identifier,
        File = path,
        LineNumber = 1,
-        RenderBinMode = "PostDeferredTransparent"
      },
+      RenderBinMode = "PostDeferredTransparent"
      Color = { 0.9, 0.6715, 0.0 },
      Fade = 1.5,
      Period = period,
@@ -1,6 +1,7 @@
 -- Color layer
-local colorLayer = asset.require("./layers/colorlayers/moc_wa_color_utah") -- TODO: fallback
-asset.require("./layers/colorlayers/moc_wa_color_sweden") -- TODO: fallback
+asset.require("./layers/colorlayers/mars_texture")
+local colorLayer = asset.require("./layers/colorlayers/moc_wa_color_utah")
+asset.require("./layers/colorlayers/moc_wa_color_sweden")
 asset.require("./layers/colorlayers/viking_mdim_utah") 
 asset.require("./layers/colorlayers/viking_mdim_sweden") 
 asset.require("./layers/colorlayers/mola_pseudo_color_utah") 
@@ -1,24 +0,0 @@
-local texturesPath = asset.syncedResource({
-  Name = "Mars Textures",
-  Type = "HttpSynchronization",
-  Identifier = "mars_textures",
-  Version = 1
-})
-
-local layer = {
-  Identifier = "Mars_Texture",
-  Name = "Mars Texture",
-  FilePath = texturesPath .. "mars.jpg",
-}
-
-asset.export("layer", layer)
-
-
-asset.meta = {
-  Name = "Mars Texutre",
-  Version = "1.0",
-  Description = [[ Default jpg texture for Mars]],
-  Author = "OpenSpace Team",
-  URL = "http://openspaceproject.com",
-  License = "MIT license"
-}
@@ -1,7 +1,5 @@
 local globeIdentifier = asset.require("../../mars").Mars.Identifier

-local fallbackLayer = asset.require("./fallbacks/mars_texture").layer
-
 local layer = {
  Identifier = "MOC_WA_Color_LiU",
  Name = "MOC WA Color [Sweden]",
@@ -10,7 +8,6 @@ local layer = {
    Gamma = 1.6,
    Multiplier = 1.07
  }, 
-  Fallback = fallbackLayer,
  Description = [[This map is an AMNH version of the global mossaic produced by the
    Mars Global Surveyor Wide Angle Camera. This version has color added and the
    shadows subdued based on the MOLA DTM.  Data Reference:
@@ -1,7 +1,5 @@
 local globeIdentifier = asset.require("../../mars").Mars.Identifier

-local fallbackLayer = asset.require("./fallbacks/mars_texture").layer
-
 local layer = {
  Identifier = "MOC_WA_Color_Utah",
  Name = "MOC WA Color [Utah]",
@@ -10,7 +8,6 @@ local layer = {
    Gamma = 1.6,
    Multiplier = 1.07
  }, 
-  Fallback = fallbackLayer,
  Description = [[This map is an AMNH version of the global mossaic produced by the
    Mars Global Surveyor Wide Angle Camera. This version has color added and the
    shadows subdued based on the MOLA DTM.  Data Reference:
@@ -13,7 +13,7 @@ local layer = {
    latitude. <br><br> Reference: * Edwards, C.S., K. J. Nowicki, P. R. Christensen,
    J. Hill, N. Gorelick, and K. Murray (2011), Mosaicking of global planetary image
    datasets: 1. Techniques and data processing for Thermal Emission Imaging System
-    (THEMIS) multi‐spectral data, J. Geophys. Res., 116, E10008,
+    (THEMIS) multi-spectral data, J. Geophys. Res., 116, E10008,
    doi:10.1029/2010JE003755. http://dx.doi.org/10.1029/2010JE003755 (Description from
    URL).]],
 }
@@ -5,13 +5,12 @@ local layer = {
  Name = "HRSC MOLA Blended DEM Global 200m v2",
  FilePath = asset.localResource("mdem200m.wms"),
  Description = [[ Blend of data derived from the Mars Orbiter Laser Altimeter 
-    (MOLA, an instrument aboard NASA’s
-    Mars Global Surveyor spacecraft), and data derived from the High-Resolution
-    Stereo Camera (HRSC, an instrument aboard the European Space Agency’s Mars 
-    Express spacecraft). The average accuracy is ~100 meters in horizontal 
-    position and the elevation uncertainty is at least ±3 m. This
-    tiled elevation layer, hosted by Esri, is made available using
-    lossless LERC compression. (Description from URL).]],
+    (MOLA, an instrument aboard NASA's Mars Global Surveyor spacecraft), and data derived
+    from the High-Resolution Stereo Camera (HRSC, an instrument aboard the European Space
+    Agency's Mars Express spacecraft). The average accuracy is ~100 meters in horizontal 
+    position and the elevation uncertainty is at least ±3 m. This tiled elevation layer,
+    hosted by ESRI, is made available using lossless LERC compression.
+    (Description from URL).]],
 }

 asset.onInitialize(function()
@@ -7,11 +7,11 @@ local layer = {
  Description = [[ HiRISE (High Resolution Imaging Science Experiment) is the most
    powerful camera ever sent to another planet, one of six instruments onboard the
    Mars Reconnaissance Orbiter. We launched in 2005, arrived at Mars in 2006 and have
-    been imaging ever since. Our camera’s high resolution capability (imaging up to 30
+    been imaging ever since. Our camera's high resolution capability (imaging up to 30
    centimeters per pixel) remains unprecedented for any existing orbiter in the study
    of the Red Planet, as well as being an indispensable instrument for helping to
    select landing sites for robotic and future human exploration. In the past decade,
-    we’ve also imaged avalanches in progress, and discovered dark flows that may or
+    we've also imaged avalanches in progress, and discovered dark flows that may or
    may not be briny seeps. Hundreds of science papers have been published with our
    data. (Description from URL). This map contains a subet set of the HiRISE
    DEM where available as of 2018.]],
@@ -20,7 +20,7 @@ local SunGlare = {
    Texture = textures .. "halo.png",
    BlendMode = "Additive",
    Opacity = 0.65,
-    RenderableType = "PreDeferredTransparency"
+    RenderBinMode = "PreDeferredTransparent"
  },
  GUI = {
    Name = "Sun Glare",
@@ -3,7 +3,7 @@ asset.require("./static_server")
 local guiCustomization = asset.require("customization/gui")

 -- Select which commit hashes to use for the frontend and backend
-local frontendHash = "fb2452108b203fea41990a174e05aaa75f2ae2bb"
+local frontendHash = "8c3d18a4a2cb1df526e1c3f2ea228013ce89099e"
 local dataProvider = "data.openspaceproject.com/files/webgui"

 local frontend = asset.syncedResource({