Commit e6145320 authored by Jan Möbius's avatar Jan Möbius

Reactivate all axis

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@13001 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 5751beb2
...@@ -445,7 +445,7 @@ void SkeletonEditingPlugin::placeManip(QMouseEvent * _event) { ...@@ -445,7 +445,7 @@ void SkeletonEditingPlugin::placeManip(QMouseEvent * _event) {
object->manipulatorNode()->set_direction(prevAxis,cross); object->manipulatorNode()->set_direction(prevAxis,cross);
// As we only allow rotations around the main axis, we disable the others // As we only allow rotations around the main axis, we disable the others
object->manipulatorNode()->enable_rotations(QtTranslationManipulatorNode::X_AXIS); //object->manipulatorNode()->enable_rotations(QtTranslationManipulatorNode::X_AXIS);
} else { //Joint in between, use both to estimate a good orientation of the manipulator } else { //Joint in between, use both to estimate a good orientation of the manipulator
Vector prevAxis = currentPose->globalTranslation(pickedJoint->id()) - currentPose->globalTranslation(parentJoint->id()); Vector prevAxis = currentPose->globalTranslation(pickedJoint->id()) - currentPose->globalTranslation(parentJoint->id());
...@@ -461,7 +461,7 @@ void SkeletonEditingPlugin::placeManip(QMouseEvent * _event) { ...@@ -461,7 +461,7 @@ void SkeletonEditingPlugin::placeManip(QMouseEvent * _event) {
object->manipulatorNode()->set_direction(prevAxis,right); object->manipulatorNode()->set_direction(prevAxis,right);
// As we only allow rotations around the main axis, we disable the others // As we only allow rotations around the main axis, we disable the others
object->manipulatorNode()->enable_rotations(QtTranslationManipulatorNode::X_AXIS); //object->manipulatorNode()->enable_rotations(QtTranslationManipulatorNode::X_AXIS);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment