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

[ui] Viewer3D: DefaultCameraController - removing FrameAction

Browse source 
- Apply the same control handling as the TransformGizmo.
This commit is contained in:
Julien-Haudegond 2020-07-10 11:32:25 +02:00
parent b234a766a9
commit cb306ffc7d
1 changed files with 24 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

52
meshroom/ui/qml/Viewer3D/DefaultCameraController.qml
View file

@ -62,6 +62,30 @@ Entity {
onPositionChanged: { onPositionChanged: {
currentPosition.x = mouse.x; currentPosition.x = mouse.x;
currentPosition.y = mouse.y; currentPosition.y = mouse.y;
const dt = 0.02
if(panning) { // translate
var d = (root.camera.viewCenter.minus(root.camera.position)).length() * 0.03;
var tx = axisMX.value * root.translateSpeed * d;
var ty = axisMY.value * root.translateSpeed * d;
mouseHandler.hasMoved = true;
root.camera.translate(Qt.vector3d(-tx, -ty, 0).times(dt));
return;
}
if(moving){ // trackball rotation
trackball.rotate(mouseHandler.lastPosition, mouseHandler.currentPosition, dt);
mouseHandler.lastPosition = mouseHandler.currentPosition;
mouseHandler.hasMoved = true;
return;
}
if(zooming) { // zoom with alt + RMD
var d = (root.camera.viewCenter.minus(root.camera.position)).length() * 0.1;
var tz = axisMX.value * root.translateSpeed * d;
mouseHandler.hasMoved = true;
root.camera.translate(Qt.vector3d(0, 0, tz).times(dt), Camera.DontTranslateViewCenter)
return;
}
} }
onDoubleClicked: mouseDoubleClicked(mouse) onDoubleClicked: mouseDoubleClicked(mouse)
onWheel: { onWheel: {
@ -164,32 +188,4 @@ Entity {
} }
] ]
} }
components: [
FrameAction {
onTriggered: {
if(panning) { // translate
var d = (root.camera.viewCenter.minus(root.camera.position)).length() * 0.03;
var tx = axisMX.value * root.translateSpeed * d;
var ty = axisMY.value * root.translateSpeed * d;
mouseHandler.hasMoved = true;
root.camera.translate(Qt.vector3d(-tx, -ty, 0).times(dt));
return;
}
if(moving){ // trackball rotation
trackball.rotate(mouseHandler.lastPosition, mouseHandler.currentPosition, dt);
mouseHandler.lastPosition = mouseHandler.currentPosition;
mouseHandler.hasMoved = true;
return;
}
if(zooming) { // zoom with alt + RMD
var d = (root.camera.viewCenter.minus(root.camera.position)).length() * 0.1;
var tz = axisMX.value * root.translateSpeed * d;
mouseHandler.hasMoved = true;
root.camera.translate(Qt.vector3d(0, 0, tz).times(dt), Camera.DontTranslateViewCenter)
return;
}
}
}
]
} }