kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Assembly: Drag: switch from solver Solve to dragStep.

Browse Source
This commit is contained in:
PaddleStroke
2024-04-09 17:00:21 +02:00
committed by Yorik van Havre
parent 60b902fc7e
commit b4168c95ee
3 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Mod/Assembly/Gui/ViewProviderAssembly.cpp
View File

@@ -413,11 +413,6 @@ bool ViewProviderAssembly::mouseMove(const SbVec2s& cursorPos, Gui::View3DInvent
}
}
// Delta drag test :
/*SbVec3f vec = viewer->getPointOnFocalPlane(cursorPos);
Base::Vector3d newPos = Base::Vector3d(vec[0], vec[1], vec[2]);
Base::Vector3d delta = newPos - prevPosition;*/
prevPosition = newPos;
ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath(
@@ -425,8 +420,8 @@ bool ViewProviderAssembly::mouseMove(const SbVec2s& cursorPos, Gui::View3DInvent
bool solveOnMove = hGrp->GetBool("SolveOnMove", true);
if (solveOnMove) {
auto* assemblyPart = static_cast<AssemblyObject*>(getObject());
assemblyPart->solve(/*enableRedo = */ false, /*updateJCS = */ false);
// assemblyPart->doDragStep(delta);
// assemblyPart->solve(/*enableRedo = */ false, /*updateJCS = */ false);
assemblyPart->doDragStep();
}
}
return false;
@@ -783,8 +778,7 @@ void ViewProviderAssembly::initMove(const SbVec2s& cursorPos, Gui::View3DInvento
for (auto& pair : docsToMove) {
dragParts.push_back(pair.first);
}
assemblyPart->solve();
// assemblyPart->preDrag(dragParts);
assemblyPart->preDrag(dragParts);
}
}
@@ -811,7 +805,7 @@ void ViewProviderAssembly::endMove()
bool solveOnMove = hGrp->GetBool("SolveOnMove", true);
if (solveOnMove) {
auto* assemblyPart = static_cast<AssemblyObject*>(getObject());
// assemblyPart->postDrag();
assemblyPart->postDrag();
assemblyPart->setObjMasses({});
}