Cleanup of data/scene directory

data/scene/charon/charon.data

@@ -1,5 +0,0 @@
-return {
-    FileRequest = {
-        { Identifier = "charon_textures", Destination = "textures", Version = 1 }
-    },
-}

data/scene/charon/charon.mod

@@ -1,63 +0,0 @@
-return {
-    -- Charon module
-    {   
-        Name = "Charon",
-        Parent = "PlutoBarycenter",
-        Renderable = {
-            Type = "RenderablePlanet",
-            Frame = "IAU_CHARON",
-            Body = "CHARON",
-            Geometry = {
-                Type = "SimpleSphere",
-                Radius = { 6.035 , 5 },
-                Segments = 100
-            },
-            Textures = {
-                Type = "simple",
-                Color = "textures/gray.jpg",
-            },
-            Atmosphere = {
-                Type = "Nishita", -- for example, values missing etc etc
-                MieFactor = 1.0,
-                MieColor = {1.0, 1.0, 1.0}
-            }
-        },
-        Ephemeris = {
-            Type = "Spice",
-            Body = "CHARON",
-            Reference = "ECLIPJ2000",
-            Observer = "PLUTO BARYCENTER",
-            Kernels = {
-                "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
-            }
-        },
-        Rotation = {
-            Type = "Spice",
-            Frame = "IAU_CHARON",
-            Reference = "ECLIPJ2000"
-        },
-        GuiName = "/Solar/Planets/Charon"
-    },
-
-    -- CharonTrail module
-    {   
-        Name = "CharonTrail",
-        Parent = "PlutoBarycenter",
-        Renderable = {
-            Type = "RenderableTrail",
-            Body = "CHARON",
-            Frame = "GALACTIC",
-            Observer = "PLUTO BARYCENTER",
-            RGB = {0.00,0.62,1.00},
-            TropicalOrbitPeriod = 120 ,
-            EarthOrbitRatio = 0.03,
-            DayLength = 1,
-            Textures = {
-                Type = "simple",
-                Color = "${COMMON_MODULE}/textures/glare_blue.png",
-                -- need to add different texture
-            },  
-        },
-        GuiName = "/Solar/CharonTrail"
-    }
-}

data/scene/ephemeris/ephemeris.mod

@@ -1,16 +0,0 @@
-return {
-    -- Ephemeris module
-    {   
-        Name = "Ephemeris",
-        Parent = "Root",
-        Renderable = {
-            Type = "RenderableEphemeris",
-            Textures = {
-                Type = "simple",
-                Color = "textures/glare_blue.png",
-                -- need to add different texture
-            },    
-        },
-        GuiName = "/Solar/Ephemeris"
-    }
-}

data/scene/expertvolume/expertraycaster.cl

