diff --git a/modules/globebrowsing/globes/chunkedlodglobe.cpp b/modules/globebrowsing/globes/chunkedlodglobe.cpp index cb63048376..0941b84eb1 100644 --- a/modules/globebrowsing/globes/chunkedlodglobe.cpp +++ b/modules/globebrowsing/globes/chunkedlodglobe.cpp @@ -63,8 +63,8 @@ namespace openspace { { auto geometry = std::shared_ptr(new BasicGrid( - 100, - 100, + 64, + 64, TriangleSoup::Positions::No, TriangleSoup::TextureCoordinates::Yes, TriangleSoup::Normals::No)); diff --git a/modules/globebrowsing/globes/renderableglobe.cpp b/modules/globebrowsing/globes/renderableglobe.cpp index 898480da57..3f61ad43a0 100644 --- a/modules/globebrowsing/globes/renderableglobe.cpp +++ b/modules/globebrowsing/globes/renderableglobe.cpp @@ -85,7 +85,7 @@ namespace openspace { _ellipsoid = Ellipsoid(radii); - setBoundingSphere(pss(_ellipsoid.averageRadius(), 1.0)); + setBoundingSphere(pss(_ellipsoid.averageRadius(), 0.0)); ghoul::Dictionary texturesDictionary; @@ -122,7 +122,7 @@ namespace openspace { heightMapDictionary.getValue("FilePath", path); std::shared_ptr heightMapProvider = std::shared_ptr(new TileProvider( - path, 5000, 256, 60)); + path, 5000, 64, 60)); _tileProviderManager->addHeightMap(name, heightMapProvider); } diff --git a/src/interaction/interactionhandler.cpp b/src/interaction/interactionhandler.cpp index b023c5bbcf..2abf7be449 100644 --- a/src/interaction/interactionhandler.cpp +++ b/src/interaction/interactionhandler.cpp @@ -820,10 +820,11 @@ void OrbitalInteractionMode::updateCameraStateFromMouseStates() { glm::normalize(glm::quat_cast(glm::inverse(lookAtMat))); } { // Move position towards or away from focus node + double boundingSphere = _focusNode->boundingSphere().lengthf(); glm::dvec3 centerToBoundingSphere = glm::normalize(posDiff) * - static_cast(_focusNode->boundingSphere().lengthf()); - newPosition += -(posDiff + centerToBoundingSphere) * + boundingSphere; + newPosition += -(posDiff - centerToBoundingSphere) * _truckMovementMouseState.velocity.get().y; } { // Do roll