Set animatable properties as controllable by default

Properties that are animatable are also controllable by datainput, by
default. Additionally, subpresentation property for Layer is also
controllable with String DI type to facilitate deferred loading via
datainput control. (Note: texture subpresentation is not controllable.)

Change-Id: Ie236e01168e91ffad7465d96f4cc39f052bd8e3b
Task-id: QT3DS-2600
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>

1 files changed, 20 insertions, 19 deletions

diff --git a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
index 13d4551e..f7cf465f 100644
--- a/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
+++ b/src/Runtime/res/DataModelMetadata/en-us/MetaData.xml
@@ -39,10 +39,10 @@
                 <Property name="eyeball" formalName="Visible" description="Item visibility" type="Boolean" default="True" hidden="False" controllable="True" />
                 <Property name="opacity" formalName="Opacity" min="0" max="100" default="100" hidden="True" />
                 <Property name="orthographic" formalName="Orthographic" description="Remove all perspective from the camera?" type="Boolean" animatable="False" />
-                <Property name="position" formalName="Position" description="Location in local space" type="Vector" default="0 0 -600" controllable="True" />
-                <Property name="rotation" formalName="Rotation" description="Rotation around local axes" type="Rotation" controllable="True" />
-                <Property name="scale" formalName="Scale" description="Size adjustments along local axes" type="Vector" default="1 1 1" controllable="True" />
-                <Property name="pivot" formalName="Pivot" description="Offset of the contents away from the local center" type="Vector" controllable="True" />
+                <Property name="position" formalName="Position" description="Location in local space" type="Vector" default="0 0 -600" />
+                <Property name="rotation" formalName="Rotation" description="Rotation around local axes" type="Rotation" />
+                <Property name="scale" formalName="Scale" description="Size adjustments along local axes" type="Vector" default="1 1 1" />
+                <Property name="pivot" formalName="Pivot" description="Offset of the contents away from the local center" type="Vector" />
                 <Property name="fov" formalName="Field of View" description="Viewing angle of the camera\n(how much it can see)" min="1" max="180" default="60">
                         <ShowIfEqual property="orthographic" value="False"/>
                 </Property>
@@ -80,6 +80,7 @@
                 <Property name="positionv" formalName="V Position" description="Offset of the image along the V\ndirection of the material" />
                 <Property name="pivotu" formalName="U Pivot" description="Offset the image in the U direction\nwithout affecting rotation center" />
                 <Property name="pivotv" formalName="V Pivot" description="Offset the image in the V direction\nwithout affecting rotation center" />
+                <!-- Texture subpresentation is not set to controllable as it does not currently work in runtime -->
                 <Property name="subpresentation" formalName="Sub-Presentation" description="Presentation or QML stream\nto use instead of the image" type="Renderable" />
         </Image>
         <Layer>
@@ -145,7 +146,7 @@
                         <ShowIfEqual property="vertfields" value="Top/Bottom"/>
                         <ShowIfEqual property="vertfields" value="Height/Bottom"/>
                 </Property>
-                <Property name="sourcepath" formalName="Sub-Presentation" description="Presentation or QML stream to\nrender for this layer" type="Renderable" />
+                <Property name="sourcepath" formalName="Sub-Presentation" description="Presentation or QML stream to\nrender for this layer" type="Renderable" controllable="True" />
                 <!-- Restating the node properties so they appear at the bottom of the list because they won't be used quite as much -->
                 <!--CN - removing properties that may force the layer to render offscreen.  We aren't ready to support this feature-->
                 <Property name="position" formalName="Position" description="Position" type="Vector" hidden="True"/>
@@ -202,11 +203,11 @@
                 <Property name="opacity" formalName="Opacity" min="0" max="100" default="100" hidden="True" />
                 <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' />
                 <Property name="lighttype" formalName="Light Type" description="Type of illumination to use" list="Directional:Point:Area" default="Directional" />
-                <Property name="position" formalName="Position" description="Location in local space" type="Vector" controllable="True"/>
-                <Property name="rotation" formalName="Rotation" description="Rotation around local axes" type="Rotation" controllable="True" />
-                <Property name="scale" formalName="Scale" description="Size adjustments along local axes" type="Vector" default="1 1 1" controllable="True" />
-                <Property name="pivot" formalName="Pivot" description="Offset of the contents away from the local center" type="Vector" controllable="True" />
-                <Property name="lightdiffuse" formalName="Light Color" description="Color of diffuse lighting effect" type="Color" default="1 1 1" controllable="True" />
+                <Property name="position" formalName="Position" description="Location in local space" type="Vector"/>
+                <Property name="rotation" formalName="Rotation" description="Rotation around local axes" type="Rotation" />
+                <Property name="scale" formalName="Scale" description="Size adjustments along local axes" type="Vector" default="1 1 1" />
+                <Property name="pivot" formalName="Pivot" description="Offset of the contents away from the local center" type="Vector" />
+                <Property name="lightdiffuse" formalName="Light Color" description="Color of diffuse lighting effect" type="Color" default="1 1 1" />
                 <Property name="lightspecular" formalName="Specular Color" description="Color of specular lighting highlights" type="Color" default="1 1 1"/>
                 <Property name="lightambient" formalName="Ambient Color" description="Color of unlit areas (black for none)" type="Color"/>
                 <Property name="brightness" formalName="Brightness" description="Strength of the light" default="100"/>
