diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2018-05-31 13:04:37 +0200 |
|---|---|---|
| committer | Andy Nichols <andy.nichols@qt.io> | 2018-06-01 07:24:02 +0000 |
| commit | c42da985512cbbf013f6a5f9823f83a2a9836c53 (patch) | |
| tree | b66ea03038e4e61c3a9299ad766e66ce09572736 /tests/scenes | |
| parent | 12b6afa18edb5fc25fceacb3305f1e064795f6b1 (diff) | |
Fix inputmgr ignoring presses
Also adds a new logging category, disabled by default
unless Q3DS_DEBUG=1 (or higher) is set.
However this now highlights the fact that the raycasting
thing just does not return hits half the time.
Task-number: QT3DS-1588
Task-number: QT3DS-1785
Change-Id: Ib493510e14d32878168e7094cb0b0b059415e662
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'tests/scenes')
| -rw-r--r-- | tests/scenes/behaviors/actionevent.uip | 2 | ||||
| -rw-r--r-- | tests/scenes/behaviors/simpleinput.uip | 45 |
2 files changed, 46 insertions, 1 deletions
diff --git a/tests/scenes/behaviors/actionevent.uip b/tests/scenes/behaviors/actionevent.uip index 5636ab8..b6f23ed 100644 --- a/tests/scenes/behaviors/actionevent.uip +++ b/tests/scenes/behaviors/actionevent.uip @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8" ?> -<UIP version="3" > +<UIP version="4" > <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/tests/scenes/behaviors/simpleinput.uip b/tests/scenes/behaviors/simpleinput.uip new file mode 100644 index 0000000..beb83a9 --- /dev/null +++ b/tests/scenes/behaviors/simpleinput.uip @@ -0,0 +1,45 @@ +<?xml version="1.0" encoding="UTF-8" ?> +<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> + </ProjectSettings> + <Graph > + <Scene id="Scene" backgroundcolor="0.929412 0.956863 0.34902" > + <Layer id="Layer" > + <Camera id="Camera" /> + <Light id="Light" /> + <Model id="Cone" > + <Material id="Material_003" /> + </Model> + <Text id="Text2" /> + <Text id="Text3" /> + <Model id="Sphere2" > + <Material id="Default" name="Default" /> + </Model> + </Layer> + </Scene> + </Graph> + <Logic > + <State name="Master Slide" component="#Scene" > + <Add ref="#Layer" /> + <Add ref="#Camera" position="0 -40 -600" rotation="-10 0 -10" /> + <Add ref="#Light" /> + <State id="Scene-Slide1" name="Slide1" playmode="Looping" > + <Add ref="#Cone" name="Cone" rotation="-47.4815 2.69907 11.9215" sourcepath="#Cone" > + <Action id="Cone-Action" eyeball="True" triggerObject="#Cone" event="onPressureDown" targetObject="#Scene" handler="Next Slide" /> + </Add> + <Add ref="#Material_003" diffuse="0.890196 0.341176 0.615686" /> + <Add ref="#Text2" name="Text2" font="TitilliumWeb-Regular" position="-22.6025 107.143 0" textstring="Press for next slide" /> + </State> + <State id="Scene-Slide2" name="Slide2" initialplaystate="Play" playmode="Stop at end" playthroughto="Previous" > + <Add ref="#Text3" name="Text3" font="TitilliumWeb-Regular" position="-0.443962 367.803 0" textstring="Previous slide" /> + <Add ref="#Sphere2" name="Sphere2" position="-16.1459 261.794 0" sourcepath="#Sphere" > + <Action id="Sphere2-Action" eyeball="True" triggerObject="#Sphere2" event="onPressureDown" targetObject="#Scene" handler="Previous Slide" /> + </Add> + <Add ref="#Default" /> + </State> + </State> + </Logic> + </Project> +</UIP> |