diff options
| author | Jere Tuliniemi <jere.tuliniemi@qt.io> | 2018-04-19 15:35:26 +0300 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-04-20 09:30:49 +0000 |
| commit | 26063241035dbc9a5677ff00788398f381e9a407 (patch) | |
| tree | 9381774d365833700650f97c3ff3d8c57e9c0132 /tests | |
| parent | 5b616b9ff79e57f7d8e35660e3f5c7f729ddce74 (diff) | |
Add roughness map to the standard material
Standard material shaders can now sample a roughness map for specular
roughness.
Task-number: QT3DS-1445
Change-Id: Ia39eba5c80edb0ee26f2b42b5694b60e9f45debf
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/scenes/barrel/Barrel_roughness.uip | 60 | ||||
| -rw-r--r-- | tests/scenes/barrel/maps/OpenfootageNET_Streetautumn-512.png | bin | 0 -> 393468 bytes | |||
| -rw-r--r-- | tests/scenes/barrel/maps/roughness.png | bin | 0 -> 9257 bytes |
3 files changed, 60 insertions, 0 deletions
diff --git a/tests/scenes/barrel/Barrel_roughness.uip b/tests/scenes/barrel/Barrel_roughness.uip new file mode 100644 index 0000000..817f7f1 --- /dev/null +++ b/tests/scenes/barrel/Barrel_roughness.uip @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<UIP version="3" > + <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> + </ProjectSettings> + <Graph > + <Scene id="Scene" > + <Layer id="Layer" > + <Camera id="Camera" /> + <Light id="Light" /> + <Model id="Barrel" > + <Material id="Material" > + <Image id="Material_normalmap" /> + <Image id="Material_emissivemap" /> + <Image id="Material_diffusemap" /> + <Image id="Material_roughnessmap" /> + <Image id="Material_specularmap" /> + </Material> + </Model> + <Text id="Text" /> + <Image id="Layer_lightprobe" /> + </Layer> + </Scene> + </Graph> + <Logic > + <State name="Master Slide" component="#Scene" > + <Add ref="#Layer" lightprobe="#Layer_lightprobe" probebright="400" probefov="180" probehorizon="-1" /> + <Add ref="#Camera" /> + <Add ref="#Light" rotation="0 0 0" /> + <Add ref="#Layer_lightprobe" mappingmode="Light Probe" sourcepath="maps/OpenfootageNET_Streetautumn-512.png" /> + <State id="Scene-Slide1" name="Slide1" playmode="Looping" > + <Add ref="#Barrel" name="Barrel" position="0 -42 -483" rotation="90 0 0" scale="100 100 100" sourcepath=".\barrel\meshes\Barrel.mesh#1" > + <AnimationTrack property="opacity" type="EaseInOut" /> + <AnimationTrack property="rotation.x" type="EaseInOut" >0 90 100 100 5 64 100 100 10 90 100 100</AnimationTrack> + <AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 5 -302 100 100 10 0 100 100</AnimationTrack> + <AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 5 0 100 100 10 0 100 100</AnimationTrack> + </Add> + <Add ref="#Material" bumpamount="0" diffuse="0 0 0" diffusemap="#Material_diffusemap" emissivemap="#Material_emissivemap" fresnelPower="25" normalmap="#Material_normalmap" roughnessmap="#Material_roughnessmap" specularamount="4" specularmap="#Material_specularmap" specularmodel="Default" specularroughness="1" > + <AnimationTrack property="bumpamount" type="EaseInOut" >0 0 100 100 5 1 100 100</AnimationTrack> + </Add> + <Add ref="#Material_normalmap" sourcepath=".\maps\barrel_barrel_Normal.png" /> + <Add ref="#Material_emissivemap" sourcepath=".\maps\barrel_barrel_Emissive.png" /> + <Add ref="#Material_diffusemap" sourcepath="maps/barrel_barrel_Diffuse.png" /> + <Add ref="#Material_roughnessmap" sourcepath="maps/roughness.png" /> + <Add ref="#Material_specularmap" sourcepath="maps/barrel_barrel_Specular.png" /> + <Add ref="#Text" name="Text" font="Arimo-Regular" position="-486.418 297.128 50.5569" textcolor="0 1 0" textstring="Barrel!" tracking="0" > + <AnimationTrack property="opacity" type="EaseInOut" >0 100 100 100 5.009 43.75 100 100 10 100 100 100</AnimationTrack> + <AnimationTrack property="rotation.x" type="EaseInOut" >0 0 100 100 4.997 0 100 100 5.009 0 100 100 10 0 100 100</AnimationTrack> + <AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 4.997 0 100 100 5.009 0 100 100 10 360 100 100</AnimationTrack> + <AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 4.997 0 100 100 5.009 0 100 100 10 0 100 100</AnimationTrack> + <AnimationTrack property="textcolor.x" type="EaseInOut" >0 0 100 100 5.009 0.501961 100 100 10 0 100 100</AnimationTrack> + <AnimationTrack property="textcolor.y" type="EaseInOut" >0 1 100 100 5.009 0.235294 100 100 10 1 100 100</AnimationTrack> + <AnimationTrack property="textcolor.z" type="EaseInOut" >0 0 100 100 5.009 0.333333 100 100 10 0 100 100</AnimationTrack> + </Add> + </State> + </State> + </Logic> + </Project> +</UIP> diff --git a/tests/scenes/barrel/maps/OpenfootageNET_Streetautumn-512.png b/tests/scenes/barrel/maps/OpenfootageNET_Streetautumn-512.png Binary files differnew file mode 100644 index 0000000..f0a6055 --- /dev/null +++ b/tests/scenes/barrel/maps/OpenfootageNET_Streetautumn-512.png diff --git a/tests/scenes/barrel/maps/roughness.png b/tests/scenes/barrel/maps/roughness.png Binary files differnew file mode 100644 index 0000000..d4ba53f --- /dev/null +++ b/tests/scenes/barrel/maps/roughness.png |
