diff options
| author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-29 16:43:37 +0100 |
|---|---|---|
| committer | Sean Harmer <sean.harmer@kdab.com> | 2016-03-05 16:03:37 +0000 |
| commit | c00cadf3853942721cf8eb79b43cba78ceea658b (patch) | |
| tree | b0f30a5cc99dee18b4c6c8cbf830f16296c4d077 /src/quick3d/imports | |
| parent | 6c0eecafa10ea3d8ff288d262bd0368bdf19a9c8 (diff) | |
QBlendState cleanup
* renamed to QBlendEquationArguments
* property names expanded
Change-Id: Id25f0181415b4f093f2054238dbf3be26e36ff32
Task-number: QTBUG-51509
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports')
| -rw-r--r-- | src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml | 18 | ||||
| -rw-r--r-- | src/quick3d/imports/render/qt3dquick3drenderplugin.cpp | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml index 383d708c8..750570727 100644 --- a/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml +++ b/src/quick3d/imports/render/defaults/qml/PhongAlphaMaterial.qml @@ -91,9 +91,9 @@ Material { shaderProgram: gl3PhongAlphaShader renderStates: [ DepthMask { mask: false }, - BlendState { - srcRGB: BlendState.SrcAlpha - dstRGB: BlendState.OneMinusSrcAlpha + BlendEquationArguments { + sourceRgb: BlendEquationArguments.SourceAlpha + destinationRgb: BlendEquationArguments.OneMinusSourceAlpha }, BlendEquation {blendFunction: BlendEquation.Add} ] @@ -113,9 +113,9 @@ Material { shaderProgram: gl2es2PhongAlphaShader renderStates: [ DepthMask { mask: false }, - BlendState { - srcRGB: BlendState.SrcAlpha - dstRGB: BlendState.OneMinusSrcAlpha + BlendEquationArguments { + sourceRgb: BlendEquationArguments.SourceAlpha + destinationRgb: BlendEquationArguments.OneMinusSourceAlpha }, BlendEquation {blendFunction: BlendEquation.Add} ] @@ -135,9 +135,9 @@ Material { shaderProgram: gl2es2PhongAlphaShader renderStates: [ DepthMask { mask: false }, - BlendState { - srcRGB: BlendState.SrcAlpha - dstRGB: BlendState.OneMinusSrcAlpha + BlendEquationArguments { + sourceRgb: BlendEquationArguments.SourceAlpha + destinationRgb: BlendEquationArguments.OneMinusSourceAlpha }, BlendEquation {blendFunction: BlendEquation.Add} ] diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp index 2944d6359..895a5df5d 100644 --- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp +++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp @@ -70,7 +70,7 @@ #include <Qt3DRender/qpointlight.h> #include <Qt3DRender/qgraphicsapifilter.h> #include <Qt3DRender/qrenderstate.h> -#include <Qt3DRender/qblendstate.h> +#include <Qt3DRender/qblendequationarguments.h> #include <Qt3DRender/qblendequation.h> #include <Qt3DRender/qalphatest.h> #include <Qt3DRender/qdepthtest.h> @@ -291,7 +291,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri) // RenderStates qmlRegisterUncreatableType<Qt3DRender::QRenderState>(uri, 2, 0, "RenderState", QStringLiteral("QRenderState is a base class")); - qmlRegisterType<Qt3DRender::QBlendState>(uri, 2, 0, "BlendState"); + qmlRegisterType<Qt3DRender::QBlendEquationArguments>(uri, 2, 0, "BlendEquationArguments"); qmlRegisterType<Qt3DRender::QBlendStateSeparate>(uri, 2, 0, "BlendStateSeparate"); qmlRegisterType<Qt3DRender::QBlendEquation>(uri, 2, 0, "BlendEquation"); qmlRegisterType<Qt3DRender::QAlphaTest>(uri, 2, 0, "AlphaTest"); |