mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-22 04:49:12 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix global positioning error introduced by misleading operator ordering (closes #1170)

Browse Source
This commit is contained in:
Alexander Bock
2020-06-12 19:03:57 +02:00
parent e5ef4edb22
commit 46970b9981
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/rendering/renderengine.cpp
View File

@@ -517,7 +517,7 @@ void RenderEngine::updateScene() {
const Time& integrateFromTime = global::timeManager.integrateFromTime();
_scene->update({
{ glm::dvec3(0.0), glm::dmat3(1.0), glm::dvec3(1.0) },
TransformData{ glm::dvec3(0.0), glm::dmat3(1.0), glm::dvec3(1.0) },
currentTime,
integrateFromTime,
_doPerformanceMeasurements

2
src/scene/scenegraphnode.cpp
View File

@@ -821,7 +821,7 @@ glm::dvec3 SceneGraphNode::calculateWorldPosition() const {
const glm::dvec3 ws = _parent->worldScale();
const glm::dvec3 p = position();
return wp + wrot * ws * p;
return wp + wrot * (ws * p);
}
else {
return position();