mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-02-21 20:39:08 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into issue/1102

Browse Source
This commit is contained in:
Jonathas Costa
2020-06-13 09:50:37 -04:00
parent 4c49cc0fdf 358246dceb
commit b83d41026f
83 changed files with 1736 additions and 1998 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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();