diff options
Diffstat (limited to 'src/Runtime/Source/runtime')
| -rw-r--r-- | src/Runtime/Source/runtime/Qt3DSAttributeHashes.cpp | 11 | ||||
| -rw-r--r-- | src/Runtime/Source/runtime/Qt3DSAttributeHashes.h | 11 | ||||
| -rw-r--r-- | src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt | 11 | ||||
| -rw-r--r-- | src/Runtime/Source/runtime/Qt3DSKernelTypes.h | 16 |
4 files changed, 39 insertions, 10 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"; diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h index 02dda069..3cbc165a 100644 --- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h +++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.h @@ -87,14 +87,17 @@ enum EAttribute { ATTRIBUTE_LIGHTDIFFUSE_R = 0x035AAB10, // lightdiffuse.r ATTRIBUTE_LIGHTDIFFUSE_G = 0x034FA85B, // lightdiffuse.g ATTRIBUTE_LIGHTDIFFUSE_B = 0x034AA720, // lightdiffuse.b - ATTRIBUTE_LIGHTAMBIENT_R = 0x0179AD1A, // lightambient.r + ATTRIBUTE_LIGHTDIFFUSE_A = 0x0349A6E1, // lightdiffuse.a ATTRIBUTE_LIGHTAMBIENT = 0x00DA56DE, // lightambient + ATTRIBUTE_LIGHTAMBIENT_R = 0x0179AD1A, // lightambient.r ATTRIBUTE_LIGHTAMBIENT_G = 0x016EAA65, // lightambient.g ATTRIBUTE_LIGHTAMBIENT_B = 0x0169A92A, // lightambient.b + ATTRIBUTE_LIGHTAMBIENT_A = 0x0168A8EB, // lightambient.a ATTRIBUTE_LIGHTSPECULAR = 0x03E39A07, // lightspecular ATTRIBUTE_LIGHTSPECULAR_R = 0x0241EBC3, // lightspecular.r ATTRIBUTE_LIGHTSPECULAR_G = 0x0236E90E, // lightspecular.g ATTRIBUTE_LIGHTSPECULAR_B = 0x0231E7D3, // lightspecular.b + ATTRIBUTE_LIGHTSPECULAR_A = 0x0230E794, // lightspecular.a ATTRIBUTE_AREAWIDTH = 0x005A8BE7, // areawidth ATTRIBUTE_AREAHEIGHT = 0x00334D2C, // areaheight ATTRIBUTE_CASTSHADOW = 0x0335FD81, // castshadow @@ -114,16 +117,19 @@ enum EAttribute { ATTRIBUTE_EMISSIVECOLOR_R = 0x039B87D0, // emissivecolor.r ATTRIBUTE_EMISSIVECOLOR_G = 0x0390851B, // emissivecolor.g ATTRIBUTE_EMISSIVECOLOR_B = 0x038B83E0, // emissivecolor.b + ATTRIBUTE_EMISSIVECOLOR_A = 0x038A83A1, // emissivecolor.a ATTRIBUTE_DIFFUSE = 0x0105521E, // diffuse ATTRIBUTE_DIFFUSE_R = 0x015B085A, // diffuse.r ATTRIBUTE_DIFFUSE_G = 0x015005A5, // diffuse.g ATTRIBUTE_DIFFUSE_B = 0x014B046A, // diffuse.b + ATTRIBUTE_DIFFUSE_A = 0x014A042B, // diffuse.a ATTRIBUTE_SPECULARMAP = 0x034CD047, // specularmap ATTRIBUTE_SPECULARMODEL = 0x039EBE5A, // specularmodel ATTRIBUTE_SPECULARTINT = 0x03535E02, // speculartint ATTRIBUTE_SPECULARTINT_R = 0x0399623E, // speculartint.r ATTRIBUTE_SPECULARTINT_G = 0x038E5F89, // speculartint.g ATTRIBUTE_SPECULARTINT_B = 0x03895E4E, // speculartint.b + ATTRIBUTE_SPECULARTINT_A = 0x03885E0F, // speculartint.a ATTRIBUTE_IOR = 0x00667354, // ior ATTRIBUTE_FRESNELPOWER = 0x022178B6, // fresnelPower ATTRIBUTE_SPECULARAMOUNT = 0x01144425, // specularamount @@ -206,6 +212,7 @@ enum EAttribute { ATTRIBUTE_TEXTCOLOR_R = 0x00E9F186, // textcolor.r ATTRIBUTE_TEXTCOLOR_G = 0x00DEEED1, // textcolor.g ATTRIBUTE_TEXTCOLOR_B = 0x00D9ED96, // textcolor.b + ATTRIBUTE_TEXTCOLOR_A = 0x00D8ED57, // textcolor.a ATTRIBUTE_SIZE = 0x00F2C81F, // size ATTRIBUTE_FONT = 0x03412331, // font ATTRIBUTE_DROPSHADOW = 0x03E3F231, // dropshadow @@ -226,6 +233,7 @@ enum EAttribute { ATTRIBUTE_BACKCOLOR_R = 0x0290CCE0, // backcolor.r ATTRIBUTE_BACKCOLOR_G = 0x0285CA2B, // backcolor.g ATTRIBUTE_BACKCOLOR_B = 0x0280C8F0, // backcolor.b + ATTRIBUTE_BACKCOLOR_A = 0x027FC8B1, // backcolor.a ATTRIBUTE_TEXTTYPE = 0x0240ADD9, // texttype ATTRIBUTE_USEBACKCOLOR = 0x0243BACB, // usebackcolor ATTRIBUTE_WORDWRAP = 0x0134B04C, // wordwrap @@ -245,6 +253,7 @@ enum EAttribute { ATTRIBUTE_BACKGROUNDCOLOR_R = 0x02AF0767, // backgroundcolor.r ATTRIBUTE_BACKGROUNDCOLOR_G = 0x02A404B2, // backgroundcolor.g ATTRIBUTE_BACKGROUNDCOLOR_B = 0x029F0377, // backgroundcolor.b + ATTRIBUTE_BACKGROUNDCOLOR_A = 0x029E0338, // backgroundcolor.a ATTRIBUTE_PATHTYPE = 0x02D2A5E1, // pathtype ATTRIBUTE_LINEARERROR = 0x0378A51D, // linearerror ATTRIBUTE_EDGETESSAMOUNT = 0x02577E3A, // edgetessamount diff --git a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt index 7c38c875..8eec133f 100644 --- a/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt +++ b/src/Runtime/Source/runtime/Qt3DSAttributeHashes.txt @@ -48,14 +48,17 @@ lightdiffuse lightdiffuse.r lightdiffuse.g lightdiffuse.b -lightambient.r +lightdiffuse.a lightambient +lightambient.r lightambient.g lightambient.b +lightambient.a lightspecular lightspecular.r lightspecular.g lightspecular.b +lightspecular.a areawidth areaheight castshadow @@ -78,16 +81,19 @@ emissivecolor emissivecolor.r emissivecolor.g emissivecolor.b +emissivecolor.a diffuse diffuse.r diffuse.g diffuse.b +diffuse.a specularmap specularmodel speculartint speculartint.r speculartint.g speculartint.b +speculartint.a ior fresnelPower specularamount @@ -173,6 +179,7 @@ textcolor textcolor.r textcolor.g textcolor.b +textcolor.a size font dropshadow @@ -193,6 +200,7 @@ textstring backcolor.r backcolor.g backcolor.b +backcolor.a texttype usebackcolor wordwrap @@ -214,6 +222,7 @@ background backgroundcolor.r backgroundcolor.g backgroundcolor.b +backgroundcolor.a pathtype linearerror diff --git a/src/Runtime/Source/runtime/Qt3DSKernelTypes.h b/src/Runtime/Source/runtime/Qt3DSKernelTypes.h index db290996..0ad4ec61 100644 --- a/src/Runtime/Source/runtime/Qt3DSKernelTypes.h +++ b/src/Runtime/Source/runtime/Qt3DSKernelTypes.h @@ -86,6 +86,7 @@ enum EAttributeType { ATTRIBUTETYPE_ELEMENTREF, ATTRIBUTETYPE_DATADRIVEN_PARENT, ATTRIBUTETYPE_DATADRIVEN_CHILD, + ATTRIBUTETYPE_FLOAT4, ATTRIBUTETYPE_FLOAT3, ATTRIBUTETYPE_FLOAT2, ATTRIBUTETYPE_DATAINPUT_TIMELINE, @@ -211,13 +212,14 @@ struct SClone /// Each element has a number of attributes associated with it - This is the value. union UVariant { - INT32 m_INT32; ///< Integer representation - FLOAT m_FLOAT; ///< Float representation - THashValue m_Hash; ///< Explicit hash representation - UINT32 m_StringHandle; ///< Handle into the IStringTable member of the presentation - void *m_VoidPointer; ///< Generic data Pointer - UINT32 m_ElementHandle; ///< Element handle. Resolve using IApplication object. - FLOAT m_FLOAT3[3]; ///< Vector 3 representation + INT32 m_INT32; // Integer representation + FLOAT m_FLOAT; // Float representation + THashValue m_Hash; // Explicit hash representation + UINT32 m_StringHandle; // Handle into the IStringTable member of the presentation + void *m_VoidPointer; // Generic data Pointer + UINT32 m_ElementHandle; // Element handle. Resolve using IApplication object. + FLOAT m_FLOAT3[3]; // Vector 3 representation + FLOAT m_FLOAT4[4]; // Vector 4 representation }; } // namespace Q3DStudio |