mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-03-13 17:09:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/globebrowsing' of github.com:OpenSpace/OpenSpace-Development into feature/globebrowsing

Browse Source
This commit is contained in:
Erik Broberg
2016-05-25 21:49:08 -04:00
parent 698a50bc40 f525eb53cc
commit e5df1f8fee
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/globebrowsing/globes/chunkedlodglobe.cpp
View File

@@ -63,8 +63,8 @@ namespace openspace {
{
auto geometry = std::shared_ptr<BasicGrid>(new BasicGrid(
100,
100,
64,
64,
TriangleSoup::Positions::No,
TriangleSoup::TextureCoordinates::Yes,
TriangleSoup::Normals::No));

4
modules/globebrowsing/globes/renderableglobe.cpp
View File

@@ -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<TileProvider> heightMapProvider =
std::shared_ptr<TileProvider>(new TileProvider(
path, 5000, 256, 60));
path, 5000, 64, 60));
_tileProviderManager->addHeightMap(name, heightMapProvider);
}

5
src/interaction/interactionhandler.cpp
View File

@@ -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<double>(_focusNode->boundingSphere().lengthf());
newPosition += -(posDiff + centerToBoundingSphere) *
boundingSphere;
newPosition += -(posDiff - centerToBoundingSphere) *
_truckMovementMouseState.velocity.get().y;
}
{ // Do roll