[qt6][Viewer3D] Disable wireframe mode

Disable and hide the wireframe mode as the shaders need to be updated
for RHI.
This commit is contained in:
Candice Bentéjac 2024-10-01 17:22:08 +02:00
parent 77bd2a7145
commit 240188c0b4
5 changed files with 16 additions and 12 deletions

View file

@ -9,6 +9,6 @@ DepthMapEntity {
pointSize: Viewer3DSettings.pointSize * (Viewer3DSettings.fixedPointSize ? 1.0 : 0.001)
// map render modes to custom visualization modes
displayMode: Viewer3DSettings.renderMode == 1 ? DepthMapEntity.Points : DepthMapEntity.Triangles
displayColor: Viewer3DSettings.renderMode == 2
displayMode: Viewer3DSettings.renderMode == 0 ? DepthMapEntity.Points : DepthMapEntity.Triangles
displayColor: Viewer3DSettings.renderMode == 1
}

View file

@ -14,7 +14,7 @@ FloatingPane {
implicitWidth: 200
property int renderMode: 2
property int renderMode: 1
property Grid3D grid: null
property MediaLibrary mediaLibrary
property Camera camera

View file

@ -56,10 +56,10 @@ Entity {
name: "Solid"
PropertyChanges { target: m; material: solid }
},
State {
/* State {
name: "Wireframe"
PropertyChanges { target: m; material: wireframe }
},
}, */
State {
name: "Textured"
PropertyChanges {
@ -106,7 +106,7 @@ Entity {
}
}
WireframeMaterial {
/* WireframeMaterial {
id: wireframe
objectName: "WireframeMaterial"
effect: WireframeEffect {}
@ -114,7 +114,7 @@ Entity {
diffuse: root.diffuseColor
shininess: 0
specular: root.specular
}
} */
SphericalHarmonicsMaterial {
id: shMaterial

View file

@ -16,7 +16,7 @@ import Utils 1.0
FocusScope {
id: root
property int renderMode: 2
property int renderMode: 1
readonly property alias library: mediaLibrary
readonly property alias mainCamera: mainCamera
@ -284,13 +284,17 @@ FocusScope {
}
FloatingPane {
visible: Viewer3DSettings.renderMode == 3
visible: Viewer3DSettings.renderMode == 2
anchors.bottom: renderModesPanel.top
GridLayout {
columns: 2
rowSpacing: 0
RadioButton { text: "SHL File"; autoExclusive: true; checked: true }
RadioButton {
text: "SHL File"
autoExclusive: true
checked: true
}
TextField {
text: Viewer3DSettings.shlFile
selectByMouse: true

View file

@ -29,12 +29,12 @@ Item {
// Available render modes
readonly property var renderModes: [ // Can't use ListModel because of MaterialIcons expressions
{"name": "Solid", "icon": MaterialIcons.crop_din },
{"name": "Wireframe", "icon": MaterialIcons.details },
/* {"name": "Wireframe", "icon": MaterialIcons.details }, */
{"name": "Textured", "icon": MaterialIcons.texture },
{"name": "Spherical Harmonics", "icon": MaterialIcons.brightness_7}
]
// Current render mode
property int renderMode: 2
property int renderMode: 1
// Spherical Harmonics file
property string shlFile: ""