diff options
| author | Janne Kangas <janne.kangas@qt.io> | 2018-04-03 14:06:25 +0300 |
|---|---|---|
| committer | Janne Kangas <janne.kangas@qt.io> | 2018-04-05 05:28:33 +0000 |
| commit | 83cccff54159dbaef93669deab59eff1030ff2f4 (patch) | |
| tree | 3e38e7644d35ed095a49009722a6465719234288 /examples | |
| parent | 17722c2cfcadb954d6959d70845d715e9188e8c4 (diff) | |
Add '$' prefix to datainput names in UIP file
Differentiate between controller datainput and property with similar name
by using a special character prefix for the controller. Disallow using
special characters in datainput addition dialog. Update example to follow
convention.
Task-ID: QT3DS-1360
Change-Id: I40b8b5f36b24b96b14798eddb594f897ed9ef624
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/studio3d/qmldatainput/presentation/datainput.uip | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/examples/studio3d/qmldatainput/presentation/datainput.uip b/examples/studio3d/qmldatainput/presentation/datainput.uip index a5a6fea3..b37a8d88 100644 --- a/examples/studio3d/qmldatainput/presentation/datainput.uip +++ b/examples/studio3d/qmldatainput/presentation/datainput.uip @@ -5,7 +5,7 @@ <CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors> </ProjectSettings> <Graph > - <Scene id="Scene" controlledproperty="rangeInput @timeline" > + <Scene id="Scene" controlledproperty="$rangeInput @timeline" > <Layer id="Layer" > <Camera id="Camera" /> <Light id="Light" /> @@ -34,26 +34,26 @@ <Logic > <State name="Master Slide" component="#Scene" > <Add ref="#Layer" /> - <Add ref="#Camera" controlledproperty="vec3Input3 rotation" pivot="0 0 0" rotation="0 0 0" /> - <Add ref="#Light" castshadow="True" controlledproperty="vec3Input lightdiffuse" lightdiffuse="1 0 0" position="-350.984 -229.258 -30" /> + <Add ref="#Camera" controlledproperty="$vec3Input3 rotation" pivot="0 0 0" rotation="0 0 0" /> + <Add ref="#Light" castshadow="True" controlledproperty="$vec3Input lightdiffuse" lightdiffuse="1 0 0" position="-350.984 -229.258 -30" /> <State id="Scene-Slide1" name="Slide1" initialplaystate="Pause" > - <Add ref="#Text" name="Text" controlledproperty="stringInput textstring" font="TitilliumWeb-Regular" position="15.2141 -9.98814 -113.498" scale="1 1 1" size="48" textstring="0" > + <Add ref="#Text" name="Text" controlledproperty="$rangeInput opacity $stringInput textstring" font="TitilliumWeb-Regular" position="15.2141 -9.98814 -113.498" scale="1 1 1" size="48" textstring="0" > <AnimationTrack property="rotation.x" type="EaseInOut" >0 0 0 0 10 0 0 0</AnimationTrack> <AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 10 0 0 0</AnimationTrack> <AnimationTrack property="rotation.z" type="EaseInOut" >0 0 0 0 10 -360 0 0</AnimationTrack> </Add> <Add ref="#Text2" name="Text2" controlledproperty="" font="TitilliumWeb-Regular" position="28.8676 90.9325 0" scale="1 1 1" size="26" textstring="Text control Rotation animation control via datainput timeline control" /> - <Add ref="#Cone" name="Cone" controlledproperty="vec3Input scale" position="-417.135 -225.166 0" sourcepath="#Cone" /> + <Add ref="#Cone" name="Cone" controlledproperty="$vec3Input scale" position="-417.135 -225.166 0" sourcepath="#Cone" /> <Add ref="#Default" /> - <Add ref="#Cube" name="Cube" controlledproperty="floatInput opacity" opacity="60" position="-135.677 -173.205 0" sourcepath="#Cube" /> + <Add ref="#Cube" name="Cube" controlledproperty="$vec3Input3 pivot" opacity="60" position="-135.677 -173.205 0" sourcepath="#Cube" /> <Add ref="#Default_001" /> - <Add ref="#Cylinder" name="Cylinder" controlledproperty="variantInput opacity" position="131.347 -180.422 0" sourcepath="#Cylinder" /> + <Add ref="#Cylinder" name="Cylinder" controlledproperty="$variantInput opacity" position="131.347 -180.422 0" sourcepath="#Cylinder" /> <Add ref="#Default_002" /> <Add ref="#Text5" name="Text5" font="TitilliumWeb-Regular" position="-152.998 -290.118 0" textstring="Opacity control" /> <Add ref="#Text6" name="Text6" font="TitilliumWeb-Regular" position="135.678 -300.019 -8.28656" textstring="Opacity control (Variant type)" /> <Add ref="#Text8" name="Text8" font="TitilliumWeb-Regular" position="-428.683 -290.118 0" textstring="Scale control" /> - <Add ref="#Cube2" name="Cube2" controlledproperty="vec3Input rotation" position="409.919 -177.535 0" sourcepath="#Cube" /> - <Add ref="#Default_003" controlledproperty="vec3Input2 diffuse" /> + <Add ref="#Cube2" name="Cube2" controlledproperty="$vec3Input rotation" position="409.919 -177.535 0" sourcepath="#Cube" /> + <Add ref="#Default_003" controlledproperty="$vec3Input2 diffuse" /> <Add ref="#Text3" name="Text3" font="TitilliumWeb-Regular" position="434.456 -304.552 0" textstring="Rotation control Diffuse color control" /> <Add ref="#Text4" name="Text4" font="TitilliumWeb-Regular" position="-381.051 290.118 0" textstring="Directional light color and Camera xy rotation controlled via Datainput" /> </State> |