3pp-mirror/Meshroom
1
0
Fork 0
mirror of https://github.com/alicevision/Meshroom.git synced 2025-08-04 01:08:26 +02:00
Code Issues Projects Releases Packages Wiki Activity

[ui] Viewer3D: avoid unwanted changes on other transformation types

Browse source 
Now, if we change the translation of the gizmo (for instance), we make sure rotation and scale will not be changed. Very useful to avoid approximations and to have a clean undo-redo stack.
This commit is contained in:
Julien-Haudegond 2020-08-07 12:42:18 +02:00
parent 7486f3b887
commit ceb927b409
2 changed files with 73 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

49
meshroom/ui/qml/Viewer3D/MeshingBoundingBox.qml
View file

@ -18,22 +18,45 @@ Entity {
frontLayerComponent: root.frontLayerComponent
window: root.window
// Update node meshing slider values when the gizmo has changed: translation, rotation, scale
// Update node meshing slider values when the gizmo has changed: translation, rotation, scale, type
transformGizmo.onGizmoChanged: {
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxTranslation.x"), translation.x)
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxTranslation.y"), translation.y)
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxTranslation.z"), translation.z)
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxRotation.x"), rotation.x)
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxRotation.y"), rotation.y)
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxRotation.z"), rotation.z)
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxScale.x"), scale.x)
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxScale.y"), scale.y)
_reconstruction.setAttribute(root.currentMeshingNode.attribute("boundingBox.bboxScale.z"), scale.z)
switch(type) {
case TransformGizmo.Type.TRANSLATION: {
_reconstruction.setAttribute(
root.currentMeshingNode.attribute("boundingBox.bboxTranslation"),
JSON.stringify([translation.x, translation.y, translation.z])
)
break
}
case TransformGizmo.Type.ROTATION: {
_reconstruction.setAttribute(
root.currentMeshingNode.attribute("boundingBox.bboxRotation"),
JSON.stringify([rotation.x, rotation.y, rotation.z])
)
break
}
case TransformGizmo.Type.SCALE: {
_reconstruction.setAttribute(
root.currentMeshingNode.attribute("boundingBox.bboxScale"),
JSON.stringify([scale.x, scale.y, scale.z])
)
break
}
case TransformGizmo.Type.ALL: {
_reconstruction.setAttribute(
root.currentMeshingNode.attribute("boundingBox"),
JSON.stringify([
[translation.x, translation.y, translation.z],
[rotation.x, rotation.y, rotation.z],
[scale.x, scale.y, scale.z]
])
)
break
}
}
}
// Automatically evalutate the Transform: value is taken from the node OR from the actual modification if the gizmo is moved by mouse.
// Automatically evaluate the Transform: value is taken from the node OR from the actual modification if the gizmo is moved by mouse.
// When the gizmo has changed (with mouse), the new values are set to the node, the priority is given back to the node and the Transform is re-evaluated once with those values.
property var nodeTranslation : Qt.vector3d(
root.currentMeshingNode.attribute("boundingBox.bboxTranslation.x").value,

49
meshroom/ui/qml/Viewer3D/SfMTransformGizmo.qml
View file

@ -21,21 +21,46 @@ Entity {
window: root.window
uniformScale: true // We want to make uniform scale transformations
// Update node SfMTransform slider values when the gizmo has changed: translation, rotation, scale
// Update node SfMTransform slider values when the gizmo has changed: translation, rotation, scale, type
transformGizmo.onGizmoChanged: {
_reconstruction.setAttribute(root.currentSfMTransformNode.attribute("manualTransform.manualTranslation.x"), translation.x)
_reconstruction.setAttribute(root.currentSfMTransformNode.attribute("manualTransform.manualTranslation.y"), translation.y)
_reconstruction.setAttribute(root.currentSfMTransformNode.attribute("manualTransform.manualTranslation.z"), translation.z)
_reconstruction.setAttribute(root.currentSfMTransformNode.attribute("manualTransform.manualRotation.x"), rotation.x)
_reconstruction.setAttribute(root.currentSfMTransformNode.attribute("manualTransform.manualRotation.y"), rotation.y)
_reconstruction.setAttribute(root.currentSfMTransformNode.attribute("manualTransform.manualRotation.z"), rotation.z)
// Only one scale is needed since the scale is uniform
_reconstruction.setAttribute(root.currentSfMTransformNode.attribute("manualTransform.manualScale"), scale.x)
switch(type) {
case TransformGizmo.Type.TRANSLATION: {
_reconstruction.setAttribute(
root.currentSfMTransformNode.attribute("manualTransform.manualTranslation"),
JSON.stringify([translation.x, translation.y, translation.z])
)
break
}
case TransformGizmo.Type.ROTATION: {
_reconstruction.setAttribute(
root.currentSfMTransformNode.attribute("manualTransform.manualRotation"),
JSON.stringify([rotation.x, rotation.y, rotation.z])
)
break
}
case TransformGizmo.Type.SCALE: {
// Only one scale is needed since the scale is uniform
_reconstruction.setAttribute(
root.currentSfMTransformNode.attribute("manualTransform.manualScale"),
scale.x
)
break
}
case TransformGizmo.Type.ALL: {
_reconstruction.setAttribute(
root.currentSfMTransformNode.attribute("manualTransform"),
JSON.stringify([
[translation.x, translation.y, translation.z],
[rotation.x, rotation.y, rotation.z],
scale.x
])
)
break
}
}
}
// Automatically evalutate the Transform: value is taken from the node OR from the actual modification if the gizmo is moved by mouse.
// Automatically evaluate the Transform: value is taken from the node OR from the actual modification if the gizmo is moved by mouse.
// When the gizmo has changed (with mouse), the new values are set to the node, the priority is given back to the node and the Transform is re-evaluated once with those values.
property var nodeTranslation : Qt.vector3d(
root.currentSfMTransformNode.attribute("manualTransform.manualTranslation.x").value,