Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Q
qt3dstudio
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
public-demos
qt3dstudio
Commits
caf31dad
Commit
caf31dad
authored
Feb 22, 2018
by
Tomi Korpipää
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove 2D layer from Kria Cluster and do it in QML instead
parent
688548c5
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
23 additions
and
43 deletions
+23
-43
kria-cluster-3d-demo/kria3dclusterdemo.qrc
kria-cluster-3d-demo/kria3dclusterdemo.qrc
+0
-1
kria-cluster-3d-demo/presentation/mainPresentation.uip
kria-cluster-3d-demo/presentation/mainPresentation.uip
+4
-42
kria-cluster-3d-demo/qml/OverlayContainerForm.ui.qml
kria-cluster-3d-demo/qml/OverlayContainerForm.ui.qml
+18
-0
kria-cluster-3d-demo/qml/icons/line.png
kria-cluster-3d-demo/qml/icons/line.png
+0
-0
kria-cluster-3d-demo/qml/settings.qrc
kria-cluster-3d-demo/qml/settings.qrc
+1
-0
No files found.
kria-cluster-3d-demo/kria3dclusterdemo.qrc
View file @
caf31dad
...
...
@@ -25,7 +25,6 @@
<file>presentation/Gaugesvol1/meshes/speedNeedle.mesh</file>
<file>presentation/Gaugesvol1/meshes/tachoNeedle.mesh</file>
<file>presentation/Gaugesvol1/Gaugesvol1.import</file>
<file>presentation/maps/line.png</file>
<file>presentation/contentPresentation.uip</file>
<file>presentation/mainPresentation.uia</file>
<file>presentation/mainPresentation.uip</file>
...
...
kria-cluster-3d-demo/presentation/mainPresentation.uip
View file @
caf31dad
...
...
@@ -4,27 +4,11 @@
<ProjectSettings
author=
""
company=
""
presentationWidth=
"1920"
presentationHeight=
"720"
maintainAspect=
"True"
>
<CustomColors
count=
"16"
>
#ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff #ffffff
</CustomColors>
</ProjectSettings>
<BufferData
>
<ImageBuffer
sourcepath=
"maps/line.png"
hasTransparency=
"True"
/>
</BufferData>
<Classes
>
<Effect
id=
"VignetteEffect"
name=
"VignetteEffect"
sourcepath=
".\VignetteEffect.effect"
/>
</Classes>
<Graph
>
<Scene
id=
"Scene"
backgroundcolor=
"0 0 0"
controlledproperty=
"mainSlide @slide"
>
<Layer
id=
"2DLayer"
>
<Camera
id=
"Camera_001"
/>
<Model
id=
"line"
>
<Material
id=
"Material"
>
<Image
id=
"Material_diffusemap"
/>
</Material>
</Model>
<Model
id=
"line2"
>
<Material
id=
"Material_002"
>
<Image
id=
"Material_002_diffusemap"
/>
</Material>
</Model>
</Layer>
<Layer
id=
"Layer"
>
<Camera
id=
"Camera"
/>
<Group
id=
"Gaugesvol2"
importid=
"__import__root__"
>
...
...
@@ -99,14 +83,6 @@
</Graph>
<Logic
>
<State
name=
"Master Slide"
component=
"#Scene"
>
<Add
ref=
"#2DLayer"
name=
"2D_Layer"
/>
<Add
ref=
"#Camera_001"
orthographic=
"True"
position=
"0 -18 -600"
/>
<Add
ref=
"#line"
name=
"lineTop"
position=
"0 348 0"
scale=
"10.9222 0.208756 1"
sourcepath=
"#Rectangle"
/>
<Add
ref=
"#Material"
diffusemap=
"#Material_diffusemap"
shaderlighting=
"None"
/>
<Add
ref=
"#Material_diffusemap"
sourcepath=
".\maps\line.png"
/>
<Add
ref=
"#line2"
name=
"lineBottom"
position=
"0 -393 0"
scale=
"12.4544 0.207558 1"
sourcepath=
"#Rectangle"
/>
<Add
ref=
"#Material_002"
diffusemap=
"#Material_002_diffusemap"
shaderlighting=
"None"
/>
<Add
ref=
"#Material_002_diffusemap"
sourcepath=
".\maps\line.png"
/>
<Add
ref=
"#Layer"
name=
"Gauges_Layer"
aostrength=
"0"
lightprobe=
"#Layer_lightprobe"
multisampleaa=
"4x"
probebright=
"792"
probehorizon=
"-1"
progressiveaa=
"None"
temporalaa=
"False"
/>
<Add
ref=
"#Camera"
clipfar=
"1421"
clipnear=
"74.0976"
fov=
"5.3"
orthographic=
"False"
position=
"0 0 -1257"
scale=
"1 1 1"
/>
<Add
ref=
"#Gaugesvol2"
name=
"Gauges"
endtime=
"1000"
importfile=
".\Gaugesvol1\Gaugesvol1.import"
position=
"0 0 0"
scale=
"7 7 7"
sourcepath=
".\Gaugesvol1\Gaugesvol1.import"
/>
...
...
@@ -233,9 +209,6 @@
<Add
ref=
"#Material_001_diffusemap"
sourcepath=
".\Gaugesvol1\maps\map.jpg"
subpresentation=
"navigationStream"
/>
<Add
ref=
"#VignetteEffect_001"
name=
"VignetteEffect"
vig_color=
"0 0 0"
vig_radius=
"1.01626"
vig_strenght=
"15"
/>
<State
id=
"Scene-2D"
name=
"2D"
playmode=
"Play Through To..."
>
<Set
ref=
"#2DLayer"
endtime=
"1000"
/>
<Set
ref=
"#Camera_001"
endtime=
"1000"
/>
<Set
ref=
"#line"
endtime=
"1000"
/>
<Set
ref=
"#Layer"
endtime=
"1000"
/>
<Set
ref=
"#Camera"
endtime=
"1000"
/>
<Set
ref=
"#Gaugesvol2"
endtime=
"1000"
/>
...
...
@@ -322,9 +295,6 @@
<Set
ref=
"#VignetteEffect_001"
endtime=
"1000"
/>
</State>
<State
id=
"Scene-TurnGauges"
name=
"TurnGauges"
playmode=
"Play Through To..."
playthroughto=
"Next"
>
<Set
ref=
"#2DLayer"
endtime=
"2000"
/>
<Set
ref=
"#Camera_001"
endtime=
"2000"
/>
<Set
ref=
"#line"
endtime=
"2000"
/>
<Set
ref=
"#Layer"
endtime=
"2000"
/>
<Set
ref=
"#Camera"
endtime=
"2000"
/>
<Set
ref=
"#Gaugesvol2"
endtime=
"2000"
/>
...
...
@@ -414,9 +384,6 @@
<Set
ref=
"#VignetteEffect_001"
endtime=
"2000"
/>
</State>
<State
id=
"Scene-Base"
name=
"Base"
initialplaystate=
"Pause"
playmode=
"Play Through To..."
playthroughto=
"Next"
>
<Set
ref=
"#2DLayer"
endtime=
"2000"
/>
<Set
ref=
"#Camera_001"
endtime=
"2000"
/>
<Set
ref=
"#line"
endtime=
"2000"
/>
<Set
ref=
"#Layer"
endtime=
"2000"
/>
<Set
ref=
"#Camera"
endtime=
"2000"
/>
<Set
ref=
"#Gaugesvol2"
endtime=
"2000"
/>
...
...
@@ -516,9 +483,6 @@
<Set
ref=
"#VignetteEffect_001"
endtime=
"2000"
/>
</State>
<State
id=
"Scene-ToNavigation"
name=
"ToNavigation"
playmode=
"Play Through To..."
playthroughto=
"Next"
>
<Set
ref=
"#2DLayer"
endtime=
"1000"
/>
<Set
ref=
"#Camera_001"
endtime=
"1000"
/>
<Set
ref=
"#line"
endtime=
"1000"
/>
<Set
ref=
"#Layer"
endtime=
"1000"
/>
<Set
ref=
"#Camera"
endtime=
"1000"
/>
<Set
ref=
"#Gaugesvol2"
endtime=
"1000"
/>
...
...
@@ -602,9 +566,6 @@
<Set
ref=
"#VignetteEffect_001"
endtime=
"1000"
/>
</State>
<State
id=
"Scene-Navigation"
name=
"Navigation"
initialplaystate=
"Pause"
playmode=
"Play Through To..."
playthroughto=
"Next"
>
<Set
ref=
"#2DLayer"
endtime=
"1000"
/>
<Set
ref=
"#Camera_001"
endtime=
"1000"
/>
<Set
ref=
"#line"
endtime=
"1000"
/>
<Set
ref=
"#Layer"
endtime=
"1000"
/>
<Set
ref=
"#Camera"
endtime=
"1000"
/>
<Set
ref=
"#Gaugesvol2"
endtime=
"1000"
/>
...
...
@@ -704,9 +665,6 @@
<Set
ref=
"#VignetteEffect_001"
endtime=
"1000"
/>
</State>
<State
id=
"Scene-ToBase"
name=
"ToBase"
initialplaystate=
"Play"
playmode=
"Play Through To..."
playthroughto=
"#Scene-Base"
>
<Set
ref=
"#2DLayer"
endtime=
"1000"
/>
<Set
ref=
"#Camera_001"
endtime=
"1000"
/>
<Set
ref=
"#line"
endtime=
"1000"
/>
<Set
ref=
"#Layer"
endtime=
"1000"
/>
<Set
ref=
"#Camera"
endtime=
"1000"
/>
<Set
ref=
"#Gaugesvol2"
endtime=
"1000"
/>
...
...
@@ -870,5 +828,9 @@
</State>
</State>
</Logic>
<Guides
>
<Guide
direction=
"Horizontal"
position=
"640"
width=
"1"
/>
<Guide
direction=
"Horizontal"
position=
"80"
width=
"1"
/>
</Guides>
</Project>
</UIP>
kria-cluster-3d-demo/qml/OverlayContainerForm.ui.qml
View file @
caf31dad
...
...
@@ -199,4 +199,22 @@ Item {
horizontalAlignment
:
Text
.
AlignHCenter
font.pixelSize
:
48
}
Image
{
id
:
topLine
x
:
540
y
:
105
width
:
1517
height
:
24
source
:
"
icons/line.png
"
}
Image
{
id
:
bottomLine
x
:
633
y
:
851
width
:
1319
height
:
24
source
:
"
icons/line.png
"
}
}
kria-cluster-3d-demo/
presentation/map
s/line.png
→
kria-cluster-3d-demo/
qml/icon
s/line.png
View file @
caf31dad
File moved
kria-cluster-3d-demo/qml/settings.qrc
View file @
caf31dad
...
...
@@ -23,5 +23,6 @@
<file>listmodels/ChimesWarningModel.qml</file>
<file>icons/MenuBack.png</file>
<file>icons/MenuBackBlue.png</file>
<file>icons/line.png</file>
</qresource>
</RCC>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment