diff --git a/modules/globebrowsing/globes/chunklodglobe.cpp b/modules/globebrowsing/globes/chunklodglobe.cpp index e9d5e05d98..8658f25877 100644 --- a/modules/globebrowsing/globes/chunklodglobe.cpp +++ b/modules/globebrowsing/globes/chunklodglobe.cpp @@ -58,7 +58,8 @@ namespace openspace { , maxSplitDepth(22) { auto geometry = std::shared_ptr(new BasicGrid( - 10,10, + 256, + 256, TriangleSoup::Positions::No, TriangleSoup::TextureCoordinates::Yes, TriangleSoup::Normals::No)); diff --git a/modules/globebrowsing/globes/chunknode.cpp b/modules/globebrowsing/globes/chunknode.cpp index da39d4df65..acd67fabe9 100644 --- a/modules/globebrowsing/globes/chunknode.cpp +++ b/modules/globebrowsing/globes/chunknode.cpp @@ -205,7 +205,7 @@ int ChunkNode::calculateDesiredLevelAndUpdateIsVisible( Scalar distance = glm::length(cameraToChunk); _owner.minDistToCamera = fmin(_owner.minDistToCamera, distance); - Scalar scaleFactor = 50 * minimumGlobeRadius; + Scalar scaleFactor = 10 * minimumGlobeRadius; Scalar projectedScaleFactor = scaleFactor / distance; int desiredLevel = floor( log2(projectedScaleFactor) ); return desiredLevel; diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp index 2795a0d571..343f9d8aa2 100644 --- a/modules/globebrowsing/globes/renderableglobe.cpp +++ b/modules/globebrowsing/globes/renderableglobe.cpp @@ -93,7 +93,7 @@ namespace openspace { heightMapDictionary.getValue("FilePath", path); std::shared_ptr heightMapProvider = std::shared_ptr(new TileProvider( - path, 5000, 512)); + path, 5000, 256)); _tileProviderManager->addHeightMap(name, heightMapProvider); } diff --git a/modules/globebrowsing/shaders/globalchunkedlodpatch_vs.glsl b/modules/globebrowsing/shaders/globalchunkedlodpatch_vs.glsl index 813a3f1f89..b712c77ba7 100644 --- a/modules/globebrowsing/shaders/globalchunkedlodpatch_vs.glsl +++ b/modules/globebrowsing/shaders/globalchunkedlodpatch_vs.glsl @@ -57,7 +57,7 @@ void main() vec2 samplePos = heightSamplingScale*in_UV + heightSamplingOffset; float sampledHeight = texture(textureSamplerHeight, samplePos).r; - pair.position += pair.normal * sampledHeight * 1e1; + pair.position += pair.normal * sampledHeight * pow(2,15); vec4 position = modelViewProjectionTransform * vec4(pair.position, 1);