diff options
| author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2018-05-30 07:22:12 +0300 |
|---|---|---|
| committer | Tomi Korpipää <tomi.korpipaa@qt.io> | 2018-05-30 08:09:40 +0000 |
| commit | 72434a9ec9cdb63dd1dee88e4d7c7ff3987be4f7 (patch) | |
| tree | b27984bebb6a8d34209bf303be974841492d0ce4 /examples | |
| parent | d6f5bd4d3d5ff2783491c021e903b9e96a34d41c (diff) | |
Update example presentations to new UIP version
Task-number: QT3DS-1820
Change-Id: I5c7d13572385617f698ed08c33b5acc0636aaa49
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia | 4 | ||||
| -rw-r--r-- | examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip | 4 | ||||
| -rw-r--r-- | examples/3dstudioruntime2/simpleqml/presentation/barrel.uip | 2 | ||||
| -rw-r--r-- | examples/3dstudioruntime2/simpleqml/presentation/barrel/meshes/Barrel.mesh | bin | 280864 -> 280864 bytes | |||
| -rw-r--r-- | examples/3dstudioruntime2/simpleqml/presentation/barrel_no_background.uip | 2 | ||||
| -rw-r--r-- | examples/3dstudioruntime2/simplewidget/presentation/SampleProject.uip | 2 | ||||
| -rw-r--r-- | examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/NeedleSpeed.mesh | bin | 10880 -> 10880 bytes | |||
| -rw-r--r-- | examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/Speedometer.mesh | bin | 484416 -> 484416 bytes |
8 files changed, 7 insertions, 7 deletions
diff --git a/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia index 2abe03b..66b1518 100644 --- a/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia +++ b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uia @@ -2,11 +2,11 @@ <application> <assets initial="datainput"> <presentation id="datainput" src="datainput.uip"/> + <dataInput name="cameraRotInput" type="Vector3"/> + <dataInput name="colorInput" type="Vector3"/> <dataInput name="rangeInput" type="Ranged Number" min="0" max="360"/> <dataInput name="scaleInput" type="Vector3"/> <dataInput name="stringInput" type="String"/> - <dataInput name="colorInput" type="Vector3"/> - <dataInput name="cameraRotInput" type="Vector3"/> <dataInput name="variantInput" type="Variant"/> </assets> <statemachine ref="#logic"> diff --git a/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip index 901e994..e4e6ba1 100644 --- a/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip +++ b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<UIP version="3" > +<UIP version="4" > <Project > <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" > <CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors> @@ -51,7 +51,7 @@ <Add ref="#Text6" name="Text6" font="TitilliumWeb-Regular" position="135.678 -300.019 -8.28656" size="16" textstring="Opacity control (Variant type)" /> <Add ref="#Text8" name="Text8" font="TitilliumWeb-Regular" position="-428.683 -290.118 0" size="16" textstring="Scale control" /> <Add ref="#Cube2" name="Cube2" controlledproperty="$cameraRotInput rotation" position="409.919 -177.535 0" sourcepath="#Cube" /> - <Add ref="#Default_003" controlledproperty="$vec3Input2 diffuse" /> + <Add ref="#Default_003" controlledproperty="" /> <Add ref="#Text3" name="Text3" font="TitilliumWeb-Regular" position="434.456 -304.552 0" size="16" textstring="Rotation control Diffuse color control" /> <Add ref="#Text4" name="Text4" font="TitilliumWeb-Regular" position="-381.051 290.118 0" size="18" textstring="Directional light color control Camera xy rotation control" /> <Add ref="#Rectangle" name="Rectangle" position="0 -400 20" rotation="90.5 0 0" scale="11.0468 7.99191 9.12813" sourcepath="#Rectangle" /> diff --git a/examples/3dstudioruntime2/simpleqml/presentation/barrel.uip b/examples/3dstudioruntime2/simpleqml/presentation/barrel.uip index 9299f39..c562f26 100644 --- a/examples/3dstudioruntime2/simpleqml/presentation/barrel.uip +++ b/examples/3dstudioruntime2/simpleqml/presentation/barrel.uip @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<UIP version="3" > +<UIP version="4" > <Project > <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" > <CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors> diff --git a/examples/3dstudioruntime2/simpleqml/presentation/barrel/meshes/Barrel.mesh b/examples/3dstudioruntime2/simpleqml/presentation/barrel/meshes/Barrel.mesh Binary files differindex 3f0a923..1d935a4 100644 --- a/examples/3dstudioruntime2/simpleqml/presentation/barrel/meshes/Barrel.mesh +++ b/examples/3dstudioruntime2/simpleqml/presentation/barrel/meshes/Barrel.mesh diff --git a/examples/3dstudioruntime2/simpleqml/presentation/barrel_no_background.uip b/examples/3dstudioruntime2/simpleqml/presentation/barrel_no_background.uip index e978e2d..aef5ddb 100644 --- a/examples/3dstudioruntime2/simpleqml/presentation/barrel_no_background.uip +++ b/examples/3dstudioruntime2/simpleqml/presentation/barrel_no_background.uip @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<UIP version="3" > +<UIP version="4" > <Project > <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" > <CustomColors count="16" >#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors> diff --git a/examples/3dstudioruntime2/simplewidget/presentation/SampleProject.uip b/examples/3dstudioruntime2/simplewidget/presentation/SampleProject.uip index 4c1325e..5a6eb45 100644 --- a/examples/3dstudioruntime2/simplewidget/presentation/SampleProject.uip +++ b/examples/3dstudioruntime2/simplewidget/presentation/SampleProject.uip @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<UIP version="3" > +<UIP version="4" > <Project > <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="800" maintainAspect="True" > <CustomColors count="16" >#ff5500 #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors> diff --git a/examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/NeedleSpeed.mesh b/examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/NeedleSpeed.mesh Binary files differindex 72220cd..c1a46ee 100644 --- a/examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/NeedleSpeed.mesh +++ b/examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/NeedleSpeed.mesh diff --git a/examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/Speedometer.mesh b/examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/Speedometer.mesh Binary files differindex 9f7ba34..49e0678 100644 --- a/examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/Speedometer.mesh +++ b/examples/3dstudioruntime2/simplewidget/presentation/models/Speedometer/meshes/Speedometer.mesh |