diff --git a/openspace-data b/openspace-data index 69326476d6..6c0746dc30 160000 --- a/openspace-data +++ b/openspace-data @@ -1 +1 @@ -Subproject commit 69326476d6e155e6bf482fba12f0ef4027455b74 +Subproject commit 6c0746dc303ba38bf42aa20939f39878c678e966 diff --git a/scripts/bind_keys.lua b/scripts/bind_keys.lua index 80a86bfb82..e992ccc3c1 100644 --- a/scripts/bind_keys.lua +++ b/scripts/bind_keys.lua @@ -11,7 +11,8 @@ openspace.bindKey("f5", "loadKeyBindings()") openspace.bindKey("f9", "openspace.changeViewPointToPluto(); openspace.printInfo('Changing Viewpoint to Pluto-in-center');"); openspace.bindKey("f10", "openspace.changeViewPointToSun(); openspace.printInfo('Changing Viewpoint to Sun-in-center');"); - +openspace.bindKey("f11", "openspace.fadeOut(2);") +openspace.bindKey("f12", "openspace.fadeIn(2);") openspace.bindKey("T", "openspace.distance(-interaction_speed * openspace.dt(), 6.0)") openspace.bindKey("G", "openspace.distance(interaction_speed * openspace.dt(), 6.0)") diff --git a/scripts/default_settings.lua b/scripts/default_settings.lua index 56fd168590..745f9262a4 100644 --- a/scripts/default_settings.lua +++ b/scripts/default_settings.lua @@ -2,11 +2,11 @@ openspace.printInfo("Setting default values"); openspace.setPropertyValue("Constellation Bounds.renderable.enabled", false); openspace.setPropertyValue("Stars.renderable.magnitudeClamp", {0.941, 4.191}); -openspace.setPropertyValue("Stars.renderable.exponentialOffset", 10); -openspace.setPropertyValue("Stars.renderable.exponentialDampening", 0.598); -openspace.setPropertyValue("Stars.renderable.scaleFactor", 0.54); +openspace.setPropertyValue("Stars.renderable.exponentialOffset", 20.41); +openspace.setPropertyValue("Stars.renderable.exponentialDampening", 0.419); +openspace.setPropertyValue("Stars.renderable.scaleFactor", 7.991); -openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.65); +openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.85); openspace.setPropertyValue("MilkyWay.renderable.segments", 50); openspace.printInfo("Done setting default values"); \ No newline at end of file diff --git a/shaders/modules/stars/star_fs.glsl b/shaders/modules/stars/star_fs.glsl index 07747fb64b..0d179076a9 100644 --- a/shaders/modules/stars/star_fs.glsl +++ b/shaders/modules/stars/star_fs.glsl @@ -76,7 +76,7 @@ void main() { vec4 textureColor = texture(psfTexture, texCoord); // textureColor.a = sqrt(textureColor.a); vec4 fullColor = vec4(color.rgb, textureColor.a); - if (billboardSize < 7.5) { + if (billboardSize < 3.25) { discard; }