Support variants property on Group types

Also few usual cleanups.

Task-number: QT3DS-3234
Change-Id: I4624aeac27ee512cdbe62677bb9469e2748cc58b
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 23 insertions, 8 deletions

diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
index 0e003008..2df33774 100644
--- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
+++ b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
@@ -62,7 +62,20 @@
         <Property name="eyeball" formalName="Visible" description="Item visibility" type="Boolean" default="True" hidden="False" controllable="True" />
     </Effect>
     <Group>
-        <Property name="sourcepath" formalName="Import" description="Path to the source of this group" type="Import" />
+        <!-- Basic Properties -->
+        <Property name="name"     formalName="Name"     type="String"     default="Model" category="Basic Properties" description="Object name" />
+        <Property name="eyeball"  formalName="Visible"  type="Boolean"    default="True"  category="Basic Properties" description="Item visibility" />
+        <Property name="position" formalName="Position" type="Vector"                     category="Basic Properties" description="Location in local space" />
+        <Property name="rotation" formalName="Rotation" type="Rotation"                   category="Basic Properties" description="Rotation around local axes" />
+        <Property name="scale"    formalName="Scale"    type="Vector"     default="1 1 1" category="Basic Properties" description="Size adjustments along local axes" />
+        <Property name="pivot"    formalName="Pivot"    type="Vector"                     category="Basic Properties" description="Offset of the contents away from the local center" />
+        <Property name="opacity"  formalName="Opacity"  min="0" max="100" default="100"   category="Basic Properties" />
+
+        <!-- Variant Tags -->
+        <Property name="variants" type="String" animatable="False" category="Variant Tags" />
+
+        <!-- Import -->
+        <Property name="sourcepath" formalName="Import" type="Import" category="Import" description="Path to the source of this group" />
     </Group>
     <Image>
         <!--Images and materials don't have lifetimes, so we use a value that we know just won't cause any issues-->
@@ -205,13 +218,12 @@
     </Layer>
     <Light>
         <!-- Basic Properties -->
-        <Property name="name" formalName="Name" description="Object name" type="String" default="Light" hidden="False" category="Basic Properties" />
-        <Property name="eyeball" formalName="Visible" description="Item visibility" type="Boolean" default="True" hidden="False" controllable="True" category="Basic Properties" />
-        <Property name="opacity" formalName="Opacity" min="0" max="100" default="100" hidden="True" category="Basic Properties" />
-        <Property name="position" formalName="Position" description="Location in local space" type="Vector" category="Basic Properties" />
-        <Property name="rotation" formalName="Rotation" description="Rotation around local axes" type="Rotation" category="Basic Properties" />
-        <Property name="scale" formalName="Scale" description="Size adjustments along local axes" type="Vector" default="1 1 1" category="Basic Properties" />
-        <Property name="pivot" formalName="Pivot" description="Offset of the contents away from the local center" type="Vector" category="Basic Properties" />
+        <Property name="name"     formalName="Name"     type="String"  default="Light" category="Basic Properties" description="Object name" />
+        <Property name="eyeball"  formalName="Visible"  type="Boolean" default="True"  category="Basic Properties" description="Item visibility" controllable="True" />
+        <Property name="position" formalName="Position" type="Vector"                  category="Basic Properties" description="Location in local space" />
+        <Property name="rotation" formalName="Rotation" type="Rotation"                category="Basic Properties" description="Rotation around local axes" />
+        <Property name="scale"    formalName="Scale"    type="Vector"  default="1 1 1" category="Basic Properties" description="Size adjustments along local axes" />
+        <Property name="pivot"    formalName="Pivot"    type="Vector"                  category="Basic Properties" description="Offset of the contents away from the local center" />
 
         <!-- Light Properties -->
         <Property name='scope' formalName="Scope" description="Portion of the scene graph lit by this\nlight; no value results in entire layer\nbeing affected." type='ObjectRef' category="Light Properties" />
@@ -241,6 +253,9 @@
         <Property name="shdwbias" formalName="Shadow Depth Bias" description="Slight offset to avoid self-shadowing\nartifacts" default="0" min="-1.0" max="1.0" category="Shadow" />
         <Property name="shdwmapfar" formalName="Shadow Far Clip" description="Affects the maximum distance for the shadow\ndepth map" default="5000" category="Shadow" />
         <Property name="shdwmapfov" formalName="Shadow Field of View" description="Affects the field of view of the shadow\ncamera" default="90" min="1" max="179" hidden="True" category="Shadow" />
+
+        <!-- Hidden props -->
+        <Property name="opacity"  formalName="Opacity"  min="0" max="100" default="100"   category="Basic Properties" hidden="True" />
     </Light>
     <MaterialBase>
         <Property name="name" formalName="Name" description="Object name" type="String" default="Material" hidden="False" category="Basic Properties" />