Skip to content

GitLab

Q
qt3dstudio
Commit c585824a authored by Tomi Korpipää's avatar Tomi Korpipää
Browse files
Options

Update clusterTemplate

parent 248a4660
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 478 additions and 227 deletions
clusterTemplate/.dropbox deleted 100644 → 0
View file @ 248a4660
{"tag": "shared", "ns": 2482591808}
\ No newline at end of file
clusterTemplate/Car/Car.import 0 → 100644
View file @ c585824a
<?xml version="1.0" encoding="UTF-8" ?>
<UIP Version="1" >
<Project Revision="1" >
<Graph >
<Group id="__import__root__" >
<Model id="Car" name="Car" orientation="Right Handed" position="0 0 -0" rotation="-90 -0 0" rotationorder="XYZr" scale="0.387697 0.387697 0.387697" sourcepath=".\meshes\Car.mesh#1" >
<Material id="Brakes" name="Brakes" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="SmallDetails" name="SmallDetails" blendmode="Normal" diffuse="0 0 0" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="Seats" name="Seats" blendmode="Normal" diffuse="0.0954207 0.0954207 0.0954207" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="Glass" name="Glass" blendmode="Normal" diffuse="0.424168 0.530641 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="CarBottom" name="CarBottom" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="Interior" name="Interior" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Model id="Wheel_Back_Right" name="Wheel_Back_Right" orientation="Right Handed" position="-89.4333 114.27 -34.7378" rotation="90 -0 0" rotationorder="XYZr" scale="38.1413 38.1413 38.1413" sourcepath=".\meshes\Wheel_Back_Right.mesh#1" >
<Material id="Wheel" name="Wheel" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
</Model>
<Model id="body" name="body" orientation="Right Handed" position="-1.83001 56.1611 4.77469" rotation="89.4423 -0 0" rotationorder="XYZr" scale="2.56343 2.56343 2.56343" sourcepath=".\meshes\body.mesh#1" >
<Material id="lambert2" name="lambert2" blendmode="Normal" diffuse="1 1 1" emissivepower="0" opacity="100" specularamount="0" />
</Model>
<Model id="Wheel_Back_Left" name="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=".\meshes\Wheel_Back_Left.mesh#1" >
<Material id="Wheel_0001" name="Wheel" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
</Model>
<Model id="Wheel_Front_Left" name="Wheel_Front_Left" orientation="Right Handed" position="86.6948 -145.909 -34.7378" rotation="90 -1.34352e-13 180" rotationorder="XYZr" scale="38.1413 38.1413 38.1413" sourcepath=".\meshes\Wheel_Front_Left.mesh#1" >
<Material id="Wheel_0002" name="Wheel" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
</Model>
<Model id="Wheel_Front_Right" name="Wheel_Front_Right" orientation="Right Handed" position="-89.4333 -145.909 -34.7378" rotation="90 -0 0" rotationorder="XYZr" scale="38.1413 38.1413 38.1413" sourcepath=".\meshes\Wheel_Front_Right.mesh#1" >
<Material id="Wheel_0003" name="Wheel" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
</Model>
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\CarModel\CarModel\FbxExports\Car.fbx" ImageDir="Images" MeshDir="Meshes" >
<Mesh >
<Source >Wheel_Back_Left</Source>
<Dest >.\meshes\Wheel_Back_Left.mesh</Dest>
</Mesh>
<Mesh >
<Source >Wheel_Front_Right</Source>
<Dest >.\meshes\Wheel_Front_Right.mesh</Dest>
</Mesh>
<Mesh >
<Source >body</Source>
<Dest >.\meshes\body.mesh</Dest>
</Mesh>
<Mesh >
<Source >Car</Source>
<Dest >.\meshes\Car.mesh</Dest>
</Mesh>
<Mesh >
<Source >Wheel_Back_Right</Source>
<Dest >.\meshes\Wheel_Back_Right.mesh</Dest>
</Mesh>
<Mesh >
<Source >Wheel_Front_Left</Source>
<Dest >.\meshes\Wheel_Front_Left.mesh</Dest>
</Mesh>
</Import>
</Project>
<Project Revision="2" >
<Graph >
<Group id="__import__root__" >
<Model id="Car" name="Car" orientation="Right Handed" position="0 0 -0" rotation="-90 -0 0" rotationorder="XYZr" scale="0.387697 0.387697 0.387697" sourcepath=".\meshes\Car.mesh#2" >
<Material id="Brakes" name="Brakes" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="SmallDetails" name="SmallDetails" blendmode="Normal" diffuse="0 0 0" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="Seats" name="Seats" blendmode="Normal" diffuse="0.0954207 0.0954207 0.0954207" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="Glass" name="Glass" blendmode="Normal" diffuse="0.424168 0.530641 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="CarBottom" name="CarBottom" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Material id="Interior" name="Interior" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
<Model id="Wheel_Back_Right" name="Wheel_Back_Right" orientation="Right Handed" position="-89.4333 114.27 -34.7378" rotation="90 -0 0" rotationorder="XYZr" scale="38.1413 38.1413 38.1413" sourcepath=".\meshes\Wheel_Back_Right.mesh#2" >
<Material id="Wheel" name="Wheel" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
</Model>
<Model id="body" name="body" orientation="Right Handed" position="0 0 -0" rotation="1.51661e-21 -0 0" rotationorder="XYZr" scale="1 1 1" sourcepath=".\meshes\body.mesh#2" >
<Material id="lambert2" name="lambert2" blendmode="Normal" diffuse="1 1 1" emissivepower="0" opacity="100" specularamount="0" />
</Model>
<Model id="Wheel_Back_Left" name="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=".\meshes\Wheel_Back_Left.mesh#2" >
<Material id="Wheel_0001" name="Wheel" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
</Model>
<Model id="Wheel_Front_Left" name="Wheel_Front_Left" orientation="Right Handed" position="86.6948 -145.909 -34.7378" rotation="90 -1.34352e-13 180" rotationorder="XYZr" scale="38.1413 38.1413 38.1413" sourcepath=".\meshes\Wheel_Front_Left.mesh#2" >
<Material id="Wheel_0002" name="Wheel" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
</Model>
<Model id="Wheel_Front_Right" name="Wheel_Front_Right" orientation="Right Handed" position="-89.4333 -145.909 -34.7378" rotation="90 -0 0" rotationorder="XYZr" scale="38.1413 38.1413 38.1413" sourcepath=".\meshes\Wheel_Front_Right.mesh#2" >
<Material id="Wheel_0003" name="Wheel" blendmode="Normal" diffuse="0.64 0.64 0.64" emissivepower="0" opacity="100" specularamount="0" specularroughness="9.60784" />
</Model>
</Model>
</Group>
</Graph>
<Import SrcFile="..\..\CarModel\CarModel\FbxExports\Car.fbx" ImageDir="Images" MeshDir="Meshes" >
<Mesh >
<Source >Wheel_Back_Left</Source>
<Dest >.\meshes\Wheel_Back_Left.mesh</Dest>
</Mesh>
<Mesh >
<Source >Wheel_Front_Right</Source>
<Dest >.\meshes\Wheel_Front_Right.mesh</Dest>
</Mesh>
<Mesh >
<Source >body</Source>
<Dest >.\meshes\body.mesh</Dest>
</Mesh>
<Mesh >
<Source >Car</Source>
<Dest >.\meshes\Car.mesh</Dest>
</Mesh>
<Mesh >
<Source >Wheel_Back_Right</Source>
<Dest >.\meshes\Wheel_Back_Right.mesh</Dest>
</Mesh>
<Mesh >
<Source >Wheel_Front_Left</Source>
<Dest >.\meshes\Wheel_Front_Left.mesh</Dest>
</Mesh>
</Import>
</Project>
</UIP>
clusterTemplate/clusterTemplate.uia
View file @ c585824a
<?xml version="1.0" encoding="UTF-8"?>
<application xmlns="http://qt.io/qt3dstudio/uia">
<?xml version="1.0" encoding="UTF-8" ?>
<application>
<assets initial="clusterTemplate">
<presentation id="clusterTemplate" src="clusterTemplate.uip"/>
<presentation id="clusterTemplate" src="clusterTemplate.uip"/>
<presentation-qml id="mapView" args="scripts/Navigation.qml"/>
<dataInput name="speed" type="Ranged Number" min="0" max="260"/>
<dataInput name="rpm" type="Ranged Number" min="0" max="7"/>
<dataInput name="slide" type="String"/>
<dataInput name="dateAndTime" type="String"/>
</assets>
<statemachine ref="#logic">
<visual-states>
<state ref="Initial">
......
clusterTemplate/clusterTemplate.uip
View file @ c585824a
This diff is collapsed.
clusterTemplate/effects/MapColorEffect.effect deleted 100644 → 0
View file @ 248a4660
<?xml version="1.0" encoding="UTF-8" ?>
<Effect>
<MetaData>
<Property name="road_color" formalName="Road Color" type="Color" default="0.5 0.63 0.7" description="The color to use for the road."/>
<Property name="land_color" formalName="Land Color" type="Color" default="0.0 0.0 0.0" description="The color to use for the land."/>
<Property name="water_color" formalName="Water Color" type="Color" default="0.6 0.6 0.9" description="The color to use for the water."/>
</MetaData>
<Shaders>
<Shared></Shared>
<VertexShaderShared></VertexShaderShared>
<FragmentShaderShared></FragmentShaderShared>
<Shader name="main">
<VertexShader></VertexShader>
<FragmentShader><![CDATA[
vec4 desaturate(vec3 color, float strenght)
{
vec3 lum = vec3(0.299, 0.587, 0.114);
// lum values based on: ITU-R BT.601
vec3 gray = vec3(dot(lum, color));
return vec4(mix(color, gray, strenght), 1.0);
}
void frag()
{
vec4 origColor = texture2D_0(TexCoord);
vec4 descolor = desaturate(origColor.rgb,1.0);
vec4 outcolor = vec4(0.0,0.0,0.0,1.0);
if(origColor.r > 0.1){
outcolor = descolor * vec4(road_color,1.0)*4.0;
}
else if(origColor.b > 0.1){
outcolor = descolor * vec4(water_color,1.0)*8.0;
}
else{
outcolor = vec4(land_color,1.0);
}
gl_FragColor = outcolor;
}
]]></FragmentShader>
</Shader>
</Shaders>
<Passes>
<Pass shader="main" input="[source]" output="[dest]"/>
</Passes>
</Effect>
clusterTemplate/maps/kmh260.png
View replaced file @ 248a4660 View file @ c585824a
clusterTemplate/maps/kmh260.png

