diff options
author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-04-16 13:42:13 +0300 |
---|---|---|
committer | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-05-02 10:19:23 +0000 |
commit | 3dc7636713c98ce2748d367f8525fcab85a6c425 (patch) | |
tree | 12411317058e10feae817e25c33f0e5e24577298 /src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h | |
parent | 437593e677cd1ed85ef846a3488dc3212fdde54a (diff) |
Support alpha channel initial work
In this initial work, all (almost) color properties are converted into a new type (float4) to
support an alpha channel. Alpha channel option is shown in the color dialog for Layer and Scene
background properties only. The following is remaining:
- Scene background alpha doesn't work in the editor (works in the viewer RT1)
Task-number: QT3DS-3128
Change-Id: Ib5540ebc8e2ff68709473451e4a92bf66ddb8ad2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h')
-rw-r--r-- | src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h index 09595236..48c8d0ba 100644 --- a/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h +++ b/src/Runtime/Source/runtimerender/graphobjects/Qt3DSRenderDefaultMaterial.h @@ -80,16 +80,16 @@ namespace render { SImage *m_IblProbe; DefaultMaterialLighting::Enum m_Lighting; // defaults to vertex DefaultMaterialBlendMode::Enum m_BlendMode; // defaults to normal - QT3DSVec3 m_DiffuseColor; // colors are 0-1 normalized + QT3DSVec4 m_DiffuseColor; // colors are 0-1 normalized SImage *m_DiffuseMaps[3]; QT3DSF32 m_EmissivePower; // 0-100, defaults to 0 - QT3DSVec3 m_EmissiveColor; + QT3DSVec4 m_EmissiveColor; SImage *m_EmissiveMap; SImage *m_EmissiveMap2; SImage *m_SpecularReflection; SImage *m_SpecularMap; DefaultMaterialSpecularModel::Enum m_SpecularModel; - QT3DSVec3 m_SpecularTint; + QT3DSVec4 m_SpecularTint; QT3DSF32 m_IOR; QT3DSF32 m_FresnelPower; QT3DSF32 m_SpecularAmount; // 0-??, defaults to 0 |