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/runtime/Qt3DSAttributeHashes.cpp | |
| 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/runtime/Qt3DSAttributeHashes.cpp')
| -rw-r--r-- | src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp index 1409901f..995b5704 100644 --- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp +++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp @@ -96,14 +96,17 @@ const char *GetAttributeString(const EAttribute inAttribute) case ATTRIBUTE_LIGHTDIFFUSE_R: return "lightdiffuse.r"; case ATTRIBUTE_LIGHTDIFFUSE_G: return "lightdiffuse.g"; case ATTRIBUTE_LIGHTDIFFUSE_B: return "lightdiffuse.b"; - case ATTRIBUTE_LIGHTAMBIENT_R: return "lightambient.r"; + case ATTRIBUTE_LIGHTDIFFUSE_A: return "lightdiffuse.a"; case ATTRIBUTE_LIGHTAMBIENT: return "lightambient"; + case ATTRIBUTE_LIGHTAMBIENT_R: return "lightambient.r"; case ATTRIBUTE_LIGHTAMBIENT_G: return "lightambient.g"; case ATTRIBUTE_LIGHTAMBIENT_B: return "lightambient.b"; + case ATTRIBUTE_LIGHTAMBIENT_A: return "lightambient.a"; case ATTRIBUTE_LIGHTSPECULAR: return "lightspecular"; case ATTRIBUTE_LIGHTSPECULAR_R: return "lightspecular.r"; case ATTRIBUTE_LIGHTSPECULAR_G: return "lightspecular.g"; case ATTRIBUTE_LIGHTSPECULAR_B: return "lightspecular.b"; + case ATTRIBUTE_LIGHTSPECULAR_A: return "lightspecular.a"; case ATTRIBUTE_AREAWIDTH: return "areawidth"; case ATTRIBUTE_AREAHEIGHT: return "areaheight"; case ATTRIBUTE_CASTSHADOW: return "castshadow"; @@ -123,16 +126,19 @@ const char *GetAttributeString(const EAttribute inAttribute) case ATTRIBUTE_EMISSIVECOLOR_R: return "emissivecolor.r"; case ATTRIBUTE_EMISSIVECOLOR_G: return "emissivecolor.g"; case ATTRIBUTE_EMISSIVECOLOR_B: return "emissivecolor.b"; + case ATTRIBUTE_EMISSIVECOLOR_A: return "emissivecolor.a"; case ATTRIBUTE_DIFFUSE: return "diffuse"; case ATTRIBUTE_DIFFUSE_R: return "diffuse.r"; case ATTRIBUTE_DIFFUSE_G: return "diffuse.g"; case ATTRIBUTE_DIFFUSE_B: return "diffuse.b"; + case ATTRIBUTE_DIFFUSE_A: return "diffuse.a"; case ATTRIBUTE_SPECULARMAP: return "specularmap"; case ATTRIBUTE_SPECULARMODEL: return "specularmodel"; case ATTRIBUTE_SPECULARTINT: return "speculartint"; case ATTRIBUTE_SPECULARTINT_R: return "speculartint.r"; case ATTRIBUTE_SPECULARTINT_G: return "speculartint.g"; case ATTRIBUTE_SPECULARTINT_B: return "speculartint.b"; + case ATTRIBUTE_SPECULARTINT_A: return "speculartint.a"; case ATTRIBUTE_IOR: return "ior"; case ATTRIBUTE_FRESNELPOWER: return "fresnelPower"; case ATTRIBUTE_SPECULARAMOUNT: return "specularamount"; @@ -215,6 +221,7 @@ const char *GetAttributeString(const EAttribute inAttribute) case ATTRIBUTE_TEXTCOLOR_R: return "textcolor.r"; case ATTRIBUTE_TEXTCOLOR_G: return "textcolor.g"; case ATTRIBUTE_TEXTCOLOR_B: return "textcolor.b"; + case ATTRIBUTE_TEXTCOLOR_A: return "textcolor.a"; case ATTRIBUTE_SIZE: return "size"; case ATTRIBUTE_FONT: return "font"; case ATTRIBUTE_DROPSHADOW: return "dropshadow"; @@ -235,6 +242,7 @@ const char *GetAttributeString(const EAttribute inAttribute) case ATTRIBUTE_BACKCOLOR_R: return "backcolor.r"; case ATTRIBUTE_BACKCOLOR_G: return "backcolor.g"; case ATTRIBUTE_BACKCOLOR_B: return "backcolor.b"; + case ATTRIBUTE_BACKCOLOR_A: return "backcolor.a"; case ATTRIBUTE_TEXTTYPE: return "texttype"; case ATTRIBUTE_USEBACKCOLOR: return "usebackcolor"; case ATTRIBUTE_WORDWRAP: return "wordwrap"; @@ -254,6 +262,7 @@ const char *GetAttributeString(const EAttribute inAttribute) case ATTRIBUTE_BACKGROUNDCOLOR_R: return "backgroundcolor.r"; case ATTRIBUTE_BACKGROUNDCOLOR_G: return "backgroundcolor.g"; case ATTRIBUTE_BACKGROUNDCOLOR_B: return "backgroundcolor.b"; + case ATTRIBUTE_BACKGROUNDCOLOR_A: return "backgroundcolor.a"; case ATTRIBUTE_PATHTYPE: return "pathtype"; case ATTRIBUTE_LINEARERROR: return "linearerror"; case ATTRIBUTE_EDGETESSAMOUNT: return "edgetessamount"; |