mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-06 03:29:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Globe browsing: fix implicit conversion errors and remove warnings (#393)

Browse Source 
* Fix implicit conversion errors and remove warnings.
This commit is contained in:
Kalle Bladin
2017-09-01 18:03:31 +02:00
committed by Alexander Bock
parent b1110c9eee
commit 7aceb54bec
24 changed files with 67 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/globebrowsing/globebrowsingmodule.cpp
View File

@@ -348,7 +348,7 @@ void GlobeBrowsingModule::goToGeodetic2(Camera& camera,
glm::dmat4 inverseModelTransform =
OsEng.navigationHandler().focusNode()->inverseModelTransform();
glm::dvec3 cameraPositionModelSpace =
inverseModelTransform * glm::dvec4(cameraPosition, 1.0);
glm::dvec3(inverseModelTransform * glm::dvec4(cameraPosition, 1.0));
SurfacePositionHandle posHandle = globe->calculateSurfacePositionHandle(
cameraPositionModelSpace);
@@ -372,7 +372,7 @@ void GlobeBrowsingModule::goToGeodetic3(Camera& camera, globebrowsing::Geodetic3
glm::dvec3 positionModelSpace = globe->ellipsoid().cartesianPosition(geo3);
glm::dmat4 modelTransform = globe->modelTransform();
glm::dvec3 positionWorldSpace = modelTransform * glm::dvec4(positionModelSpace, 1.0);
glm::dvec3 positionWorldSpace = glm::dvec3(modelTransform * glm::dvec4(positionModelSpace, 1.0));
camera.setPositionVec3(positionWorldSpace);
if (resetCameraDirection) {
@@ -401,7 +401,7 @@ void GlobeBrowsingModule::resetCameraDirection(Camera& camera, globebrowsing::Ge
glm::dvec3 lookUpWorldSpace = glm::dmat3(modelTransform) * lookUpModelSpace;
// Lookat vector
glm::dvec3 lookAtWorldSpace = modelTransform * glm::dvec4(positionModelSpace, 1.0);
glm::dvec3 lookAtWorldSpace = glm::dvec3(modelTransform * glm::dvec4(positionModelSpace, 1.0));
// Eye position
glm::dvec3 eye = camera.positionVec3();