Merge branch 'master' of github.com:OpenSpace/OpenSpace into feature/data-management

2026-01-25 21:48:41 -06:00 · 2017-09-11 11:52:31 +02:00
parent ab22c18714 7aceb54bec
commit 4cdae984e9
60 changed files with 1115 additions and 173 deletions
--- a/data/globebrowsing_servers.lua
+++ b/data/globebrowsing_servers.lua
@@ -0,0 +1,38 @@
+-- This file contains a list of default servers for globes that can be used in the GUI
+-- to easily add layers
+
+return {
+    Earth = {
+        {
+            Name = "GIBS",
+            URL  = "https://gibs.earthdata.nasa.gov/twms/epsg4326/best/twms.cgi?request=GetTileService"
+        },
+    },
+    Moon = {
+        {
+            Name = "OnMoon LMMP",
+            URL  = "https://onmoon.lmmp.nasa.gov/wms.cgi?request=GetCapabilities"
+        },
+    },
+    Mercury = {
+        {
+            Name = "USGS Mercury",
+            URL  = "https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/mercury/mercury_simp_cyl.map&service=WMS&request=GetCapabilities"
+        },
+    },
+    Callisto = {
+        {
+            Name = "USGS Callisto",
+            URL  = "https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/jupiter/callisto_simp_cyl.map&service=WMS&request=GetCapabilities"
+        },
+    },
+    Deimos = {
+        {
+            Name = "USGS Deimos",
+            URL  = "https://planetarymaps.usgs.gov/cgi-bin/mapserv?map=/maps/mars/deimos_simp_cyl.map&service=WMS&request=GetCapabilities"
+        },
+    },
+}
+
+
+-- https://astrowebmaps.wr.usgs.gov/webmapatlas/Layers/maps.html
--- a/data/scene/default.scene
+++ b/data/scene/default.scene
@@ -56,6 +56,10 @@ function preInitialization()
        "openspace.setPropertyValue('*Trail.renderable.Enabled', false)",
        "Disables visibility of the trails"
    )
+
+    openspace.globebrowsing.loadWMSServersFromFile(
+        openspace.absPath("${OPENSPACE_DATA}/globebrowsing_servers.lua")
+    )
 end

 function postInitialization()
--- a/data/scene/missions/newhorizons/pluto/charon/charon.mod
+++ b/data/scene/missions/newhorizons/pluto/charon/charon.mod
@@ -5,12 +5,6 @@ local NewHorizonsKernels = {
    "${SPICE}/new_horizons/spk/NavPE_de433_od122.bsp",
 }

