diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:41:37 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-08-23 07:41:49 +0200 |
| commit | f37222cecb804b154a38b37607b21577de4c5e8c (patch) | |
| tree | f1b49dd9055ddb9cba85e0f7ad0c0d48701c0a5d /src/quick3d/imports | |
| parent | 3cae63081cc2d5878527d80bc199fee64727e123 (diff) | |
| parent | e8bdcd57657e427bdc9a7bfef58033015b0b299f (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Change-Id: I2ba85f57eb5801d720b5a8f2e8477e8ca9abefec
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/extras/defaults/qml/PhongAlphaMaterial.qml | 8 |
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 } } |