Skip to content

Commit

Permalink
Base: Placement: change argument order of slerp() in Py
Browse files Browse the repository at this point in the history
to be consistend with that of C++ one, and of RotationPy
  • Loading branch information
DeepSOIC authored and wwmayer committed Oct 12, 2019
1 parent f1a8dc4 commit 3da76af
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/Base/PlacementPy.xml
Expand Up @@ -105,7 +105,7 @@ Placement(Base, Axis, Angle) -- define position and rotation
<Methode Name="sclerp" Const="true">
<Documentation>
<UserDocu>
sclerp(t, placement2, shorten = True): interpolate between self and placement2.
sclerp(placement2, t, shorten = True): interpolate between self and placement2.
Interpolation is a continuous motion along a helical path, made of equal transforms if discretized.
t = 0.0 - return self. t = 1.0 - return placement2. t can also be outside of 0..1 range, for extrapolation.
If quaternions of rotations of the two placements differ in sign, the interpolation will
Expand Down
2 changes: 1 addition & 1 deletion src/Base/PlacementPyImp.cpp
Expand Up @@ -245,7 +245,7 @@ PyObject* PlacementPy::sclerp(PyObject* args)
PyObject* pyplm2;
double t;
PyObject* shorten = Py_True;
if (!PyArg_ParseTuple(args, "dO!|O!", &t, &(PlacementPy::Type), &pyplm2, &(PyBool_Type), &shorten))
if (!PyArg_ParseTuple(args, "O!d|O!", &(PlacementPy::Type), &pyplm2, &t, &(PyBool_Type), &shorten))
return nullptr;
Base::Placement plm2 = static_cast<Base::PlacementPy*>(pyplm2)->value();
Base::Placement ret = Base::Placement::sclerp(*getPlacementPtr(), plm2, t, PyObject_IsTrue(shorten));
Expand Down

0 comments on commit 3da76af

Please sign in to comment.