diff options
Diffstat (limited to 'examples/qt3d/tessellation-modes')
5 files changed, 12 insertions, 9 deletions
diff --git a/examples/qt3d/tessellation-modes/BasicCamera.qml b/examples/qt3d/tessellation-modes/BasicCamera.qml index a06f1562c..79ff51822 100644 --- a/examples/qt3d/tessellation-modes/BasicCamera.qml +++ b/examples/qt3d/tessellation-modes/BasicCamera.qml @@ -36,7 +36,6 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 -import QtQuick 2.1 as QQ2 Camera { id: mainCamera diff --git a/examples/qt3d/tessellation-modes/TessellatedQuad.qml b/examples/qt3d/tessellation-modes/TessellatedQuad.qml index 63962edb9..b5945ed6c 100644 --- a/examples/qt3d/tessellation-modes/TessellatedQuad.qml +++ b/examples/qt3d/tessellation-modes/TessellatedQuad.qml @@ -34,10 +34,10 @@ ** ****************************************************************************/ +import QtQuick 2.1 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 import Qt3D.Examples 1.0 -import QtQuick 2.1 as QQ2 Entity { id: root @@ -53,9 +53,16 @@ Entity { Transform { id: transform - Translate { dx: root.x; dy: root.y; dz: root.z } - Scale { scale: root.scale } - Rotate{ angle: root.theta; axis: Qt.vector3d(0.0, 1.0, 0.0) } + matrix: { + var m = Qt.matrix4x4(1, 0, 0, 0, + 0, 1, 0, 0, + 0, 0, 1, 0, + 0, 0, 0, 1); + m.translate(Qt.vector3d(root.x, root.y, root.z)); + m.rotate(root.theta, Qt.vector3d(0, 1, 0)); + m.scale(root.scale) + return m; + } } TessellatedQuadMesh { diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml index f3cfb942c..9a4a5002c 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeEffect.qml @@ -36,7 +36,6 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 -import QtQuick 2.1 Effect { id: root diff --git a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml index fcaa37d58..98c5b4a7d 100644 --- a/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml +++ b/examples/qt3d/tessellation-modes/TessellatedWireframeMaterial.qml @@ -36,7 +36,6 @@ import Qt3D.Core 2.0 import Qt3D.Render 2.0 -import QtQuick 2.1 as QQ2 Material { id: root @@ -50,7 +49,6 @@ Material { 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) }, Parameter { name: "diffuse"; value: Qt.vector3d(root.diffuse.r, root.diffuse.g, root.diffuse.b) }, diff --git a/examples/qt3d/tessellation-modes/main.qml b/examples/qt3d/tessellation-modes/main.qml index 33cfd3732..e75664364 100644 --- a/examples/qt3d/tessellation-modes/main.qml +++ b/examples/qt3d/tessellation-modes/main.qml @@ -34,9 +34,9 @@ ** ****************************************************************************/ +import QtQuick 2.1 as QQ2 import Qt3D.Core 2.0 import Qt3D.Render 2.0 -import QtQuick 2.1 as QQ2 Entity { id: root |