37.4 KB | W: | H:

clusterTemplate/maps/kmh260.png

20.3 KB | W: | H:

clusterTemplate/maps/kmh260.png
clusterTemplate/maps/kmh260.png
clusterTemplate/maps/kmh260.png
clusterTemplate/maps/kmh260.png
  • 2-up
  • Swipe
  • Onion skin
clusterTemplate/scripts/Navigation.qml 0 → 100644
View file @ c585824a
/****************************************************************************
**
** Copyright (C) 2017 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt 3D Studio Demos.
**
** $QT_BEGIN_LICENSE:BSD$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** BSD License Usage
** Alternatively, you may use this file under the terms of the BSD license
** as follows:
**
** "Redistribution and use in source and binary forms, with or without
** modification, are permitted provided that the following conditions are
** met:
** * Redistributions of source code must retain the above copyright
** notice, this list of conditions and the following disclaimer.
** * Redistributions in binary form must reproduce the above copyright
** notice, this list of conditions and the following disclaimer in
** the documentation and/or other materials provided with the
** distribution.
** * Neither the name of The Qt Company Ltd nor the names of its
** contributors may be used to endorse or promote products derived
** from this software without specific prior written permission.
**
**
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
**
** $QT_END_LICENSE$
**
****************************************************************************/
import QtQuick 2.0
Item {
width: 768
height: 288
Image {
id: fakeMap
source: "./Map.jpg"
y: -231
width: 768
height: 462
}
PropertyAnimation {
target: fakeMap
property: "y"
loops: Animation.Infinite
duration: 25000
running: true
from: -231
to: 0
}
}
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