@@ -1,80 +0,0 @@
-#include <volume_helpers.cl>
-#include <volume_raycasting.cl>
-
-__kernel void volumeraycaster(
-          __read_only image2d_t _cubeFront,
-          __read_only image2d_t _cubeBack,
-          __write_only image2d_t _output,
-          __read_only image3d_t _voxelData,
-          __read_only RC_TF_TYPE _t1);
-
-
-__kernel void volumeraycaster(
-          __read_only image2d_t _cubeFront,
-          __read_only image2d_t _cubeBack,
-          __write_only image2d_t _output,
-          __read_only image3d_t _voxelData,
-          __read_only RC_TF_TYPE _t1) {
-  // Kernel should be launched in 2D with one work item per pixel
-  int idx = get_global_id(0);
-  int idy = get_global_id(1);
-
-  int2 intCoords = (int2)(idx, idy);
-
-  // Sampler for texture reading
-  const sampler_t sampler = CLK_NORMALIZED_COORDS_FALSE;
-  const sampler_t transferSampler = CLK_ADDRESS_CLAMP_TO_EDGE |
-                                    CLK_NORMALIZED_COORDS_TRUE |
-                                    CLK_FILTER_LINEAR;
-  const sampler_t volumeSampler = CLK_ADDRESS_CLAMP_TO_EDGE |
-                                  CLK_FILTER_LINEAR |
-                                  CLK_NORMALIZED_COORDS_TRUE;
-  // Read from textures
-  float stepSize = 0.01f;
-  float3 front = read_imagef(_cubeFront, sampler, intCoords).xyz;
-  float3 back = read_imagef(_cubeBack, sampler, intCoords).xyz;
-  float3 direction = back - front;
-  float directionLength = length(direction);
-  direction = normalize(direction);
-  float3 position = front;
-  float intensity= 0.0f;
-  float4 color = (float4)(0.0,0.0,0.0,0.0);
-  float4 finalColor = (float4)(0.0,0.0,0.0,0.0);
-
-  int4 vol_dim = get_image_dim(_voxelData);
-
-  int iterations = directionLength / stepSize;
-  float iterationsf = iterations;
-  iterationsf /= 10.0f;
-  for(int i = 0; i < iterations && finalColor.w < 0.95f; ++i) {
-    float3 sph_pos = CartesianToSpherical(position);
-    float4 sp = (float4)(sph_pos.x,sph_pos.y,sph_pos.z,0.0f);
-    //float4 sp = (float4)(position.x,position.y,position.z,0.0f);
-    
-    intensity = read_imagef(_voxelData, volumeSampler, sp).x;
-    //float4 intensityvec = read_imagef(_voxelData, volumeSampler, sp);
-
-    color = read_imagef(_t1, transferSampler, RC_TF_MAP(intensity));
-    color /= iterationsf;
-
-    float alpha = (1.0f - finalColor.w);
-    float outputRed = (finalColor.x ) + (color.x * alpha);
-    float outputGreen = (finalColor.y ) + (color.y * alpha);
-    float outputBlue = (finalColor.z ) + (color.z * alpha);
-    float outputAlpha = finalColor.w + alpha*color.w;
-
-    finalColor = (float4)(outputRed, outputGreen, outputBlue, outputAlpha);
-
-    //finalColor = max(finalColor, intensityvec); 
-    position = position + direction * stepSize;
-  }
-
-  //color = (float4)(color.x,color.x,color.x,1.0f);
-  //write_imagef(_output, intCoords, _cubeFront);
-  //finalColor = (float4)(front.x,front.y,front.z,1.0f);
-  write_imagef(_output, intCoords, finalColor);
-
-  
-}
-
-

data/scene/expertvolume/expertvolume.mod

@@ -1,70 +0,0 @@
-return {
-    -- Volume module
-    {   
-        Name = "Volume",
-        Parent = "Root",
-        Ephemeris = {
-            Type = "Static",
-            Position = { 0, 0, -3.0, 0}
-        },
-        Renderable = {
-            Type = "RenderableVolumeExpert",
-
-            --BoxScaling = { 3.0, 1.0, 1.0},
-            Volumes = {
-                
-                -- {
-                --     File = "${OPENSPACE_DATA}/skull.raw",
-                --     Hints = {
-                --         Dimensions = {256, 256, 256},
-                --         Format = "RED",
-                --         InternalFormat = "R8"
-                --     },
-                -- },
-                
-                ---[[
-                {
-                    File = "${OPENSPACE_DATA}/batsrus.cdf",
-                    Hints = {
-                        Dimensions = {384, 128, 128},
-                        Model = "BATSRUS",
-                        Variable = "rho",
-                    },
-                },
-                --]]
-                --[[
-                {
-                    File = "${OPENSPACE_DATA}/enlil/Hong_Xie_120312_SH_1.enlil.0009.cdf",
-                    Hints = {
-                        Dimensions = {256, 30, 90},
-                        Model = "ENLIL",
-                        Variable = "rho",
-                    },
-                },
-                --]]
-            },
-            TransferFunctions = {
-                --"${CONFIG}/transferfunctions/fire.txt",
-                "${OPENSPACE_DATA}/scene/expertvolume/transferfunctions/t1.txt",
-                --"transferfunctions/t1.png",
-                --"transferfunctions/t2.png"
-            },
-
-            Kernel = {
-                Source = "${OPENSPACE_DATA}/scene/expertvolume/expertraycaster.cl",
-                Options = {
-                    OptDisable = true,
-                    KernelArgInfo = true,
-                },
-                Definitions = {
-                    MIP = "1",
-                },
-                Includes = {
-                    "${KERNELS}/helpers"
-                },
-                UpdateOnSave = true,
-            },
-        },
-        GuiName = "/Volumes/Volume"
-    }
-}

data/scene/expertvolume/transferfunctions/t1.txt

@@ -1,7 +0,0 @@
-width 1024
-lower 0.0
-upper 1.0
-mappingkey 0.001 0 0 30 50
-mappingkey 0.1 	 0 0 30 50
-mappingkey 0.2500 200 200 200 200
-mappingkey 0.400 200 200 200 200

data/scene/planes/planes.mod

