sync with removal of duplicate branch

PM-2019-006.log

@@ -1,256 +0,0 @@
-103.7,0.1,0.2,0.1,0.1
-113.2,0.1,0.1,0.1,0.2
-120.6,0.2,0.1,0.1,0.1
-132.6,0.1,0.2,0.1,0.1
-112.5,0.2,0.2,0.1,0.1
-112.1,0.1,0.1,0.1,0.2
-103.7,0.1,0.1,0.1,0.1
-112.6,0.1,0.1,0.1,0.1
-103.7,0.2,0.1,0.1,0.1
-112.7,0.2,0.1,0.1,0.1
-118.1,0.1,0.1,0.1,0.1
-106.8,0.1,0.1,0.1,0.1
-103.8,0.1,0.1,0.1,0.2
-133.2,0.2,0.1,0.1,0.1
-134.1,0.1,0.2,0.1,0.1
-108.2,0.1,0.2,0.1,0.1
-103.8,0.1,0.1,0.2,0.2
-113.1,0.1,0.1,0.1,0.1
-112.4,0.1,0.2,0.1,0.1
-112.8,0.1,0.2,0.1,0.1
-103.9,0.1,0.1,0.1,0.1
-112,0.1,0.1,0.2,0.1
-103.9,0.1,0.1,0.1,0.1
-103.3,0.2,0.1,0.1,0.1
-118.4,0.1,0.1,0.2,0.1
-137.9,0.1,0.1,0.1,0.1
-129.3,0.2,0.1,0.2,0.2
-138.1,0.1,0.1,0.2,0.2
-437.3,0.1,0.1,0.1,0.1
-121,0.1,0.1,0.1,0.2
-135.8,0.1,0.1,0.1,0.1
-106.4,0.1,0.1,0.2,0.2
-106.6,0.2,0.2,0.1,0.1
-150.9,0.1,0.1,0.1,0.2
-116.2,0.2,0.1,0.1,0.1
-122.5,0.1,0.1,0.1,0.1
-122,0.1,0.2,0.1,0.1
-193.4,0.1,0.1,0.1,0.1
-124.5,0.1,0.1,0.2,0.2
-126.4,0.1,0.1,0.2,0.1
-126.1,0.3,0.3,0.2,0.3
-125.2,0.1,0.1,0.2,0.1
-124.6,0.2,0.1,0.2,0.1
-119.6,0.1,0.2,0.1,0.1
-115.3,0.1,0.1,0.1,0.1
-131.8,0.2,0.1,0.1,0.1
-124,0.1,0.2,0.1,0.1
-118.7,0.1,0.1,0.1,0.2
-123.7,0.1,0.1,0.1,0.1
-120.2,0.1,0.1,0.1,0.1
-138.3,0.1,0.1,0.1,0.1
-150.3,0.1,0.1,0.1,0.2
-137.2,0.1,0.1,0.1,0.1
-124.3,0.2,0.2,0.1,0.1
-137,0.1,0.1,0.2,0.1
-128.8,0.1,0.1,0.2,0.1
-191.7,0.1,0.1,0.2,0.1
-126.9,0.1,0.2,0.1,0.1
-126.7,0.1,0.1,0.1,0.2
-105.5,0.1,0.1,0.1,0.1
-162.2,0.1,0.1,0.2,0.1
-115.8,0.1,0.2,0.2,0.2
-104.3,0.1,0.2,0.2,0.1
-103.8,0.2,0.1,0.3,0.1
-103.8,0.1,0.2,0.2,0.2
-125,0.1,0.1,0.2,0.1
-103.9,0.1,0.1,0.1,0.2
-113.1,0.1,0.2,0.1,0.1
-104.3,0.1,0.1,0.2,0.1
-136.3,0.2,0.1,0.1,0.1
-124.9,0.1,0.1,0.2,0.1
-103.9,0.1,0.1,0.1,0.1
-103.5,0.1,0.2,0.1,0.2
-140.7,0.1,0.2,0.1,0.1
-104.9,0.1,0.1,0.1,0.1
-107.8,0.2,0.1,0.2,0.1
-132.8,0.1,0.1,0.2,0.1
-134.5,0.1,0.2,0.2,0.1
-106.3,0.1,0.2,0.2,0.2
-121.7,0.1,0.2,0.1,0.2
-125.1,0.1,0.1,0.2,0.1
-118.7,0.1,0.1,0.1,0.1
-116.6,0.1,0.1,0.2,0.2
-116.7,0.1,0.2,0.1,0.1
-115.9,0.2,0.2,0.1,0.1
-116.9,0.2,0.1,0.1,0.1
-116,0.1,0.2,0.1,0.1
-117.2,0.1,0.1,0.2,0.1
-106.6,0.1,0.1,0.1,0.2
-103.9,0.1,0.2,0.1,0.1
-102.2,0.1,0.1,0.2,0.2
-124.5,0.1,0.1,0.1,0.1
-104,0.2,0.1,0.1,0.1
-380.1,0.1,0.1,0.1,0.1
-108.9,0.1,0.2,0.1,0.1
-111.4,0.1,0.2,0.1,0.2
-114,0.1,0.1,0.2,0.1
-105,0.1,0.2,0.2,0.2
-132.7,0.2,0.1,0.1,0.2
-105.1,0.1,0.2,0.2,0.2
-104.6,0.1,0.2,0.2,0.2
-108.9,0.1,0.2,0.2,0.2
-125,0.1,0.2,0.2,0.2
-119,0.1,0.2,0.2,0.1
-105.9,0.1,0.2,0.2,0.2
-101.7,0.1,0.1,0.2,0.2
-124.4,0.1,0.1,0.1,0.2
-119.4,0.1,0.2,0.1,0.1
-118.6,0.2,0.1,0.2,0.1
-106.2,0.1,0.1,0.1,0.1
-135,0.1,0.1,0.1,0.1
-138.2,0.1,0.1,0.2,0.1
-129,0.1,0.1,0.2,0.1
-124.6,0.1,0.1,0.1,0.1
-125.1,0.1,0.1,0.1,0.2
-120.8,0.2,0.2,0.2,0.2
-146.6,0.1,0.1,0.2,0.2
-120,0.1,0.1,0.1,0.2
-118.2,0.1,0.1,0.1,0.2
-112.2,0.1,0.1,0.2,0.2
-108.2,0.2,0.2,0.1,0.1
-131,0.1,0.2,0.1,0.1
-115.2,0.2,0.1,0.1,0.2
-127.6,0.1,0.1,0.1,0.1
-148,0.1,0.1,0.1,0.2
-116.2,0.2,0.1,0.2,0.1
-113,0.2,0.1,0.2,0.2
-424.4,0.1,0.1,0.2,0.1
-103.8,0.1,0.2,0.2,0.1
-106.9,0.1,0.2,0.1,0.1
-132.8,0.1,0.2,0.2,0.2
-133.9,0.1,0.1,0.1,0.1
-137.9,0.1,0.2,0.2,0.1
-130.8,0.1,0.1,0.2,0.1
-133.3,0.1,0.1,0.1,0.2
-139.5,0.1,0.1,0.1,0.1
-114.2,0.1,0.2,0.1,0.1
-133.2,0.1,0.1,0.1,0.1
-113.1,0.1,0.1,0.1,0.1
-103.7,0.1,0.1,0.2,0.2
-104,0.1,0.1,0.2,0.1
-133,0.2,0.1,0.1,0.1
-119.2,0.2,0.1,0.2,0.1
-108.1,0.1,0.2,0.1,0.1
-424,0.2,0.1,0.2,0.2
-104.1,0.1,0.2,0.1,0.1
-130.5,0.1,0.2,0.1,0.2
-132.8,0.1,0.2,0.2,0.1
-138.9,0.1,0.1,0.1,0.1
-119.2,0.2,0.2,0.1,0.2
-139.1,0.1,0.1,0.2,0.3
-139.2,0.2,0.2,0.1,0.2
-123.4,0.1,0.1,0.2,0.1
-120.3,0.1,0.2,0.1,0.1
-138.1,0.1,0.1,0.1,0.1
-105.2,0.1,0.1,0.1,0.1
-151.4,0.1,0.1,0.1,0.1
-137.6,0.1,0.1,0.1,0.2
-138.3,0.1,0.1,0.2,0.1
-173.5,0.1,0.1,0.2,0.1
-103.8,0.1,0.2,0.1,0.1
-133.6,0.1,0.1,0.1,0.1
-138.7,0.1,0.1,0.2,0.1
-103.6,0.1,0.1,0.1,0.2
-128.9,0.1,0.1,0.1,0.1
-336.4,0.1,0.1,0.1,0.1
-106.1,0.2,0.5,0.2,0.2
-106.3,0.1,0.2,0.1,0.1
-114.7,0.1,0.2,0.2,0.1
-105.7,0.1,0.1,0.1,0.2
-120.7,0.1,0.1,0.1,0.1
-145.3,0.1,0.1,0.1,0.1
-132.8,0.1,0.1,0.1,0.1
-123.4,0.1,0.1,0.1,0.1
-132.9,0.1,0.2,0.1,0.1
-132.9,0.1,0.1,0.1,0.2
-133.2,0.1,0.1,0.1,0.1
-120.7,0.1,0.1,0.2,0.1
-118.3,0.1,0.1,0.2,0.1
-120.5,0.1,0.1,0.1,0.1
-127.2,0.1,0.2,0.1,0.1
-123.4,0.1,0.2,0.1,0.1
-127.6,0.1,0.2,0.2,0.1
-120.3,0.1,0.2,0.1,0.1
-127.6,0.2,0.1,0.2,0.2
-117,0.1,0.2,0.2,0.1
-118.4,0.1,0.4,0.1,0.1
-115,0.1,0.1,0.1,0.1
-119.9,0.1,0.1,0.1,0.1
-137.3,0.1,0.2,0.1,0.1
-124.8,0.1,0.1,0.1,0.2
-118.9,0.1,0.1,0.2,0.2
-106.4,0.1,0.2,0.1,0.2
-106.5,0.2,0.1,0.2,0.1
-105.7,0.1,0.1,0.2,0.2
-116.4,0.1,0.2,0.1,0.1
-114.9,0.1,0.1,0.1,0.2
-119.7,0.1,0.1,0.1,0.1
-133.2,0.1,0.1,0.2,0.1
-131.7,0.1,0.1,0.1,0.1
-120.3,0.1,0.1,0.2,0.1
-356.5,0.1,0.1,0.2,0.1
-114.4,0.1,0.1,0.1,0.1
-112.7,0.1,0.1,0.1,0.2
-104.4,0.1,0.1,0.1,0.1
-103.8,0.1,0.2,0.1,0.1
-120.6,0.1,0.1,0.2,0.2
-112.6,0.1,0.1,0.2,0.1
-103.5,0.2,0.1,0.1,0.1
-119.6,0.1,0.2,0.1,0.1
-108.1,0.1,0.1,0.2,0.2
-103.7,0.1,0.2,0.1,0.1
-112.1,0.1,0.1,0.1,0.1
-129.1,0.1,0.1,0.2,0.1
-117.7,0.1,0.2,0.1,0.1
-104.6,0.1,0.1,0.1,0.1
-104.7,0.1,0.1,0.1,0.2
-116.9,0.1,0.1,0.1,0.1
-124.3,0.1,0.2,0.1,0.1
-124.1,0.2,0.1,0.1,0.1
-106.4,0.2,0.1,0.1,0.1
-134.1,0.2,0.1,0.1,0.1
-134.2,0.2,0.2,0.2,0.3
-104.5,0.1,0.3,0.4,0.2
-107.2,9.4,0.2,0.2,0.2
-137.9,0.1,0.2,0.2,0.2
-132.3,0.1,0.2,0.2,0.2
-333.9,0.1,0.2,0.2,0.2
-127,0.1,0.1,0.2,0.2
-125.9,0.1,0.2,0.1,0.1
-140.6,0.1,0.2,0.2,0.1
-144,0.1,0.2,0.1,0.1
-123.6,0.1,0.1,0.1,0.1
-144.4,0.1,0.1,0.1,0.1
-132.8,0.1,0.1,0.1,0.2
-132.7,0.1,0.1,0.1,0.1
-128.2,0.1,0.1,0.1,0.2
-138,0.1,0.1,0.2,0.1
-127.5,0.2,0.1,0.2,0.1
-127.8,0.1,0.1,0.1,0.1
-127.9,0.1,0.1,0.1,0.1
-118.5,0.2,0.1,0.2,0.1
-117.7,0.1,0.2,0.1,0.1
-119.7,0.2,0.1,0.2,0.1
-127.5,0.1,0.1,0.1,0.1
-123.3,0.2,0.1,0.2,0.2
-122.6,0.1,0.1,0.1,0.1
-126.7,0.2,0.2,0.2,0.2
-127,0.1,0.1,0.2,0.1
-127.1,0.1,0.1,0.2,0.1
-181.4,0.1,0.2,0.1,0.1
-121.1,0.1,0.2,0.1,0.1
-116.2,0.1,0.2,0.1,0.1
-116.3,0.1,0.1,0.2,0.1
-115.8,0.1,0.1,0.1,0.1
-123.4,0.2,0.1,0.1,0.1

