diff options
| author | Tomi Korpipää <tomi.korpipaa@qt.io> | 2016-06-20 13:59:56 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2016-06-21 07:15:40 +0000 |
| commit | e28a0063aab8af471f04f5d912c21844ac549874 (patch) | |
| tree | 6e72d1aa83d1efbf621593999a025c9ba1ceb67f /src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | |
| parent | 39a4b9ba5818f84e7ab8ba01d43bf8c5abb9fcf9 (diff) | |
Split effects from materials
Removes a lot of duplicate code. Also fixed alpha blending for
PhongAlphaMaterial and NormalDiffuseMapAlphaMaterial
Change-Id: Ib33cb874e64b6ac89d2473f1d0e03881b83c8d03
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp')
| -rw-r--r-- | src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp index c9e3cdfc9..7b5f138ae 100644 --- a/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp +++ b/src/quick3d/imports/extras/qt3dquick3dextrasplugin.cpp @@ -69,6 +69,9 @@ static const struct { { "PerVertexColorMaterial", 2, 0 }, { "GoochMaterial", 2, 0 }, { "TextureMaterial", 2, 0 }, + // Effects + { "DefaultEffect", 2, 0 }, + { "DefaultAlphaEffect", 2, 0 }, // FrameGraphs { "ForwardRenderer", 2, 0 }, // Entities |