Commit ac211a2d authored by Tomi Korpipää's avatar Tomi Korpipää

Signed-off-by: Tomi Korpipaa <tomi.korpipaa@qt.io>

parent 43cf7843
......@@ -14,17 +14,10 @@
<file>presentation/Car/meshes/Wheel_Front_Left.mesh</file>
<file>presentation/Car/meshes/Wheel_Front_Right.mesh</file>
<file>presentation/Car/Car.import</file>
<file>presentation/Gaugesvol1/maps/gauge.psd</file>
<file>presentation/Gaugesvol1/maps/gaugespeed.psd</file>
<file>presentation/Gaugesvol1/maps/Gradient.psd</file>
<file>presentation/Gaugesvol1/maps/map.jpg</file>
<file>presentation/Gaugesvol1/maps/OpenfootageNET_lowerAustria01-1024.hdr</file>
<file>presentation/Gaugesvol1/maps/speed.jpg</file>
<file>presentation/Gaugesvol1/maps/SpeedCenter.jpg</file>
<file>presentation/Gaugesvol1/maps/speedNormal.jpg</file>
<file>presentation/Gaugesvol1/maps/tacho.jpg</file>
<file>presentation/Gaugesvol1/maps/tachoNormal.jpg</file>
<file>presentation/Gaugesvol1/maps/topEdge_opacity.png</file>
<file>presentation/Gaugesvol1/meshes/background.mesh</file>
<file>presentation/Gaugesvol1/meshes/background_0001.mesh</file>
<file>presentation/Gaugesvol1/meshes/centerSpeed.mesh</file>
......@@ -43,6 +36,20 @@
<file>presentation/digitalTacho.uip</file>
<file>presentation/fonts/TitilliumWeb-Regular.ttf</file>
<file>main.cpp</file>
<file>presentation/effects/VignetteEffect.effect</file>
<file>presentation/center_new8_003/maps/SpeedCenter.jpg</file>
<file>presentation/center_new8_003/meshes/centerTacho.mesh</file>
<file>presentation/center_new8_003/center_new8.import</file>
<file>presentation/edge_new_001/meshes/edge_1.mesh</file>
<file>presentation/edge_new_001/edge_new.import</file>
<file>presentation/Gaugesvol1/maps/carInterior.hdr</file>
<file>presentation/Gaugesvol1/maps/environment.hdr</file>
<file>presentation/Gaugesvol1/maps/environment.jpg</file>
<file>presentation/Gaugesvol1/maps/speed_new.jpg</file>
<file>presentation/Gaugesvol1/maps/speed_new_blue.jpg</file>
<file>presentation/Gaugesvol1/maps/tacho_new.jpg</file>
<file>presentation/Gaugesvol1/maps/tacho_new_blue.jpg</file>
<file>presentation/Tachoneedle_001/meshes/tachoNeedle.mesh</file>
<file>presentation/Tachoneedle_001/Tachoneedle.import</file>
<file>presentation/VignetteEffect.effect</file>
</qresource>
</RCC>
This image diff could not be displayed because it is too large. You can view the blob instead.
<?xml version="1.0" encoding="UTF-8" ?>
<UIP Version="1" >
<Project Revision="1" >
<Graph >
<Group id="__import__root__" >
<Model id="tachoNeedle" name="tachoNeedle" orientation="Right Handed" position="-12 0 -1.15119" rotation="90 9.54166e-15 137.683" rotationorder="XYZr" scale="1 1 1" sourcepath="meshes\tachoNeedle.mesh#1" >
<Material id="Needle" name="Needle" blendmode="Normal" diffuse="1 1 1" emissivepower="0" opacity="100" specularamount="0" />
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\FBXexports\Tachoneedle.fbx" ImageDir="Images" MeshDir="Meshes" >
<Mesh >
<Source >tachoNeedle</Source>
<Dest >meshes\tachoNeedle.mesh</Dest>
</Mesh>
</Import>
</Project>
</UIP>
<?xml version="1.0" encoding="UTF-8" ?>
<UIP Version="1" >
<Project Revision="1" >
<Graph >
<Group id="__import__root__" >
<Model id="centerTacho" name="centerTacho" orientation="Right Handed" position="-12 6.12323e-17 -1" rotation="90 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="meshes\centerTacho.mesh#1" >
<Material id="DarkBase" name="DarkBase" blendmode="Normal" diffuse="1 1 1" emissivepower="0" opacity="100" specularamount="0" />
<Material id="GaugeCenterContent" name="GaugeCenterContent" blendmode="Normal" diffuse="1 1 1" diffusemap="GaugeCenterContent_diffusemap" emissivepower="0" opacity="100" specularamount="0" >
<Image id="GaugeCenterContent_diffusemap" name="GaugeCenterContent_diffusemap" sourcepath="maps\SpeedCenter.jpg" />
</Material>
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\FBXexports\center_new8.1.fbx" ImageDir="Images" MeshDir="Meshes" >
<Image >
<Source >center_new8.1.fbm\SpeedCenter.jpg</Source>
<Dest >maps\SpeedCenter.jpg</Dest>
</Image>
<Mesh >
<Source >centerTacho</Source>
<Dest >meshes\centerTacho.mesh</Dest>
</Mesh>
</Import>
</Project>
</UIP>
......@@ -22,13 +22,14 @@
</Material>
<Material id="Glass" name="Glass" blendmode="Normal" diffuse="0.424168 0.530641 0.64" emissivepower="0" importid="Glass" opacity="100" specularamount="0" specularroughness="9.60784" >
<Image id="Glass_specularreflection" />
<Image id="Glass_iblprobe" />
</Material>
<Material id="CarBottom" name="CarBottom" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" importid="CarBottom" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="Interior" name="Interior" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" importid="Interior" opacity="100" specularamount="0" specularroughness="9.60784" />
<Model id="body" name="body" importid="body" orientation="Right Handed" position="0 0 -0" rotation="1.51661e-21 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\Car\meshes\body.mesh#2" >
<Material id="lambert2" name="lambert2" blendmode="Normal" diffuse="1 1 1" emissivepower="0" importid="lambert2" opacity="100" specularamount="0" >
<Image id="lambert2_specularreflection" />
<Image id="lambert2_normalmap" />
<Image id="lambert2_specularreflection" />
</Material>
</Model>
<Model id="Wheel_Back_Left" name="Wheel_Back_Left" importid="Wheel_Back_Left" orientation="Right Handed" position="86.6948 114.27 -34.7378" rotation="90 -1.34352e-13 180" rotationorder="XYZr" scale="38.1413 38.1413 38.1413" sourcepath=".\Car\meshes\Wheel_Back_Left.mesh#2" >
......@@ -59,6 +60,9 @@
<Add ref="#Light" rotation="39 0 0" />
<Add ref="#Car" name="Car" importfile=".\Car\Car.import" position="0 -24.7187 194" rotation="0 40 0" sourcepath=".\Car\Car.import" />
<Add ref="#Car_001" importfile=".\Car\Car.import" >
<AnimationTrack property="position.x" type="EaseInOut" >0 0 100 100 2.971 -0.586441 100 100 8 0 100 100</AnimationTrack>
<AnimationTrack property="position.y" type="EaseInOut" >0 0 100 100 2.971 0 100 100 8 0 100 100</AnimationTrack>
<AnimationTrack property="position.z" type="EaseInOut" >0 3 100 100 2.971 -4.86288 100 100 8 3 100 100</AnimationTrack>
<AnimationTrack property="rotation.x" type="EaseInOut" >0 -90 0 0 8 -90 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 -0 0 0 8 360 0 0</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 0 0 8 0 0 0</AnimationTrack>
......@@ -68,14 +72,15 @@
<Add ref="#Seats" diffuse="1 1 1" diffusemap="#Seats_diffusemap" importfile=".\Car\Car.import" normalmap="#Seats_normalmap" />
<Add ref="#Seats_diffusemap" sourcepath=".\Car\maps\Seats_diffuse.jpg" />
<Add ref="#Seats_normalmap" sourcepath=".\Car\maps\Seats_normal.jpg" />
<Add ref="#Glass" importfile=".\Car\Car.import" opacity="57.9439" specularamount="3" specularreflection="#Glass_specularreflection" specularroughness="0.28775" />
<Add ref="#Glass_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#Glass" fresnelPower="10" iblprobe="#Glass_iblprobe" importfile=".\Car\Car.import" opacity="59.2593" specularamount="5" specularreflection="#Glass_specularreflection" specularroughness="0.58375" speculartint="0.388235 0.388235 0.388235" />
<Add ref="#Glass_specularreflection" mappingmode="Environmental Mapping" sourcepath="D:/projects/qt/qtws2017/from Teemu/QWS17_Cluster/3DStudioProject/Gaugesvol1/maps/OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#Glass_iblprobe" mappingmode="IBL Override" sourcepath="D:/projects/qt/qtws2017/from Teemu/QWS17_Cluster/3DStudioProject/maps/OpenfootageNet_LADEFENSE-512.hdr" />
<Add ref="#CarBottom" diffuse="0.101961 0.101961 0.101961" importfile=".\Car\Car.import" shaderlighting="None" />
<Add ref="#Interior" diffuse="0.0901961 0.0901961 0.0901961" importfile=".\Car\Car.import" />
<Add ref="#body" importfile=".\Car\Car.import" />
<Add ref="#lambert2" bumpamount="1" diffuse="0.776471 0 0" importfile=".\Car\Car.import" normalmap="#lambert2_normalmap" opacity="100" specularreflection="#lambert2_specularreflection" />
<Add ref="#lambert2_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#lambert2" bumpamount="1" diffuse="0.870588 0 0" fresnelPower="5" importfile=".\Car\Car.import" normalmap="#lambert2_normalmap" opacity="100" specularamount="2" specularmodel="Default" specularreflection="#lambert2_specularreflection" specularroughness="0.001" speculartint="0.298039 0.298039 0.298039" />
<Add ref="#lambert2_normalmap" sourcepath=".\Car\maps\outUV_normals.png" />
<Add ref="#lambert2_specularreflection" mappingmode="Environmental Mapping" sourcepath="D:/projects/qt/qtws2017/from Teemu/QWS17_Cluster/3DStudioProject/maps/OpenfootageNet_LADEFENSE-1024.hdr" />
<Add ref="#Wheel_Back_Left" importfile=".\Car\Car.import" scale="90 38.141 38.141" >
<AnimationTrack property="rotation.x" type="EaseInOut" >0 720 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 8 -0 0 0</AnimationTrack>
......@@ -90,17 +95,17 @@
<Add ref="#Wheel" bumpamount="1" diffuse="0.164706 0.164706 0.164706" importfile=".\Car\Car.import" normalmap="#Wheel_normalmap" specularamount="5" specularmap="#Wheel_specularmap" specularreflection="#Wheel_specularreflection" specularroughness="0.001" />
<Add ref="#Wheel_specularreflection" mappingmode="Environmental Mapping" sourcepath=".\Gaugesvol1\maps\OpenfootageNET_lowerAustria01-1024.hdr" />
<Add ref="#Wheel_specularmap" sourcepath=".\Car\maps\Wheel_specular.jpg" />
<Add ref="#Wheel_normalmap" sourcepath="Car/maps/Wheel_normal.jpg" />
<Add ref="#Wheel_normalmap" sourcepath="C:/dev/QWS17_Cluster/QWS17_Cluster/3DStudioProject/Car/maps/Wheel_normal.jpg" />
<Add ref="#Wheel_Front_Left" importfile=".\Car\Car.import" >
<AnimationTrack property="rotation.x" type="EaseInOut" >0 720 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 8 -0 0 0</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 180 0 0 8 180 0 0</AnimationTrack>
<AnimationTrack property="rotation.x" type="EaseInOut" >0 820 100 100 4 0 100 100 8 820 100 100</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 4 0 100 100 8 0 100 100</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 190 100 100 4 190 100 100 8 190 100 100</AnimationTrack>
</Add>
<Add ref="#Wheel_002" name="Wheel" referencedmaterial="#Wheel" />
<Add ref="#Wheel_Front_Right" importfile=".\Car\Car.import" >
<AnimationTrack property="rotation.x" type="EaseInOut" >0 0 0 0 8 720 0 0</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 0 0 8 0 0 0</AnimationTrack>
<AnimationTrack property="rotation.x" type="EaseInOut" >0 0 100 100 8 720 100 100</AnimationTrack>
<AnimationTrack property="rotation.y" type="EaseInOut" >0 0 100 100 8 0 100 100</AnimationTrack>
<AnimationTrack property="rotation.z" type="EaseInOut" >0 0 100 100 8 30 100 100</AnimationTrack>
</Add>
<Add ref="#Wheel_003" name="Wheel" referencedmaterial="#Wheel" />
<State id="Scene-carRotate" name="carRotate" playmode="Looping" >
......
......@@ -18,7 +18,7 @@
<Add ref="#Layer" />
<Add ref="#Camera" orthographic="True" />
<State id="Scene-Slide1" name="Slide1" >
<Add ref="#speed" name="speed" font="TitilliumWeb-Regular" position="0 40 0" size="60" textstring="0" />
<Add ref="#speed" name="speed" font="TitilliumWeb-Regular" position="0 40 0" size="60" textstring="0" />
<Add ref="#kmh" name="kmh" font="TitilliumWeb-Regular" position="0 -40 0" size="20" textstring="kph" />
</State>
</State>
......
......@@ -19,7 +19,7 @@
<Add ref="#Camera" orthographic="True" />
<State id="Scene-Slide1" name="Slide1" >
<Add ref="#rpm" name="rpm" font="TitilliumWeb-Regular" position="0 -40 0" rotation="0 0 0" size="20" textstring="rpm x 1000" />
<Add ref="#tacho" name="tacho" font="TitilliumWeb-Regular" position="0 40 0" size="60" textstring="0.0" />
<Add ref="#tacho" name="tacho" font="TitilliumWeb-Regular" position="0 40 0" size="60" textstring="0.0" />
</State>
</State>
</Logic>
......
<?xml version="1.0" encoding="UTF-8" ?>
<UIP Version="1" >
<Project Revision="1" >
<Graph >
<Group id="__import__root__" >
<Model id="edge_1" name="edge_1" orientation="Right Handed" position="-12 7.04898e-17 -1.15119" rotation="90 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath="meshes\edge_1.mesh#1" >
<Material id="lambert8" name="lambert8" blendmode="Normal" diffuse="1 1 1" diffusemap="lambert8_diffusemap" emissivepower="0" opacity="100" specularamount="0" >
<Image id="lambert8_diffusemap" name="lambert8_diffusemap" sourcepath="maps\Gradient.psd" />
</Material>
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\FBXexports\edge_new.fbx" ImageDir="Images" MeshDir="Meshes" >
<Image >
<Source >edge_new.fbm\Gradient.psd</Source>
<Dest >maps\Gradient.psd</Dest>
</Image>
<Mesh >
<Source >edge_1</Source>
<Dest >meshes\edge_1.mesh</Dest>
</Mesh>
</Import>
</Project>
</UIP>
<?xml version="1.0" encoding="UTF-8" ?>
<application xmlns="http://qt.io/qt3dstudio/uia">
<application>
<assets initial="mainPresentation">
<presentation id="mainPresentation" src="mainPresentation.uip"/>
<presentation id="contentPresentation" src="contentPresentation.uip"/>
<presentation id="digitalSpeed" src="digitalSpeed.uip"/>
<presentation id="digitalTacho" src="digitalTacho.uip"/>
<presentation-qml id="navigationStream"/>
</assets>
<statemachine ref="#logic">
<visual-states>
......
......@@ -222,52 +222,52 @@ SettingsContainerForm {
}
Component {
id: settingsListDelegate
Item {
width: listview.width
height: 100
Text {
id: itemText
text: name
visible: name !== qsTr("Back")
color: "#ffffff"
opacity: itemOpacity
font.pixelSize: 50
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Image {
id: backIcon
source: menuBackSrc
visible: name === qsTr("Back")
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Text {
id: checkMark
text: "\u2713"
visible: getCheckVisibility(itemText.text)
color: "#ffffff"
opacity: itemOpacity
font.pixelSize: 50
anchors.verticalCenter: parent.verticalCenter
anchors.right: itemText.left
anchors.rightMargin: 20
}
MouseArea {
anchors.fill: parent
onClicked: {
if (selectedMenuIndex !== index) {
selectedMenuIndex = index;
highlightTimer.start();
} else {
selectedMenuIndex = index;
handleMenu();
}
}
}
}
id: settingsListDelegate
Item {
width: listview.width
height: 100
Text {
id: itemText
text: name
visible: name !== qsTr("Back")
color: "#ffffff"
opacity: itemOpacity
font.pixelSize: 50
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Image {
id: backIcon
source: menuBackSrc
visible: name === qsTr("Back")
fillMode: Image.PreserveAspectFit
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
}
Text {
id: checkMark
text: "\u2713"
visible: getCheckVisibility(itemText.text)
color: "#ffffff"
opacity: itemOpacity
font.pixelSize: 50
anchors.verticalCenter: parent.verticalCenter
anchors.right: itemText.left
anchors.rightMargin: 20
}
MouseArea {
anchors.fill: parent
onClicked: {
if (selectedMenuIndex !== index) {
selectedMenuIndex = index;
highlightTimer.start();
} else {
selectedMenuIndex = index;
handleMenu();
}
}
}
}
}
Timer {
......
......@@ -55,10 +55,10 @@ ListModel {
name: qsTr("Kph")
itemOpacity: 1.0
}
ListElement {
/* ListElement {
name: qsTr("Mph")
itemOpacity: 1.0
}
} */
ListElement {
name: qsTr("Back")
itemOpacity: 0.5
......
......@@ -48,7 +48,7 @@
**
****************************************************************************/
import QtQuick 2.7
import QtQuick 2.9
import QtStudio3D 1.0
import QtQuick.Controls 2.1
......@@ -109,12 +109,12 @@ Item {
elementPath: "Scene.Content_Layer.Car"
}
SceneElement {
Element {
id: speedScene
elementPath: "digitalSpeed:Scene.Layer.speed"
}
SceneElement {
Element {
id: tachoScene
elementPath: "digitalTacho:Scene.Layer.tacho"
}
......@@ -129,6 +129,21 @@ Item {
elementPath: "Scene.Gauges_Layer.Gauges.Group_Tacho.tachoNeedle"
}
Element {
id: carBodyMaterial
elementPath: "contentPresentation:Scene.Layer.Car.Car.body.lambert2"
}
Element {
id: speedometerColor
elementPath: "Scene.Gauges_Layer.Gauges.Group_Speed.background.speedmat.diffusemap"
}
Element {
id: tachoometerColor
elementPath: "Scene.Gauges_Layer.Gauges.Group_Tacho.background.tachomat.diffusemap"
}
SubPresentationSettings {
qmlStreams: [
QmlStream {
......@@ -157,6 +172,22 @@ Item {
anchors.centerIn: parent
}
onRedThemeChanged: {
if (redTheme) {
carBodyMaterial.setAttribute("diffuse.r", 0.855);
carBodyMaterial.setAttribute("diffuse.g", 0.14);
carBodyMaterial.setAttribute("diffuse.b", 0.144);
speedometerColor.setAttribute("sourcepath", "./Gaugesvol1/maps/speed_new.jpg");
tachoometerColor.setAttribute("sourcepath", "./Gaugesvol1/maps/tacho_new.jpg");
} else {
carBodyMaterial.setAttribute("diffuse.r", 0.08);
carBodyMaterial.setAttribute("diffuse.g", 0.08);
carBodyMaterial.setAttribute("diffuse.b", 1.0);
speedometerColor.setAttribute("sourcepath", "./Gaugesvol1/maps/speed_new_blue.jpg");
tachoometerColor.setAttribute("sourcepath", "./Gaugesvol1/maps/tacho_new_blue.jpg");
}
}
Keys.onRightPressed: {
menuSelect(true);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment