diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-04-26 12:00:17 +0300 |
|---|---|---|
| committer | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-04-30 08:49:15 +0000 |
| commit | 5e3a87fbbf735d9d4f166ac3b65959a5a5097a1d (patch) | |
| tree | 29b806c7a0d106a44cadfb6edd7dd5984612435a /src/Runtime/res/DataModelMetadata | |
| parent | dabf59f1c69c9e7b5777f9fe819d46ffb4304614 (diff) | |
Add support for vertex colors
Adds a check mark for vertex color use to the default material in the
inspector. Adds vertex color parsing to the FBX and Collada importer.
Changes default material shaders to use vertex colors if enabled.
Task-number: QT3DS-1507
Change-Id: Ide4a9f0da1c4dabe4e9b573e4cb0a2aecf714398
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/Runtime/res/DataModelMetadata')
| -rw-r--r-- | src/Runtime/res/DataModelMetadata/en-us/MetaData.xml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml index fffffdee..2841849b 100644 --- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml +++ b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml @@ -235,6 +235,7 @@ <Property name="name" formalName="Name" type="String" default="Material" hidden="True" category="Material" /> <Property name="shaderlighting" formalName="Lighting" description="Light model" list="Pixel:None" default="Pixel" category="Material" /> <Property name="blendmode" formalName="Blending Mode" description="How this material blends with content\nbehind it. Modes marked with * are\navailable only with HW supporting\nadvanced blending modes." list="Normal:Screen:Multiply:*Overlay:*ColorBurn:*ColorDodge" default="Normal" category="Material" /> + <Property name="vertexcolors" formalName="Enable Vertex Colors" description="Use vertex colors from the mesh" type="Boolean" default="False" animatable="False" category="Material" /> <Property name="diffuse" formalName="Diffuse Color" description="Color when lit from any direction" type="Color" default="1 1 1" category="Material" controllable="True" /> <Property name="diffusemap" formalName="Diffuse Map" description="Image to multiply with diffuse color" type="Image" category="Material" /> <Property name="diffusemap2" formalName="Diffuse Map 2" description="Image to multiply with diffuse color" type="Image" category="Material" /> |