diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2014-09-29 09:30:51 +0200 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2014-09-30 12:17:33 +0200 |
| commit | c01037ee79b294887cceed22768561d6143ae3d9 (patch) | |
| tree | d1341fe8eb0c453c8899eac5cd70496eb145ff7b /examples/tessellation-modes/TessellatedWireframeMaterial.qml | |
| parent | 4c211cf991c88f82b30f965357896fbaa2d57ff6 (diff) | |
Tessellation-Modes example updated to use uniforms array
Change-Id: I4a838c7867e822705f2ab65fd099ba81698f8f2a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'examples/tessellation-modes/TessellatedWireframeMaterial.qml')
| -rw-r--r-- | examples/tessellation-modes/TessellatedWireframeMaterial.qml | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/examples/tessellation-modes/TessellatedWireframeMaterial.qml b/examples/tessellation-modes/TessellatedWireframeMaterial.qml index edd24795c..307c8b31b 100644 --- a/examples/tessellation-modes/TessellatedWireframeMaterial.qml +++ b/examples/tessellation-modes/TessellatedWireframeMaterial.qml @@ -58,12 +58,9 @@ Material { property real shininess: 150.0 property real lineWidth: 1.0 property color lineColor: Qt.rgba( 1.0, 1.0, 1.0, 1.0 ) - property real innerTessLevel0: 1.0 - property real innerTessLevel1: 1.0 - property real outerTessLevel0: 1.0 - property real outerTessLevel1: 1.0 - property real outerTessLevel2: 1.0 - property real outerTessLevel3: 1.0 + property var innerTessLevel: [1.0, 1.0 ] + property var outerTessLevel: [1.0, 1.0, 1.0, 1.0] + parameters: [ Parameter { name: "ambient"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) }, @@ -72,11 +69,7 @@ Material { Parameter { name: "shininess"; value: root.shininess }, Parameter { name: "line.width"; value: root.lineWidth }, Parameter { name: "line.color"; value: root.lineColor }, - Parameter { name: "innerTessLevel0"; value: root.innerTessLevel0 }, - Parameter { name: "innerTessLevel1"; value: root.innerTessLevel1 }, - Parameter { name: "outerTessLevel0"; value: root.outerTessLevel0 }, - Parameter { name: "outerTessLevel1"; value: root.outerTessLevel1 }, - Parameter { name: "outerTessLevel2"; value: root.outerTessLevel2 }, - Parameter { name: "outerTessLevel3"; value: root.outerTessLevel3 } + Parameter { name: "innerTessLevel"; value: root.innerTessLevel }, + Parameter { name: "outerTessLevel"; value: root.outerTessLevel } ] } |