From f8eec0839b432d6d33b01ce748e47df5dfeda680 Mon Sep 17 00:00:00 2001 From: Mahmoud Badri Date: Thu, 16 May 2019 17:08:15 +0300 Subject: Update example UIPs versions Task-number: QT3DS-3366 Change-Id: Ifcd328051eaf594a801db77497eca2482713469d Reviewed-by: Miikka Heikkinen --- examples/3dstudioruntime2/cppdatainput/presentation/datainput.uip | 2 +- examples/3dstudioruntime2/layersinquick/layers.uip | 2 +- examples/3dstudioruntime2/layersinquick/layers_ssaa_msaa.uip | 2 +- examples/3dstudioruntime2/qmldatainput/presentation/datainput.uip | 2 +- examples/3dstudioruntime2/scenemanip/presentations/empty.uip | 2 +- examples/3dstudioruntime2/simpleqml/presentation/barrel.uip | 2 +- examples/3dstudioruntime2/simplewidget/presentation/SampleProject.uip | 2 +- .../simplewidget/presentation/materials/simple_glass.material | 2 +- examples/3dstudioruntime2/stereoscopicqml/StereoTester/StereoTester.uip | 2 +- tests/auto/slidedeck/simple.uip | 2 +- tests/auto/slideplayer/simpleslides.uip | 2 +- tests/auto/slides/test3.uip | 2 +- tests/auto/studio3d/data/primitives.uip | 2 +- tests/auto/surfaceviewer/data/primitives.uip | 2 +- tests/auto/widget/data/primitives.uip | 2 +- 15 files changed, 15 insertions(+), 15 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 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff 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 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff 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 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff 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 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff 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 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff 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 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff 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 @@ - + #ff5500 #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff 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 @@ - + #7391ff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff diff --git a/tests/auto/slidedeck/simple.uip b/tests/auto/slidedeck/simple.uip index 97bac6a..4370714 100644 --- a/tests/auto/slidedeck/simple.uip +++ b/tests/auto/slidedeck/simple.uip @@ -1,5 +1,5 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff diff --git a/tests/auto/slideplayer/simpleslides.uip b/tests/auto/slideplayer/simpleslides.uip index 964018a..918a651 100644 --- a/tests/auto/slideplayer/simpleslides.uip +++ b/tests/auto/slideplayer/simpleslides.uip @@ -1,5 +1,5 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff diff --git a/tests/auto/slides/test3.uip b/tests/auto/slides/test3.uip index 66bae55..3f5c630 100644 --- a/tests/auto/slides/test3.uip +++ b/tests/auto/slides/test3.uip @@ -1,5 +1,5 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff diff --git a/tests/auto/studio3d/data/primitives.uip b/tests/auto/studio3d/data/primitives.uip index ec19346..995563a 100644 --- a/tests/auto/studio3d/data/primitives.uip +++ b/tests/auto/studio3d/data/primitives.uip @@ -1,5 +1,5 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff diff --git a/tests/auto/surfaceviewer/data/primitives.uip b/tests/auto/surfaceviewer/data/primitives.uip index ec19346..995563a 100644 --- a/tests/auto/surfaceviewer/data/primitives.uip +++ b/tests/auto/surfaceviewer/data/primitives.uip @@ -1,5 +1,5 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff diff --git a/tests/auto/widget/data/primitives.uip b/tests/auto/widget/data/primitives.uip index ec19346..995563a 100644 --- a/tests/auto/widget/data/primitives.uip +++ b/tests/auto/widget/data/primitives.uip @@ -1,5 +1,5 @@ - + #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff -- cgit v1.2.3