diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2018-03-13 15:04:40 +0200 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2018-04-03 10:09:00 +0000 |
| commit | ce2b7eb3301aac652cf8d12df58e5629e491995a (patch) | |
| tree | bc814d4ff72413dcb2c8a76e70d8cf704a41289d /src/Runtime/res/DataModelMetadata | |
| parent | 97590e24b8e47897d5651f42353fc60365abf9dd (diff) | |
Expand datainput example
Also, add controlledproperty attribute to Material so diffuse color can
be controlled in the example.
Change-Id: Icbb696f478a4907cfe0933f46a92ff63c6cc1820
Task-Id: QT3DS-1328
Reviewed-by: Mahmoud Badri <mahmoud.badri@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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml index 5b221b58..725604af 100644 --- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml +++ b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml @@ -235,7 +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="diffuse" formalName="Diffuse Color" description="Color when lit from any direction" type="Color" default="1 1 1" 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" /> <Property name="diffusemap3" formalName="Diffuse Map 3" description="Image to multiply with diffuse color" type="Image" category="Material" /> |