summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/studio3d/simpleqml/main.qml21
-rw-r--r--examples/studio3d/simpleqml/presentation/barrel.uia28
-rw-r--r--examples/studio3d/simpleqml/presentation/barrel.uip16
3 files changed, 37 insertions, 28 deletions
diff --git a/examples/studio3d/simpleqml/main.qml b/examples/studio3d/simpleqml/main.qml
index 06321a7..ed0278e 100644
--- a/examples/studio3d/simpleqml/main.qml
+++ b/examples/studio3d/simpleqml/main.qml
@@ -70,9 +70,13 @@ Rectangle {
anchors.fill: parent
property string textValue: "hello world"
+ ViewerSettings {
+ id: viewerSettings
+ }
+
Presentation {
id: s3dpres
- source: "qrc:/presentation/barrel.uip"
+ source: "qrc:/presentation/barrel.uia"
onCustomSignalEmitted: customSignalName.text = Date.now() + ": " + name
onSlideEntered: slideEnter.text = "Entered slide " + name + "(index " + index + ") on " + elementPath
onSlideExited: slideExit.text = "Exited slide " + name + "(index " + index + ") on " + elementPath
@@ -169,7 +173,11 @@ Rectangle {
}
Button {
text: "Reload"
- onClicked: s3dpres.reload()
+ onClicked: {
+ var src = s3dpres.source
+ s3dpres.source = ""
+ s3dpres.source = src
+ }
focusPolicy: Qt.NoFocus
}
Button {
@@ -185,9 +193,10 @@ Rectangle {
}
Button {
text: "Toggle camera"
+ property bool eyeball: true
onClicked: {
- var v = s3dpres.getAttribute("Scene.Layer.Camera", "eyeball")
- s3dpres.setAttribute("Scene.Layer.Camera", "eyeball", !v)
+ eyeball = !eyeball
+ s3dpres.setAttribute("Scene.Layer.Camera", "eyeball", eyeball)
}
focusPolicy: Qt.NoFocus
}
@@ -258,11 +267,11 @@ Rectangle {
Button {
id: profTogBtn
- text: "Toggle profile UI"
+ text: "Toggle render stats"
anchors.right: parent.right
anchors.bottom: parent.bottom
focusPolicy: Qt.NoFocus
- onClicked: s3dpres.profileUiVisible = !s3dpres.profileUiVisible
+ onClicked: viewerSettings.showRenderStats = !viewerSettings.showRenderStats
}
Slider {
id: profUiScale
diff --git a/examples/studio3d/simpleqml/presentation/barrel.uia b/examples/studio3d/simpleqml/presentation/barrel.uia
index d936e42..209d13a 100644
--- a/examples/studio3d/simpleqml/presentation/barrel.uia
+++ b/examples/studio3d/simpleqml/presentation/barrel.uia
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version='1.0' encoding='UTF-8'?>
<application>
- <assets initial="barrel">
- <dataInput name="di_text" type="String"/>
- <presentation id="barrel" src="barrel.uip"/>
- </assets>
- <statemachine ref="#logic">
- <visual-states>
- <state ref="Initial">
- <enter>
- <goto-slide element="main:Scene" rel="next"/>
- </enter>
- </state>
- </visual-states>
- </statemachine>
+ <assets initial="barrel">
+ <presentation id="barrel" src="barrel.uip"/>
+ <dataInput metadata="" name="di_text" type="String"/>
+ </assets>
+ <statemachine ref="#logic">
+ <visual-states>
+ <state ref="Initial">
+ <enter>
+ <goto-slide rel="next" element="main:Scene"/>
+ </enter>
+ </state>
+ </visual-states>
+ </statemachine>
</application>
diff --git a/examples/studio3d/simpleqml/presentation/barrel.uip b/examples/studio3d/simpleqml/presentation/barrel.uip
index 48b4edc..7b9b2fb 100644
--- a/examples/studio3d/simpleqml/presentation/barrel.uip
+++ b/examples/studio3d/simpleqml/presentation/barrel.uip
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<UIP version="6" >
<Project >
- <ProjectSettings author="" company="" presentationWidth="800" presentationHeight="480" maintainAspect="False" >
+ <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>
</ProjectSettings>
<Graph >
<Scene id="Scene" >
- <Layer id="Layer" >
+ <Layer id="Layer" variants="" >
<Camera id="Camera" />
<Light id="Light" />
- <Model id="Barrel" >
+ <Model id="Barrel" variants="" >
<Material id="Material" >
<Image id="Material_diffusemap" />
<Image id="Material_normalmap" />
@@ -17,8 +17,8 @@
<Image id="Material_specularmap" />
</Material>
</Model>
- <Text id="Text" />
- <Text id="Text2" />
+ <Text id="Text" variants="" />
+ <Text id="Text2" variants="" />
</Layer>
</Scene>
</Graph>
@@ -34,14 +34,14 @@
<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="1 1 1" diffusemap="#Material_diffusemap" emissivemap="#Material_emissivemap" fresnelPower="25" normalmap="#Material_normalmap" specularamount="4" specularmap="#Material_specularmap" specularmodel="Default" specularroughness="0.001" >
+ <Add ref="#Material" bumpamount="0" diffuse="1 1 1 1" diffusemap="#Material_diffusemap" emissivemap="#Material_emissivemap" fresnelPower="25" normalmap="#Material_normalmap" specularamount="4" specularmap="#Material_specularmap" specularmodel="Default" specularroughness="0.001" >
<AnimationTrack property="bumpamount" type="EaseInOut" >0 0 100 100 5 1 100 100</AnimationTrack>
</Add>
<Add ref="#Material_diffusemap" sourcepath=".\maps\barrel_barrel_Diffuse.png" />
<Add ref="#Material_normalmap" sourcepath=".\maps\barrel_barrel_Normal.png" />
<Add ref="#Material_emissivemap" sourcepath=".\maps\barrel_barrel_Emissive.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" >
+ <Add ref="#Text" name="Text" font="Arimo-Regular" position="-486.418 297.128 50.5569" textcolor="0 1 0 1" 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>
@@ -50,7 +50,7 @@
<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>
- <Add ref="#Text2" name="Text2" controlledproperty="di_text textstring" font="Arimo-Regular" position="435.899 267.025 0" />
+ <Add ref="#Text2" name="Text2" controlledproperty="$di_text textstring" font="Arimo-Regular" position="437.342 256.921 0" />
</State>
</State>
</Logic>