@@ -1,74 +0,0 @@
-colors = {
-    {1.0, 0.0, 0.0, 1.0},
-    {0.0, 1.0, 0.0, 1.0},
-    {0.0, 0.0, 1.0, 1.0}
-}
-
-result = {}
-
-for i = 1, 100, 1 do
-    result[i] = {
-        Name = "Plane" .. i,
-        Parent = "Root",
-        Renderable = {
-            Type = "RenderablePlane",
-            Size = {1.0, i },
-            -- Color = {math.floor(i/3), math.floor((i+1)/3), math.floor((i+2)/3)}
-            Color = colors[((i - 1 )% 3) + 1]
-        },
-        Ephemeris = {
-            Type = "Static",
-            Position = {0, 0, 1, i}
-        }
-    }
-
-end
-
--- j = 1
--- print(result[j]['Renderable']['Color'][1])
--- print(result[j]['Renderable']['Color'][2])
--- print(result[j]['Renderable']['Color'][3])
-
-return result
---  {
-
---     {
---         Name = "Plane1",
---         Parent = "Root",
---         Renderable = {
---             Type = "RenderablePlane",
---             Size = {1.0, 0.0},
---             Color = {1.0, 0.0, 0.0, 1.0}
---         },
---         Ephemeris = {
---             Type = "Static",
---             Position = { 0, 0, 0, 0}
---         },
---     },
---     {   
---         Name = "Plane2",
---         Parent = "Root",
---         Renderable = {
---             Type = "RenderablePlane",
---             Size = {1.0, 1.0},
---             Color = {1.0, 1.0, 0.0, 1.0}
---         },
---         Ephemeris = {
---             Type = "Static",
---             Position = { 0, 0, 1, 0}
---         },
---     },
---     {   
---         Name = "Plane3",
---         Parent = "Root",
---         Renderable = {
---             Type = "RenderablePlane",
---             Size = {1.0, 2.0},
---             Color = {1.0, 1.0, 1.0, 1.0}
---         },
---         Ephemeris = {
---             Type = "Static",
---             Position = { 0, 0, 1, 1}
---         },
---     }
--- }

data/scene/planetCoordinates/planetCoordinates.mod

@@ -1,32 +0,0 @@
-return {
-    -- PlanetCoordinates module
-    {   
-        Name = "PlanetCoordinates",
-        Parent = "JupiterBarycenter",
-        Static = true,
-        Renderable = {
-            Type = "RenderableSphericalGrid",
-            GridType = "GALACTIC",
-            GridColor = { 0.2, 0.2, 0.2, 1},
-            ParentsRotation = "IAU_JUPITER", 
-            GridSegments = 36,
-            GridRadius = { 0.72, 8 },
-        }, 
-        Ephemeris = {
-            Type = "Static" -- for now, might change.
-        },
-    
-        --[[
-        Ephemeris = {
-            Type = "Spice",
-            Body = "EARTH",
-            Reference = "ECLIPJ2000",
-            Observer = "EARTH BARYCENTER",
-            Kernels = {
-                "kernels/earth.bsp"
-            }
-        },    
-        --]]
-        GuiName = "/Grid/Galactic"
-    }
-}

data/scene/pluto/pluto.data

@@ -1,5 +1,6 @@
 return {
     FileRequest = {
+        { Identifier = "charon_textures", Destination = "textures", Version = 1 },
         { Identifier = "pluto_textures", Destination = "textures", Version = 2 }
-    },
+    }
 }

data/scene/pluto/pluto.mod

@@ -56,6 +56,66 @@ return {
         },
         GuiName = "/Solar/Planets/Pluto"
     },
