Bugfix ofnode orientation with scale (#6093)

* Fix getting parent orientation in ofNode::setGlobalOrientation * More unit test for ofNode::setGlobal~ Fixes first part of #6025.
openframeworks · Aug 1, 2018 · 17c2246 · 17c2246
1 parent 26a8247
commit 17c2246
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp
@@ -234,8 +234,8 @@ void ofNode::setGlobalOrientation(const glm::quat& q) {
 	if(parent == nullptr) {
 		setOrientation(q);
 	} else {
-		auto invParent = glm::inverse(parent->getGlobalTransformMatrix());
-		auto m44 = glm::toQuat(invParent) * q;
+		auto invParent = glm::inverse(parent->getGlobalOrientation());
+		auto m44 = invParent * q;
 		setOrientation(m44);
 	}
 }

diff --git a/tests/math/ofNodeRegressionTests/src/main.cpp b/tests/math/ofNodeRegressionTests/src/main.cpp
@@ -136,6 +136,12 @@ class ofApp: public ofxUnitTestsApp{
 			ofxTest(aprox_eq(n3.getOrientationQuat(), glm::quat()), "\torientation");
 			ofxTest(aprox_eq(n3.getScale(), glm::vec3(1,1,1)), "\tscale");
 			ofxTest(aprox_eq(n3.getGlobalTransformMatrix() * zero, n2.getGlobalTransformMatrix() * zero), "\tmatrices");
+			n3.setGlobalPosition(n3.getGlobalPosition());
+			n3.setGlobalOrientation(n3.getGlobalOrientation());
+			ofxTest(aprox_eq(n3.getPosition(), glm::vec3(0,0,0)), "\tposition");
+			ofxTest(aprox_eq(n3.getOrientationQuat(), glm::quat()), "\torientation");
+			ofxTest(aprox_eq(n3.getScale(), glm::vec3(1,1,1)), "\tscale");
+			ofxTest(aprox_eq(n3.getGlobalTransformMatrix() * zero, n2.getGlobalTransformMatrix() * zero), "\tmatrices");
 			ofLogNotice() << "end add / clear parent and keep global transform";
 		}