From 4b3b6e8a76a8cd2d140f949f76ef04f6f8bfc100 Mon Sep 17 00:00:00 2001 From: Kalle Date: Fri, 1 Jul 2016 17:55:56 -0400 Subject: [PATCH] Fix invisible earth. --- data/scene/globebrowsing.scene | 7 +++++++ modules/globebrowsing/shaders/tile.hglsl | 2 +- modules/globebrowsing/tile/tiledataset.cpp | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/data/scene/globebrowsing.scene b/data/scene/globebrowsing.scene index 8ec73109f2..d5bcf2371f 100644 --- a/data/scene/globebrowsing.scene +++ b/data/scene/globebrowsing.scene @@ -13,12 +13,19 @@ function preInitialization() end function postInitialization() + openspace.printInfo("Setting default values") + openspace.setInteractionMode('GlobeBrowsingInteractionMode') --openspace.restoreCameraStateFromFile("camera_lookat_planet.lua") openspace.setPropertyValue("MilkyWay.renderable.transparency", 0.55) openspace.setPropertyValue("MilkyWay.renderable.segments", 50) + openspace.setPropertyValue("Sun.renderable.enabled", true) + openspace.setPropertyValue("SunGlare.renderable.enabled", false) + openspace.setPropertyValue("SunMarker.renderable.enabled", false) + + openspace.resetCameraDirection() openspace.printInfo("Done setting default values") diff --git a/modules/globebrowsing/shaders/tile.hglsl b/modules/globebrowsing/shaders/tile.hglsl index e58f93a169..6cd5403387 100644 --- a/modules/globebrowsing/shaders/tile.hglsl +++ b/modules/globebrowsing/shaders/tile.hglsl @@ -83,7 +83,7 @@ vec2 compensateSourceTextureSampling(vec2 startOffset, vec2 sizeDiff, const Tile vec2 TileUVToTextureSamplePosition(const Tile tile, vec2 tileUV){ vec2 uv = tile.uvTransform.uvOffset + tile.uvTransform.uvScale * tileUV; - uv = compensateSourceTextureSampling(vec2(-2), vec2(4), tile, uv); + uv = compensateSourceTextureSampling(vec2(0), vec2(0), tile, uv); return uv; } diff --git a/modules/globebrowsing/tile/tiledataset.cpp b/modules/globebrowsing/tile/tiledataset.cpp index 1b32832ade..fed86693d6 100644 --- a/modules/globebrowsing/tile/tiledataset.cpp +++ b/modules/globebrowsing/tile/tiledataset.cpp @@ -79,8 +79,8 @@ namespace openspace { // Tile Dataset // ////////////////////////////////////////////////////////////////////////////////// - const glm::ivec2 TileDataset::tilePixelStartOffset = glm::ivec2(-2); - const glm::ivec2 TileDataset::tilePixelSizeDifference = glm::ivec2(4); + const glm::ivec2 TileDataset::tilePixelStartOffset = glm::ivec2(0); + const glm::ivec2 TileDataset::tilePixelSizeDifference = glm::ivec2(0); const PixelRegion TileDataset::padding = PixelRegion(tilePixelStartOffset, tilePixelSizeDifference);