mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-04-27 14:29:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make conversion use the combinedViewMatrix to use the SGCT view matrix, that hopefully will make the target work in the dome

Browse Source
This commit is contained in:
Ylva Selling
2022-03-04 12:30:58 -05:00
parent ec201d954a
commit d7fa2a31a8
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/skybrowser/src/utility.cpp
+10 -8
View File
@@ -83,11 +83,15 @@ glm::dvec3 localCameraToScreenSpace3d(const glm::dvec3& coords) {
}
glm::dvec3 localCameraToGalactic(const glm::dvec3& coords) {
glm::dmat4 rotation = glm::inverse(
global::navigationHandler->camera()->viewRotationMatrix());
glm::dvec4 position = glm::dvec4(coords, 1.0);
glm::dvec3 camPos = global::navigationHandler->camera()->positionVec3();
glm::dvec4 coordsVec4 = glm::dvec4(coords, 1.0) ;
glm::dmat4 camMat = glm::inverse(
global::navigationHandler->camera()->combinedViewMatrix()
);
// Subtract gamera position to get the view direction
glm::dvec3 galactic = glm::dvec3(camMat * coordsVec4) - camPos;
return glm::normalize(rotation * position) * skybrowser::CelestialSphereRadius;
return glm::normalize(galactic) * skybrowser::CelestialSphereRadius;
}
glm::dvec3 localCameraToEquatorial(const glm::dvec3& coords) {
@@ -108,10 +112,8 @@ glm::dvec3 equatorialToLocalCamera(const glm::dvec3& coords) {
glm::dvec3 galacticToLocalCamera(const glm::dvec3& coords) {
// Transform vector to camera's local coordinate system
glm::dvec3 camPos = global::navigationHandler->camera()->positionVec3();
glm::dmat4 camMat = global::navigationHandler->camera()->viewRotationMatrix();
glm::dvec3 viewDirectionWorld = glm::normalize(coords - camPos);
glm::dvec3 viewDirectionLocal = camMat * glm::dvec4(viewDirectionWorld, 1.0);
glm::dmat4 camMat = global::navigationHandler->camera()->combinedViewMatrix();
glm::dvec3 viewDirectionLocal = camMat * glm::dvec4(coords, 1.0);
return glm::normalize(viewDirectionLocal);
}