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

[ui] Viewer3D: remove scene orientation controls

Browse source 
new trackball manipulator offers more intuitive 3D navigation regardless of the camera orientation
This commit is contained in:
Yann Lanthony 2018-12-13 17:39:28 +01:00
parent 5814a39e3e
commit 05f0ae50fc
2 changed files with 2 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

26
meshroom/ui/qml/Viewer3D/Inspector3D.qml
View file

@ -14,8 +14,6 @@ FloatingPane {
implicitWidth: 200 implicitWidth: 200
property int renderMode: 2 property int renderMode: 2
property Transform targetTransform
property Locator3D origin: null
property Grid3D grid: null property Grid3D grid: null
property MediaLibrary mediaLibrary property MediaLibrary mediaLibrary
property Camera camera property Camera camera
@ -38,31 +36,12 @@ FloatingPane {
GridLayout { GridLayout {
width: parent.width width: parent.width
columns: 3 columns: 2
columnSpacing: 6 columnSpacing: 6
rowSpacing: 3 rowSpacing: 3
// Rotation Controls
Label {
font.family: MaterialIcons.fontFamily
text: MaterialIcons.rotation3D
font.pointSize: 14
Layout.rowSpan: 3
Layout.alignment: Qt.AlignHCenter
}
Slider { Layout.fillWidth: true; from: -180; to: 180; onPositionChanged: targetTransform.rotationX = value}
Label { text: "X" }
Slider { Layout.fillWidth: true; from: -180; to: 180; onPositionChanged: targetTransform.rotationY = value}
Label { text: "Y" }
Slider { Layout.fillWidth: true; from: -180; to: 180; onPositionChanged: targetTransform.rotationZ = value }
Label { text: "Z" }
Label { text: "Points"; padding: 2 } Label { text: "Points"; padding: 2 }
RowLayout { RowLayout {
Layout.columnSpan: 2
Slider { Slider {
Layout.fillWidth: true; from: 0.1; to: 10; stepSize: 0.1 Layout.fillWidth: true; from: 0.1; to: 10; stepSize: 0.1
value: Viewer3DSettings.pointSize value: Viewer3DSettings.pointSize
@ -80,7 +59,6 @@ FloatingPane {
} }
Label { text: "Cameras"; padding: 2 } Label { text: "Cameras"; padding: 2 }
Slider { Slider {
Layout.columnSpan: 2
value: Viewer3DSettings.cameraScale value: Viewer3DSettings.cameraScale
from: 0 from: 0
to: 2 to: 2
@ -90,7 +68,7 @@ FloatingPane {
onMoved: Viewer3DSettings.cameraScale = value onMoved: Viewer3DSettings.cameraScale = value
} }
Flow { Flow {
Layout.columnSpan: 3 Layout.columnSpan: 2
Layout.fillWidth: true Layout.fillWidth: true
spacing: 2 spacing: 2
CheckBox { CheckBox {

1
meshroom/ui/qml/Viewer3D/Viewer3D.qml
View file

@ -240,7 +240,6 @@ FocusScope {
Layout.minimumWidth: 5 Layout.minimumWidth: 5
camera: mainCamera camera: mainCamera
targetTransform: transform
mediaLibrary: mediaLibrary mediaLibrary: mediaLibrary
} }
} }