summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorMahmoud Badri <mahmoud.badri@qt.io>2019-05-16 17:08:15 +0300
committerMahmoud Badri <mahmoud.badri@qt.io>2019-05-17 09:04:45 +0000
commitf8eec0839b432d6d33b01ce748e47df5dfeda680 (patch)
treefba83847ed43ba3d1a808933d1af6f6a20184abd /examples
parente029927d5f8d1cf485b0680286dd73c76a6882b5 (diff)
Update example UIPs versions
Task-number: QT3DS-3366 Change-Id: Ifcd328051eaf594a801db77497eca2482713469d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/3dstudioruntime2/cppdatainput/presentation/datainput.uip2
-rw-r--r--examples/3dstudioruntime2/layersinquick/layers.uip2
-rw-r--r--examples/3dstudioruntime2/layersinquick/layers_ssaa_msaa.uip2
-rw-r--r--examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip2
-rw-r--r--examples/3dstudioruntime2/scenemanip/presentations/empty.uip2
-rw-r--r--examples/3dstudioruntime2/simpleqml/presentation/barrel.uip2
-rw-r--r--examples/3dstudioruntime2/simplewidget/presentation/SampleProject.uip2
-rw-r--r--examples/3dstudioruntime2/simplewidget/presentation/materials/simple_glass.material2
-rw-r--r--examples/3dstudioruntime2/stereoscopicqml/StereoTester/StereoTester.uip2
9 files changed, 9 insertions, 9 deletions
diff --git a/examples/3dstudioruntime2/cppdatainput/presentation/datainput.uip b/examples/3dstudioruntime2/cppdatainput/presentation/datainput.uip
index d54f210..2dc8545 100644
--- a/examples/3dstudioruntime2/cppdatainput/presentation/datainput.uip
+++ b/examples/3dstudioruntime2/cppdatainput/presentation/datainput.uip
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="5" >
+<UIP version="6" >
<Project >
<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" preferKtx="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/layersinquick/layers.uip b/examples/3dstudioruntime2/layersinquick/layers.uip
index 171f226..81f7116 100644
--- a/examples/3dstudioruntime2/layersinquick/layers.uip
+++ b/examples/3dstudioruntime2/layersinquick/layers.uip
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="4" >
+<UIP version="6" >
<Project >
<ProjectSettings author="" company="" presentationWidth="1366" presentationHeight="768" 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/layersinquick/layers_ssaa_msaa.uip b/examples/3dstudioruntime2/layersinquick/layers_ssaa_msaa.uip
index 9396fa8..f2c8b7a 100644
--- a/examples/3dstudioruntime2/layersinquick/layers_ssaa_msaa.uip
+++ b/examples/3dstudioruntime2/layersinquick/layers_ssaa_msaa.uip
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="4" >
+<UIP version="6" >
<Project >
<ProjectSettings author="" company="" presentationWidth="1366" presentationHeight="768" 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/qmldatainput/presentation/datainput.uip b/examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip
index 7475629..008f456 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="5" >
+<UIP version="6" >
<Project >
<ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" preferKtx="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/scenemanip/presentations/empty.uip b/examples/3dstudioruntime2/scenemanip/presentations/empty.uip
index 3af7649..6fd3730 100644
--- a/examples/3dstudioruntime2/scenemanip/presentations/empty.uip
+++ b/examples/3dstudioruntime2/scenemanip/presentations/empty.uip
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="4" >
+<UIP version="6" >
<Project >
<ProjectSettings author="" company="" presentationWidth="1280" presentationHeight="720" 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.uip b/examples/3dstudioruntime2/simpleqml/presentation/barrel.uip
index c562f26..48b4edc 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="4" >
+<UIP version="6" >
<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 5a6eb45..f42b1e1 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="4" >
+<UIP version="6" >
<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/materials/simple_glass.material b/examples/3dstudioruntime2/simplewidget/presentation/materials/simple_glass.material
index a6b4ee0..2df02b8 100644
--- a/examples/3dstudioruntime2/simplewidget/presentation/materials/simple_glass.material
+++ b/examples/3dstudioruntime2/simplewidget/presentation/materials/simple_glass.material
@@ -173,7 +173,7 @@ vec4 computeGlass(in vec3 normal, in float materialIOR, in float alpha, in vec4
{
vec4 rgba = color;
float ratio = simpleFresnel( normal, materialIOR, uFresnelPower );
- vec3 absorb_color = ( log( glass_color )/-1.000000 );
+ vec3 absorb_color = ( log( glass_color.rgb )/-1.0 );
// prevent log(0) -> inf number issue
if ( isinf(absorb_color.r) ) absorb_color.r = 1.0;
if ( isinf(absorb_color.g) ) absorb_color.g = 1.0;
diff --git a/examples/3dstudioruntime2/stereoscopicqml/StereoTester/StereoTester.uip b/examples/3dstudioruntime2/stereoscopicqml/StereoTester/StereoTester.uip
index 0bd5b0e..fa83504 100644
--- a/examples/3dstudioruntime2/stereoscopicqml/StereoTester/StereoTester.uip
+++ b/examples/3dstudioruntime2/stereoscopicqml/StereoTester/StereoTester.uip
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<UIP version="5" >
+<UIP version="6" >
<Project >
<ProjectSettings author="" company="" presentationWidth="1280" presentationHeight="720" maintainAspect="False" preferKtx="False" >
<CustomColors count="16" >#7391ff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff</CustomColors>