-- Loading the smaller version for higher compatability
-- if we have a good way to measure GPU memory, we can make this dynamic
-local ColorTexture = "textures/NH_Charon_mosaic_8192.png"
-local HeightTexture = "textures/NH_Charon_DTM_8192.png"
-
-
 return {
    -- CharonProjection module
    {   
@@ -22,10 +16,10 @@ return {
            Geometry = {
                Type = "SimpleSphere",
                Radius = charon_radius,
-                Segments = 100
+                Segments = 350
            },
-            ColorTexture = ColorTexture,
-            HeightTexture = HeightTexture,
+            ColorTexture = charon_image,
+            HeightTexture = charon_height,
            Projection = {
                Observer   = "NEW HORIZONS",
                Target     = "CHARON",
--- a/data/scene/missions/newhorizons/pluto/pluto/pluto.data
+++ b/data/scene/missions/newhorizons/pluto/pluto/pluto.data
@@ -2,7 +2,7 @@ return {
    FileRequest = {
        { Identifier = "newhorizons_plutoencounter_pluto_assets", Destination = "assets", Version = 1 },
        { Identifier = "newhorizons_plutoencounter_pluto_textures", Destination = "textures", Version = 4 },
-        { Identifier = "pluto_textures", Destination = "textures", Version = 4 },
+        { Identifier = "pluto_textures", Destination = "textures", Version = 5 },
        { Identifier = "newhorizons_plutoencounter_pluto_images", Destination = "images", Version = 1 }
    },
 }
--- a/data/scene/missions/newhorizons/pluto/pluto/pluto.mod
+++ b/data/scene/missions/newhorizons/pluto/pluto/pluto.mod
@@ -5,10 +5,6 @@ local NewHorizonsKernels = {
    "${SPICE}/new_horizons/spk/NavSE_plu047_od122.bsp"
 }

-local ColorTexture = "textures/pluto.jpg"
-- local ColorTexture = "textures/NH_Pluto_mosaic_16384.png"
-local HeightTexture = "textures/NH_Pluto_DTM_16384.png"
-
 return {
    -- Pluto barycenter module
    {
@@ -33,14 +29,15 @@ return {
            Geometry = {
                Type = "SimpleSphere",
                Radius = pluto_radius,
-                Segments = 100
+                Segments = 400
            },
-            ColorTexture = ColorTexture,
-            HeightTexture = HeightTexture,
+            ColorTexture = pluto_image,
+            HeightTexture = pluto_height,
+            MeridianShift = true,
            Projection = {
                Sequence       = "${OPENSPACE_DATA}/scene/missions/newhorizons/pluto/pluto/images",
                EventFile      = "${OPENSPACE_DATA}/scene/missions/newhorizons/pluto/pluto/assets/core_v9h_obs_getmets_v8_time_fix_nofrcd_mld.txt",
-                SequenceType   = "hybrid",
+                SequenceType   = "image-sequence",
                Observer       = "NEW HORIZONS",
                Target         = "PLUTO",
                Aberration     = "NONE",
--- a/data/scene/newhorizons.scene
+++ b/data/scene/newhorizons.scene
@@ -1,7 +1,23 @@
-UseAccurateNewHorizonsKernels = false
-- TextureResolution = "low"
-TextureResolution = "med"
-- TextureResolution = "high"
+-- These values specify the textures that are used for Pluto and Charon
+-- The paths are relative to data/scene/missions/newhorizons/pluto/pluto and
+-- data/scene/missions/newhorizons/pluto/charon respectively
+
+-- Each image is provided at a lower resolution for lower spec systems
+
+-- pluto_image = "textures/NH_Pluto_mosaic_8192.png"
+-- pluto_image = "textures/NH_Pluto_mosaic_16384.png"
+pluto_image = "textures/pmap_cyl_k201.jpg"
+-- pluto_image = "textures/pmap_cyl_k201_4096.jpg"
+
+-- pluto_height = "textures/NH_Pluto_DTM_8192.png"
+pluto_height = "textures/NH_Pluto_DTM_16384.png"
+
+
+charon_image = "textures/NH_Charon_mosaic.png"
+-- charon_image = "textures/NH_Charon_mosaic_8192.png"
+
+charon_height = "textures/NH_Charon_DTM.png"
+-- charon_height = "textures/NH_Charon_DTM_8192.png"

 function preInitialization()
    --[[
@@ -14,7 +30,7 @@ function preInitialization()
    openspace.spice.loadKernel("${SPICE}/naif0012.tls")
    openspace.spice.loadKernel("${SPICE}/pck00010.tpc")

-    openspace.time.setTime("2015-07-14T10:05:00.00")
+    openspace.time.setTime("2015-07-14T08:00:00.00")

    -- Load the common helper functions
    dofile(openspace.absPath('${SCRIPTS}/common.lua'))
@@ -28,79 +44,79 @@ function preInitialization()

    openspace.bindKey(
        "a",
-        "openspace.setPropertyValue('Interaction.origin', 'NewHorizons')",
+        "openspace.setPropertyValue('NavigationHandler.Origin', 'NewHorizons')",
        "Sets the focus of the camera on 'NewHorizons'."
    )
    openspace.bindKey(
        "s",
-        "openspace.setPropertyValue('Interaction.origin', 'Pluto')",
+        "openspace.setPropertyValue('NavigationHandler.Origin', 'Pluto')",
        "Sets the focus of the camera on 'Pluto'"
    )
    openspace.bindKey(
        "d",
-        "openspace.setPropertyValue('Interaction.origin', 'Charon')",
+        "openspace.setPropertyValue('NavigationHandler.Origin', 'Charon')",
        "Sets the focus of the camera on 'Charon'."
    )
    openspace.bindKey(
        "z",
-        "openspace.setPropertyValue('Interaction.origin', 'JupiterProjection')",
+        "openspace.setPropertyValue('NavigationHandler.Origin', 'JupiterProjection')",
        "Sets the focus of the camera on 'Jupiter'."
    )
    openspace.bindKey(
        "x",
-        "openspace.setPropertyValue('Interaction.origin', 'Europa')",
+        "openspace.setPropertyValue('NavigationHandler.Origin', 'Europa')",
        "Sets the focus of the camera on 'Europa'."
    )

    openspace.bindKey(
        "F8",
-        "openspace.setPropertyValue('Pluto.renderable.ProjectionComponent.clearAllProjections', true);" ..
-        "openspace.setPropertyValue('Charon.renderable.ProjectionComponent.clearAllProjections', true);",
+        "openspace.setPropertyValue('Pluto.renderable.ProjectionComponent.ClearAllProjections', true);" ..
+        "openspace.setPropertyValue('Charon.renderable.ProjectionComponent.ClearAllProjections', true);",
        "Removes all image projections from Pluto and Charon."
    )

    openspace.bindKey(
        "F9",
        "openspace.time.setTime('2015-07-14T09:00:00.00');" ..
-        "openspace.setPropertyValue('Pluto.renderable.clearAllProjections', true);" ..
-        "openspace.setPropertyValue('Charon.renderable.clearAllProjections', true);",
+        "openspace.setPropertyValue('Pluto.renderable.ClearAllProjections', true);" ..
+        "openspace.setPropertyValue('Charon.renderable.ClearAllProjections', true);",
        "Jumps to the 14th of July 2015 at 0900 UTC and clears all projections."
    )

    openspace.bindKey(
        "KP_8",
-        helper.property.increment('Pluto.renderable.heightExaggeration', 0.1),
+        helper.property.increment('Pluto.renderable.HeightExaggeration', 5000000),
        "Increases the height map exaggeration on Pluto."
    )
    openspace.bindKey(
        "KP_2",
-        helper.property.decrement('Pluto.renderable.heightExaggeration', 0.1),
+        helper.property.decrement('Pluto.renderable.HeightExaggeration', 5000000),
        "Decreases the height map exaggeration on Pluto."
    )
    openspace.bindKey(
        "KP_9",
-        helper.property.increment('Charon.renderable.heightExaggeration', 2),
+        helper.property.increment('Charon.renderable.HeightExaggeration', 5000000),
        "Increases the height map exaggeration on Charon."
    )
    openspace.bindKey(
        "KP_3",
-        helper.property.decrement('Charon.renderable.heightExaggeration', 2),
+        helper.property.decrement('Charon.renderable.HeightExaggeration', 5000000),
        "Decreases the height map exaggeration on Charon."
    )

    openspace.bindKey(
        "q",
-        helper.property.invert('SunMarker.renderable.enabled'),
+        helper.property.invert('SunMarker.renderable.Enabled'),
        "Toggles the visibility of the text marking the location of the Sun."
    )
    openspace.bindKey(
        "e",
-        helper.property.invert('EarthMarker.renderable.enabled'),
+        helper.property.invert('EarthMarker.renderable.Enabled'),
        "Toggles the visibility of the text marking the location of the Earth."
    )
    openspace.bindKey(
        "o",
-        helper.property.invert('PlutoTrail.renderable.enabled'),
+        helper.property.invert('PlutoTrail.renderable.Enabled'),
        "Toggles the visibility of the trail behind Pluto."
    )

@@ -119,17 +135,17 @@ function preInitialization()
    )

    openspace.bindKey("m",
-        helper.property.invert('NH_LORRI.renderable.solidDraw') ..
-        helper.property.invert('NH_RALPH_LEISA.renderable.solidDraw') ..
-        helper.property.invert('NH_RALPH_MVIC_PAN1.renderable.solidDraw') ..
-        helper.property.invert('NH_RALPH_MVIC_PAN2.renderable.solidDraw') ..
-        helper.property.invert('NH_RALPH_MVIC_RED.renderable.solidDraw') ..
-        helper.property.invert('NH_RALPH_MVIC_BLUE.renderable.solidDraw') ..
-        helper.property.invert('NH_RALPH_MVIC_FT.renderable.solidDraw') ..
-        helper.property.invert('NH_RALPH_MVIC_METHANE.renderable.solidDraw') ..
-        helper.property.invert('NH_RALPH_MVIC_NIR.renderable.solidDraw') ..
-        helper.property.invert('NH_ALICE_AIRGLOW.renderable.solidDraw') ..
-        helper.property.invert('NH_ALICE_SOC.renderable.solidDraw'),
+        helper.property.invert('NH_LORRI.renderable.SolidDraw') ..
+        helper.property.invert('NH_RALPH_LEISA.renderable.SolidDraw') ..
+        helper.property.invert('NH_RALPH_MVIC_PAN1.renderable.SolidDraw') ..
+        helper.property.invert('NH_RALPH_MVIC_PAN2.renderable.SolidDraw') ..
+        helper.property.invert('NH_RALPH_MVIC_RED.renderable.SolidDraw') ..
+        helper.property.invert('NH_RALPH_MVIC_BLUE.renderable.SolidDraw') ..
+        helper.property.invert('NH_RALPH_MVIC_FT.renderable.SolidDraw') ..
+        helper.property.invert('NH_RALPH_MVIC_METHANE.renderable.SolidDraw') ..
+        helper.property.invert('NH_RALPH_MVIC_NIR.renderable.SolidDraw') ..
+        helper.property.invert('NH_ALICE_AIRGLOW.renderable.SolidDraw') ..
+        helper.property.invert('NH_ALICE_SOC.renderable.SolidDraw'),
        "Draws the instrument field of views in a solid color or as lines."
    )

@@ -139,16 +155,16 @@ function preInitialization()
        "Toggles the visibility of the shadow visualization of Pluto and Charon."
    )

-    openspace.bindKey("p",
-        helper.property.invert('JupiterProjection.renderable.performProjection') ..
-        helper.property.invert('Io.renderable.performProjection') .. 
-        helper.property.invert('Ganymede.renderable.performProjection') ..
-        helper.property.invert('Europa.renderable.performProjection') .. 
-        helper.property.invert('Callisto.renderable.performProjection') ..
-        helper.property.invert('Pluto.renderable.performProjection') .. 
-        helper.property.invert('Charon.renderable.performProjection'),
-        "Enables or disables the image projection on the different available objects."
-    )
+    -- openspace.bindKey("p",
+    --     helper.property.invert('JupiterProjection.renderable.PerformProjection') ..
+    --     helper.property.invert('Io.renderable.PerformProjection') .. 
+    --     helper.property.invert('Ganymede.renderable.PerformProjection') ..
+    --     helper.property.invert('Europa.renderable.PerformProjection') .. 
+    --     helper.property.invert('Callisto.renderable.PerformProjection') ..
+    --     helper.property.invert('Pluto.renderable.PerformProjection') .. 
+    --     helper.property.invert('Charon.renderable.PerformProjection'),
+    --     "Enables or disables the image projection on the different available objects."
+    -- )
 end

 function postInitialization()
@@ -185,6 +201,7 @@ return {
        "venus",
        "earth",
        "mars",
+        "jupiter/jupiter",
        "saturn/saturn",
        "uranus",
        "neptune",
@@ -193,7 +210,7 @@ return {
        "milkyway/digitaluniverse",
        --"milkyway/eso",
        "missions/newhorizons/pluto",
-        "missions/newhorizons/jupiter",
+        -- "missions/newhorizons/jupiter",
        "missions/newhorizons/newhorizons",
        "missions/newhorizons/newhorizonsfov"
    }
--- a/data/web/keybindings/main.hbs
+++ b/data/web/keybindings/main.hbs
@@ -2,7 +2,6 @@
  <div class="container-fluid documentation-container">
    <h1>OpenSpace Keybindings</h1>
    <p>Version: {{version.[0]}}.{{version.[1]}}.{{version.[2]}}</p>
-    <p>Generated: {{generationTime}}</p>
    {{#each keybindings}}
      {{> keybinding}}
    {{/each}}
--- a/data/web/keybindings/script.js
+++ b/data/web/keybindings/script.js
@@ -24,8 +24,7 @@ window.onload = function () {

  var data = {
    keybindings: keybindings,
-    version: version,
-    generationTime: generationTime
+    version: version
  }

  var contents = mainTemplate(data);
--- a/data/web/properties/main.hbs
+++ b/data/web/properties/main.hbs
@@ -18,9 +18,8 @@
    <div class="container-fluid documentation-container">
      <h1>OpenSpace Scene Properties</h1>
      <p>Version: {{version.[0]}}.{{version.[1]}}.{{version.[2]}}</p>
-      <p>Generated: {{generationTime}}</p>

-    	{{#each propertyOwners}}
+      {{#each propertyOwners}}
        <div class="row">
          <div class="col-lg-12">
            <h2><a class="documentation-name" href="#{{name}}" name="{{name}}">{{name}}</a></h2>
--- a/data/web/properties/script.js
+++ b/data/web/properties/script.js
@@ -52,9 +52,7 @@ window.onload = function () {

  var data = {
    propertyOwners: propertyOwners,
-    version: version,
-    // sceneFilename: sceneFilename,
-    generationTime: generationTime
+    version: version
  }

  var contents = mainTemplate(data);