Merge branch 'feature/hdrOS' of https://github.com/OpenSpace/OpenSpace into feature/milkyway-galaxy

This commit is contained in:
eriksunden
2019-08-16 13:40:21 +02:00
34 changed files with 956 additions and 751 deletions
+5
View File
@@ -10,6 +10,11 @@ asset.onInitialize(function ()
openspace.globebrowsing.goToGeo("Earth", 58.5877, 16.1924, 20000000)
openspace.markInterestingNodes({ "Earth", "Mars", "Moon", "Sun" })
-- HDR / Image options:
openspace.setPropertyValueSingle('RenderEngine.Gamma', 0.95);
openspace.setPropertyValueSingle('RenderEngine.HDRExposure', 3.7);
openspace.setPropertyValueSingle('RenderEngine.Saturation', 1.0);
end)
asset.onDeinitialize(function ()
@@ -40,7 +40,8 @@ local sphere = {
Orientation = "Inside",
UseAdditiveBlending = true,
MirrorTexture = true,
FadeOutThreshold = 0.025
FadeOutThreshold = 0.025,
Background = true
},
GUI = {
Name = "Milky Way Sphere",
@@ -16,6 +16,7 @@ local Atmosphere = {
PlanetRadius = 6377.0,
PlanetAverageGroundReflectance = 0.1,
GroundRadianceEmittion = 0.6,
SunIntensity = 6.9,
Rayleigh = {
Coefficients = {
-- Wavelengths are given in 10^-9m
@@ -16,6 +16,8 @@ local Atmosphere = {
PlanetRadius = 3386.190,
PlanetAverageGroundReflectance = 0.1,
GroundRadianceEmittion = 0.37,
SunIntensity = 6.7,
MieScatteringExtinctionPropCoefficient = 0.23862,
Rayleigh = {
Coefficients = {
-- Wavelengths are given in 10^-9m
@@ -15,7 +15,8 @@ local SunGlare = {
Billboard = true,
Texture = textures .. "/halo.png",
BlendMode = "Additive",
RenderableType = "Transparent"
Opacity = 0.65,
RenderableType = "Transparency"
},
Transform = {
Translation = {