+{   
+        Name = "Charon",
+        Parent = "PlutoBarycenter",
+        Renderable = {
+            Type = "RenderablePlanet",
+            Frame = "IAU_CHARON",
+            Body = "CHARON",
+            Geometry = {
+                Type = "SimpleSphere",
+                Radius = { 6.035 , 5 },
+                Segments = 100
+            },
+            Textures = {
+                Type = "simple",
+                Color = "textures/gray.jpg",
+            },
+            Atmosphere = {
+                Type = "Nishita", -- for example, values missing etc etc
+                MieFactor = 1.0,
+                MieColor = {1.0, 1.0, 1.0}
+            }
+        },
+        Ephemeris = {
+            Type = "Spice",
+            Body = "CHARON",
+            Reference = "ECLIPJ2000",
+            Observer = "PLUTO BARYCENTER",
+            Kernels = {
+                "${OPENSPACE_DATA}/spice/de430_1850-2150.bsp"
+            }
+        },
+        Rotation = {
+            Type = "Spice",
+            Frame = "IAU_CHARON",
+            Reference = "ECLIPJ2000"
+        },
+        GuiName = "/Solar/Planets/Charon"
+    },
+
+    -- CharonTrail module
+    {   
+        Name = "CharonTrail",
+        Parent = "PlutoBarycenter",
+        Renderable = {
+            Type = "RenderableTrail",
+            Body = "CHARON",
+            Frame = "GALACTIC",
+            Observer = "PLUTO BARYCENTER",
+            RGB = {0.00,0.62,1.00},
+            TropicalOrbitPeriod = 120 ,
+            EarthOrbitRatio = 0.03,
+            DayLength = 1,
+            Textures = {
+                Type = "simple",
+                Color = "${COMMON_MODULE}/textures/glare_blue.png",
+                -- need to add different texture
+            },  
+        },
+        GuiName = "/Solar/CharonTrail"
+    }    
     --[[
     -- PlutoTrail module
     {   

data/scene/rosetta.scene

@@ -20,9 +20,6 @@ function postInitialization()
     openspace.setPropertyValue("Sun.renderable.enabled", false)
     openspace.setPropertyValue("SunMarker.renderable.enabled", true)
     openspace.setPropertyValue("EarthMarker.renderable.enabled", true)
-    --openspace.setPropertyValue("Constellation Bounds.renderable.enabled", false)
-    openspace.setPropertyValue("PlutoTrail.renderable.enabled", false)
-    openspace.setPropertyValue("PlutoTexture.renderable.enabled", false)
 
     openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55)
     openspace.setPropertyValue("MilkyWay.renderable.segments", 50)
@@ -47,11 +44,9 @@ return {
         "saturn",
         "uranus",
         "neptune",
-        -- "pluto",
         "stars",
         "milkyway",
         "rosetta",
-        "67P",
     }
 }
 

data/scene/volumegl/sampler.glsl

@@ -1,5 +0,0 @@
-vec4 sampleVolume1(inout vec4 finalColor, vec3 position) {
-	float intensity = texture(volume1, position).x;
-	return texture(transferFunction1, intensity);
-	//blendStep(finalColor, color, stepSize);
-}

data/scene/volumegl/transferfunctions/t1.txt

@@ -1,9 +0,0 @@
-width 128
-lower 0.0
-upper 1.0
-mappingkey 0.1 0 0 0 0
-mappingkey 0.2 255 0 255 254
-mappingkey 0.3  255 255  255 254
-mappingkey 0.4  0 0  0 0
-//mappingkey 0.6  255 255  255 100
-//mappingkey 0.9  0 0  0 0

data/scene/volumegl/volumegl.mod

@@ -1,45 +0,0 @@
-
-earth_radius = 6.371*2
-earth_radius_s = 6
-
-return {
-    -- Volume module
-    {   
-        Name = "Volume",
-        Parent = "Earth",
-        Ephemeris = {
-            Type = "Static",
-            Position = { 0, 0, 0.0, 0}
-        },
-        Renderable = {
-            Type = "RenderableVolumeGL",
-            --[[
-            BoxScaling = { 1.0, 1.0, 1.0},
-            Volume = "${OPENSPACE_DATA}/skull.raw",
-            Hints = {
-                Dimensions = {256, 256, 256},
-                Format = "RED",
-                InternalFormat = "R8"
-            },
-            --]]
-
-            ---[[
-            VolumeName = "volume1",
-            Volume = "${OPENSPACE_DATA}/batsrus.cdf",
-            Hints = {
-                        Dimensions = {300, 100, 100},
-                        -- Dimensions = {600, 200, 200},
-                        -- Dimensions = {900, 300, 300},
-                        Variable = "rho",
-                        Cache = true,
-                        --Variables = {"bx", "by", "bz"},
-            },
-            --]]
-
-            TransferFunctionName = "transferFunction1",
-            TransferFunction = "transferfunctions/t1.txt",
-            Sampler = "sampler.glsl",
-        },
-        GuiName = "/Volumes/Volume"
-    }
-}

data/scene/volumegl2/sampler.glsl

@@ -1,5 +0,0 @@
-vec4 sampleVolume2(inout vec4 finalColor, vec3 position) {
-	float intensity = texture(volume2, position).x;
-	return texture(transferFunction2, intensity);
-	//blendStep(finalColor, color, stepSize);
-}

data/scene/volumegl2/transferfunctions/t1.txt

@@ -1,10 +0,0 @@
-width 1024
-lower 0.0
-upper 1.0
-mappingkey 0.01 0 0 0 0
-mappingkey 0.1 255 0 100 254
-mappingkey 0.2 255 0 100 254
-mappingkey 0.3  255 255  255 254
-mappingkey 0.4  0 0  0 0
-//mappingkey 0.6  255 255  255 100
-//mappingkey 0.9  0 0  0 0

data/scene/volumegl2/volumegl2.mod

@@ -1,45 +0,0 @@
-f = 1
-return {
-    -- Volume module
-    {   
-        Name = "Volume2",
-        Parent = "Root",
-        Ephemeris = {
-            Type = "Static",
-            Position = { 1, 0.0, 0.0, 0}
-        },
-        RenderableToggle = "1",
-        Renderable = {
-            Type = "RenderableVolumeGL",
-            --[[
-            BoxScaling = { 1.0, 1.0, 1.0},
-            Volume = "${OPENSPACE_DATA}/skull.raw",
-            Hints = {
-                Dimensions = {256, 256, 256},
-                Format = "RED",
-                InternalFormat = "R8"
-            },
-            --]]
-
-            ---[[
-            BoxScaling = { 2.8*f, 1*f, 1*f, 0.0},
-            VolumeName = "volume2",
-            Volume = "${OPENSPACE_DATA}/batsrus.cdf",
-            Hints = {
-                        -- Dimensions = {300, 100, 100},
-                        Dimensions = {600, 200, 200},
-                        -- Dimensions = {900, 300, 300},
-                        Model = "BATSRUS",
-                        Variable = "rho",
-                        Cache = true,
-                        --Variables = {"bx", "by", "bz"},
-            },
-            --]]
-
-            TransferFunctionName = "transferFunction2",
-            TransferFunction = "transferfunctions/t1.txt",
-            Sampler = "sampler.glsl",
-        },
-        GuiName = "/Volumes/Volume"
-    }
-}

data/scene/volumegl3/sampler.glsl

@@ -1,5 +0,0 @@
-vec4 sampleVolume3(inout vec4 finalColor, vec3 position) {
-	float intensity = texture(volume3, position).x;
-	return texture(transferFunction3, 1-intensity);
-	//blendStep(finalColor, color, stepSize);
-}

data/scene/volumegl3/transferfunctions/t1.txt

@@ -1,13 +0,0 @@
-width 1024
-lower 0.0
-upper 1.0
-mappingkey    0.0      0    0    0    0
-mappingkey    0.1     43   17   39    0
-mappingkey    0.2     13   22  101    0
-mappingkey    0.3     17   68  131    0
-mappingkey    0.4     17  116  109  150
-mappingkey    0.5     17  153   70  150
-mappingkey    0.6     47  188   17  254
-mappingkey    0.7    132  210   17  254
-mappingkey    0.8    223  216   99  150
-mappingkey    0.9    255  230  209  150

data/scene/volumegl3/volumegl3.mod

@@ -1,45 +0,0 @@
-f = 1
-return {
-    -- Volume module
-    {   
-        Name = "Volume3",
-        Parent = "Root",
-        Ephemeris = {
-            Type = "Static",
-            Position = { -1.0, -0.1, 0.1, 0}
-        },
-        RenderableToggle = "1",
-        Renderable = {
-            Type = "RenderableVolumeGL",
-            --[[
-            BoxScaling = { 1.0, 1.0, 1.0},
-            Volume = "${OPENSPACE_DATA}/skull.raw",
-            Hints = {
-                Dimensions = {256, 256, 256},
-                Format = "RED",
-                InternalFormat = "R8"
-            },
-            --]]
-
-            ---[[
-            BoxScaling = { 2.8*f, 1*f, 1*f, 0.0},
-            VolumeName = "volume3",
-            Volume = "${OPENSPACE_DATA}/batsrus.cdf",
-            Hints = {
-                        -- Dimensions = {300, 100, 100},
-                        Dimensions = {600, 200, 200},
-                        -- Dimensions = {900, 300, 300},
-                        Model = "BATSRUS",
-                        Variable = "rho",
-                        Cache = true,
-                        --Variables = {"bx", "by", "bz"},
-            },
-            -- ]]
-
-            TransferFunctionName = "transferFunction3",
-            TransferFunction = "transferfunctions/t1.txt",
-            Sampler = "sampler.glsl",
-        },
-        GuiName = "/Volumes/Volume"
-    }
-}