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

Solved merge conflict

Browse Source
This commit is contained in:
Sebastian Piwell
2016-06-13 13:25:03 -04:00
parent 661dd00129 db9af4c886
commit 3e034b73bb
12 changed files with 155 additions and 342 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/transformationmanager.cpp
+5 -1
View File
@@ -64,11 +64,15 @@
_kameleon->_cxform(from.c_str(), to.c_str(), ephemerisTime, &in1, &out1);
_kameleon->_cxform(from.c_str(), to.c_str(), ephemerisTime, &in2, &out2);
return glm::dmat3(
glm::dmat3 out = glm::dmat3(
out0.c0 , out0.c1 , out0.c2,
out1.c0 , out1.c1 , out1.c2,
out2.c0 , out2.c1 , out2.c2
);
// Need to rotate 90 degrees around x-axis becuase kameleon is flipped
out = glm::dmat3(glm::rotate(glm::mat4(out), (float)M_PI_2, glm::vec3(1.0f, 0.0f, 0.0f)));
return out;
}
glm::dmat3 TransformationManager::frameTransformationMatrix(std::string from,