data/assets/examples/volume/generated/cartesiansequence.asset

@@ -35,4 +35,4 @@ local volume = {
 }
 
 local objects = { volume }
-assetHelper.registerSceneGraphNodes(asset, objects)
+assetHelper.registerSceneGraphNodes(asset, objects)

data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/debris_volume.asset

@@ -0,0 +1,38 @@
+-- This asset requires OpenSpace to be built with the OPENSPACE_MODULE_VOLUME enabled
+
+-- Before using this asset,
+-- the volume data itself needs to be generated,
+-- using the task 'data/tasks/volume/debristasks/generate_debris_volume.task'
+
+local assetHelper = asset.require('util/asset_helper')
+local transforms = asset.require("scene/solarsystem/planets/earth/transforms")
+
+local earthRadius = 6.371E6
+
+local volume = {
+    Identifier = "DebrisVolume",
+    Parent = transforms.EarthBarycenter.Identifier,
+    Renderable = {
+        Type = "RenderableTimeVaryingVolume",
+        SourceDirectory = asset.localResource("generated"),
+        TransferFunction = asset.localResource("transferfunction.txt"),
+        StepSize = 0.01,
+        MinValue = 0,
+        MaxValue = 1,
+        GridType = "Cartesian",
+        SecondsBefore = 24*60*60,
+        SecondsAfter = 24*60*60
+    },
+    GUI = {
+        Path = "/Volumes"
+    },
+    Transform = {
+        Scale = {
+            Type = "StaticScale",
+            Scale = earthRadius
+        }
+    }
+}
+
+local objects = { volume }
+assetHelper.registerSceneGraphNodes(asset, objects)

data/assets/scene/solarsystem/planets/earth/satellites/debris/volume/transferfunction.txt

@@ -0,0 +1,5 @@
+width 1024
+lower 0.0
+upper 1.0
+mappingkey 0.0 250 250 250  0
+mappingkey 1.0 200 200 200  255

data/tasks/volume/debristasks/generate_debris_volume.task

@@ -0,0 +1,20 @@
+local length = 60
+local tasks = {}
+
+for i=1,length do
+	local radius = 0.5 * (1 - i/length)
+	local step = string.format("%02d", i-1)
+	tasks[#tasks+1] = {
+	    Type = "GenerateRawVolumeTask", -- fix name
+        Input = input
+	    Dimensions = {32, 32, 32},
+	    LowerDomainBound = {-0.5, -0.5, -0.5},
+	    UpperDomainBound = {0.5, 0.5, 0.5},
+	    ValueFunction = fn,
+	    Time = "2018-05-04T00:00:" .. step,
+	    RawVolumeOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generated/" .. step .. ".rawvolume",
+	    DictionaryOutput = "${DATA}/assets/scene/solarsystem/planets/earth/satellites/debris/volume/generated/" .. step .. ".dictionary"
+	}
+end
+
+return tasks