@@ -243,7 +244,7 @@
                 <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="diffuse" formalName="Diffuse Color" description="Color when lit from any direction" type="Color" default="1 1 1" category="Material" />
                 <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" />
@@ -276,7 +277,7 @@
         </ReferencedMaterial>
         <Model>
                 <!--<Property name="name" formalName="Name" description="Object name" type="String" default="Model" hidden="False" />
-                <Property name="eyeball" formalName="Visible" description="Item visibility" type="Boolean" default="True" hidden="False" controllable="True" />-->
+                <Property name="eyeball" formalName="Visible" description="Item visibility" type="Boolean" default="True" hidden="False" />-->
                 <Property name="sourcepath" formalName="Mesh" description="Geometry to use for this model" type="Mesh" />
                 <Property name="poseroot" hidden="True" type="Long" default="-1" />
                 <!--<Property name="tessellation" formalName="Tessellation Mode" description="Type of tessellation to subdivide\nthe geometry" list="None:Linear:Phong:NPatch" default="None" />
@@ -306,11 +307,11 @@
                 <Event name="onTwoPointSwipeDown" category="Gesture" />
                 -->
 
-                <Property name="position" formalName="Position" description="Location in local space" type="Vector" controllable="True" />
-                <Property name="rotation" formalName="Rotation" description="Rotation around local axes" type="Rotation" controllable="True" />
-                <Property name="scale" formalName="Scale" description="Size adjustments along local axes" type="Vector" default="1 1 1" controllable="True" />
-                <Property name="pivot" formalName="Pivot" description="Offset of the contents away from the\nlocal center" type="Vector" controllable="True" />
-                <Property name="opacity" formalName="Opacity" description="How much the element (and its children)\nocclude items behind them" min="0" max="100" default="100" controllable="True" />
+                <Property name="position" formalName="Position" description="Location in local space" type="Vector" />
+                <Property name="rotation" formalName="Rotation" description="Rotation around local axes" type="Rotation" />
+                <Property name="scale" formalName="Scale" description="Size adjustments along local axes" type="Vector" default="1 1 1" />
+                <Property name="pivot" formalName="Pivot" description="Offset of the contents away from the\nlocal center" type="Vector" />
+                <Property name="opacity" formalName="Opacity" description="How much the element (and its children)\nocclude items behind them" min="0" max="100" default="100" />
                 <Property name="rotationorder" formalName="Rotation Order" description="Rotation Order" list="XYZ:YZX:ZXY:XZY:YXZ:ZYX:XYZr:YZXr:ZXYr:XZYr:YXZr:ZYXr" default="YXZ" hidden="True"/>
                 <Property name="orientation" formalName="Orientation" description="Orientation" list="Left Handed:Right Handed" default="Left Handed" hidden="True"/>
                 <Property name="boneid" type="Long" hidden="True" default="-1" />
@@ -392,7 +393,7 @@
         </RenderPlugin>
         <Scene>
                 <Property name="name" formalName="Name" type="String" default="Scene" hidden="True" />
-                <Property name="eyeball" formalName="Visible" description="Item visibility" type="Boolean" default="True" hidden="True" controllable="False" />
+                <Property name="eyeball" formalName="Visible" description="Item visibility" type="Boolean" default="True" hidden="True" />
                 <Property name="bgcolorenable" formalName="Use Background" description="Clear the contents to a solid color\nbefore each frame?" type="Boolean" default="True" />
                 <Property name="backgroundcolor" formalName="Background Color" description="Color to use for the background" type="Color" animatable="False" />
                 <Event name="onPressureDown" category="Gesture" />
@@ -447,7 +448,7 @@
                 <!-- HW accelerated fonts not supported
                     <Property name="enableacceleratedfont" formalName="Hardware accelerated font" description="Enabled hardware acclerated font" type="Boolean" default="false" />
                 -->
-                <Property name="size" formalName="Font Size" description="Font Size" type="FontSize" default="36" animatable="False" controllable="True" />
+                <Property name="size" formalName="Font Size" description="Font Size" type="FontSize" default="36" animatable="False" />
                 <Property name="horzalign" formalName="Horizontal Alignment" description="Horizontal Alignment" list="Left:Center:Right" default="Center" />
                 <Property name="vertalign" formalName="Vertical Alignment" description="Vertical Alignment" list="Top:Middle:Bottom" default="Middle" />
                 <Property name="leading" formalName="Leading" description="Leading" />