summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2016-08-10 09:36:51 +0200
committerPaul Lemire <paul.lemire@kdab.com>2016-08-19 07:59:05 +0000
commit876cc86e7dbfc1acacb7b74646f1995313c7642a (patch)
treeb909bd5bba6171bbbae5f03e229817ed96344fe8
parent73a92a254c5df49ef0356d4c0127fb33b351ff76 (diff)
PhongAlphaMaterial: allow to specify the blending arguments
These is needed as when used with Scene3D you might want different arguments than when used with a pure Qt3D application Change-Id: Ieb3c8c07954ea082fae51948a3f3b6652aaf2f7a Task-number: QTBUG-54591 Reviewed-by: Kevin Ottens <kevin.ottens@kdab.com>
-rw-r--r--src/quick3d/imports/extras/defaults/qml/PhongAlphaMaterial.qml8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/quick3d/imports/extras/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/extras/defaults/qml/PhongAlphaMaterial.qml
index 4892306b6..87373242d 100644
--- a/src/quick3d/imports/extras/defaults/qml/PhongAlphaMaterial.qml
+++ b/src/quick3d/imports/extras/defaults/qml/PhongAlphaMaterial.qml
@@ -49,6 +49,12 @@ Material {
property real shininess: 150.0
property real alpha: 0.5
+ property alias sourceRgbArg: alphaEffect.sourceRgbArg
+ property alias destinationRgbArg: alphaEffect.destinationRgbArg
+ property alias sourceAlphaArg: alphaEffect.sourceAlphaArg
+ property alias destinationAlphaArg: alphaEffect.destinationAlphaArg
+ property alias blendFunctionArg: alphaEffect.blendFunctionArg
+
parameters: [
Parameter { name: "alpha"; value: root.alpha },
Parameter { name: "ka"; value: Qt.vector3d(root.ambient.r, root.ambient.g, root.ambient.b) },
@@ -57,6 +63,6 @@ Material {
Parameter { name: "shininess"; value: root.shininess }
]
- effect: DefaultAlphaEffect {}
+ effect: DefaultAlphaEffect { id: alphaEffect }
}