From a061ad930e0b8484f133377ed7866dbf2e956ea8 Mon Sep 17 00:00:00 2001 From: Cary Phillips Date: Wed, 31 May 2023 08:31:42 -0700 Subject: [PATCH] Revert the addition of Matrix44.setEulerAngles/setAxisAngle from #305 This alters the ABI in what should be a patch release. Signed-off-by: Cary Phillips --- src/python/PyImath/PyImathMatrix44.cpp | 18 ------------------ src/python/PyImathTest/pyImathTest.in | 13 ------------- 2 files changed, 31 deletions(-) diff --git a/src/python/PyImath/PyImathMatrix44.cpp b/src/python/PyImath/PyImathMatrix44.cpp index 21284b4c..ed9c25cc 100644 --- a/src/python/PyImath/PyImathMatrix44.cpp +++ b/src/python/PyImath/PyImathMatrix44.cpp @@ -648,22 +648,6 @@ setValue44(Matrix44 &mat, const Matrix44 &value) mat.setValue(value); } -template -static void -setEulerAngles44(Matrix44 &mat, const Vec3 &value) -{ - MATH_EXC_ON; - mat.setEulerAngles(value); -} - -template -static void -setAxisAngle44(Matrix44 &mat, const Vec3 &axis, T angle) -{ - MATH_EXC_ON; - mat.setAxisAngle(axis, angle); -} - template static const Matrix44 & shearV44(Matrix44 &mat, const Vec3 &s) @@ -1125,8 +1109,6 @@ register_Matrix44() .def("setTranslation", &setTranslation44Tuple, return_internal_reference<>(),"setTranslation()") .def("setTranslation", &setTranslation44Obj, return_internal_reference<>(),"setTranslation()") .def("setValue", &setValue44, "setValue()") - .def("setEulerAngles", &setEulerAngles44, "setEulerAngles()") - .def("setAxisAngle", &setAxisAngle44, "setAxisAngle()") .def("shear", &shearV44, return_internal_reference<>(),"shear()") .def("shear", &shearS44, return_internal_reference<>(),"shear()") .def("shear", &shear44Tuple, return_internal_reference<>(),"shear()") diff --git a/src/python/PyImathTest/pyImathTest.in b/src/python/PyImathTest/pyImathTest.in index 339d15ee..dc9be34d 100644 --- a/src/python/PyImathTest/pyImathTest.in +++ b/src/python/PyImathTest/pyImathTest.in @@ -6107,19 +6107,6 @@ def testM44x (Mat, Vec): m.extractEulerXYZ(v) assert v.equalWithAbsError((0, 0, -a), v.baseTypeEpsilon()) - e = Vec(0,0,-a) - m.setEulerAngles(e) - assert (equal(m[0][0], cos(a), 0.0001)) - assert (equal(m[0][1], -sin(a), 0.0001)) - assert (equal(m[1][0], sin(a), 0.0001)) - assert (equal(m[1][1], cos(a), 0.0001)) - - axis = Vec(0,0,1) - m.setAxisAngle(axis,-a) - assert (equal(m[0][0], cos(a), 0.0001)) - assert (equal(m[0][1], -sin(a), 0.0001)) - assert (equal(m[1][0], sin(a), 0.0001)) - assert (equal(m[1][1], cos(a), 0.0001)) # Extract scale, shear, rotation, translation.