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
b903fcf9
Commit
b903fcf9
authored
Apr 26, 2018
by
Tomi Korpipää
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix kria cluster macOS issues
parent
c8208c3e
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
13 additions
and
4 deletions
+13
-4
kria-cluster-3d-demo/main.cpp
kria-cluster-3d-demo/main.cpp
+2
-0
kria-cluster-3d-demo/presentation/mainPresentation.uip
kria-cluster-3d-demo/presentation/mainPresentation.uip
+2
-2
kria-cluster-3d-demo/qml/main.qml
kria-cluster-3d-demo/qml/main.qml
+9
-2
No files found.
kria-cluster-3d-demo/main.cpp
View file @
b903fcf9
...
@@ -66,6 +66,8 @@ int main(int argc, char *argv[])
...
@@ -66,6 +66,8 @@ int main(int argc, char *argv[])
QSurfaceFormat
::
setDefaultFormat
(
openGLFormat
);
QSurfaceFormat
::
setDefaultFormat
(
openGLFormat
);
#endif
#endif
qputenv
(
"QML_DISABLE_DISK_CACHE"
,
"true"
);
QCoreApplication
::
setAttribute
(
Qt
::
AA_EnableHighDpiScaling
);
QCoreApplication
::
setAttribute
(
Qt
::
AA_EnableHighDpiScaling
);
QGuiApplication
app
(
argc
,
argv
);
QGuiApplication
app
(
argc
,
argv
);
...
...
kria-cluster-3d-demo/presentation/mainPresentation.uip
View file @
b903fcf9
...
@@ -199,7 +199,7 @@
...
@@ -199,7 +199,7 @@
</Add>
</Add>
<Add
ref=
"#Layer_lightprobe"
mappingmode=
"Light Probe"
sourcepath=
".\Gauges\maps\OpenfootageNET_lowerAustria01-1024.hdr"
/>
<Add
ref=
"#Layer_lightprobe"
mappingmode=
"Light Probe"
sourcepath=
".\Gauges\maps\OpenfootageNET_lowerAustria01-1024.hdr"
/>
<Add
ref=
"#Light_002"
name=
"Light"
brightness=
"250"
castshadow=
"True"
endtime=
"1000"
expfade=
"0"
lightambient=
"0.427451 0.427451 0.427451"
lightdiffuse=
"0.901961 0.901961 0.901961"
lightspecular=
"0.113725 0.109804 0.14902"
lighttype=
"Point"
linearfade=
"9.25926"
position=
"0 48 -110"
scale=
"4 1 1"
shdwbias=
"0.032"
shdwfactor=
"79.8333"
shdwfilter=
"4.66667"
shdwmapfar=
"1500"
shdwmapres=
"10"
/>
<Add
ref=
"#Light_002"
name=
"Light"
brightness=
"250"
castshadow=
"True"
endtime=
"1000"
expfade=
"0"
lightambient=
"0.427451 0.427451 0.427451"
lightdiffuse=
"0.901961 0.901961 0.901961"
lightspecular=
"0.113725 0.109804 0.14902"
lighttype=
"Point"
linearfade=
"9.25926"
position=
"0 48 -110"
scale=
"4 1 1"
shdwbias=
"0.032"
shdwfactor=
"79.8333"
shdwfilter=
"4.66667"
shdwmapfar=
"1500"
shdwmapres=
"10"
/>
<Add
ref=
"#Map"
name=
"Content_Layer"
background=
"Transparent"
height=
"70"
left=
"15"
top=
"17"
width=
"72"
/>
<Add
ref=
"#Map"
name=
"Content_Layer"
background=
"Transparent"
disabledepthprepass=
"True"
disabledepthtest=
"True"
height=
"70"
left=
"15"
top=
"17"
width=
"72"
/>
<Add
ref=
"#Camera_002"
orthographic=
"True"
/>
<Add
ref=
"#Camera_002"
orthographic=
"True"
/>
<Add
ref=
"#Car"
name=
"Car"
controlledproperty=
"$carSlide @slide"
/>
<Add
ref=
"#Car"
name=
"Car"
controlledproperty=
"$carSlide @slide"
/>
<Add
ref=
"#map"
name=
"Navigation"
opacity=
"100"
scale=
"25.9751 9.54456 1"
sourcepath=
"#Rectangle"
>
<Add
ref=
"#map"
name=
"Navigation"
opacity=
"100"
scale=
"25.9751 9.54456 1"
sourcepath=
"#Rectangle"
>
...
@@ -658,7 +658,7 @@
...
@@ -658,7 +658,7 @@
</Set>
</Set>
<Set
ref=
"#Map"
endtime=
"1000"
height=
"85"
left=
"8"
top=
"8"
width=
"85"
/>
<Set
ref=
"#Map"
endtime=
"1000"
height=
"85"
left=
"8"
top=
"8"
width=
"85"
/>
<Set
ref=
"#Camera_002"
endtime=
"1000"
/>
<Set
ref=
"#Camera_002"
endtime=
"1000"
/>
<Set
ref=
"#Car"
endtime=
"1000"
/>
<Set
ref=
"#Car"
endtime=
"1000"
eyeball=
"False"
/>
<Set
ref=
"#map"
endtime=
"1000"
opacity=
"100"
>
<Set
ref=
"#map"
endtime=
"1000"
opacity=
"100"
>
<AnimationTrack
property=
"opacity"
type=
"EaseInOut"
>
0 100 0 0
</AnimationTrack>
<AnimationTrack
property=
"opacity"
type=
"EaseInOut"
>
0 100 0 0
</AnimationTrack>
</Set>
</Set>
...
...
kria-cluster-3d-demo/qml/main.qml
View file @
b903fcf9
...
@@ -148,10 +148,14 @@ Item {
...
@@ -148,10 +148,14 @@ Item {
qmlStreams
:
[
qmlStreams
:
[
QmlStream
{
QmlStream
{
presentationId
:
"
navigationStream
"
presentationId
:
"
navigationStream
"
// Load at start and set active & visible. Otherwise causes problems
// with macOS.
Loader
{
Loader
{
id
:
contentStream
id
:
contentStream
active
:
false
active
:
true
source
:
""
visible
:
true
source
:
"
qrc:/Navigation.qml
"
asynchronous
:
false
}
}
}
}
]
]
...
@@ -165,6 +169,8 @@ Item {
...
@@ -165,6 +169,8 @@ Item {
// Hack. We need to draw something in QML in each frame to minimize the jamming of
// Hack. We need to draw something in QML in each frame to minimize the jamming of
// Studio3D content.
// Studio3D content.
/*
// This seems to mess up QML streaming for macOS. Enable if target device jams a lot.
property bool direction: false
property bool direction: false
onFrameUpdate: {
onFrameUpdate: {
direction = !direction;
direction = !direction;
...
@@ -173,6 +179,7 @@ Item {
...
@@ -173,6 +179,7 @@ Item {
else
else
studio3D.x -= 0.1;
studio3D.x -= 0.1;
}
}
*/
}
}
OverlayContainer
{
OverlayContainer
{
...
...
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