Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Q
qt3dstudio
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
public-demos
qt3dstudio
Commits
248a4660
Commit
248a4660
authored
Apr 27, 2018
by
Tomi Korpipää
Browse files
Options
Downloads
Patches
Plain Diff
Remove mac hack from kria
QML Streamer had a bug that has been fixed. No hacks for mac needed anymore.
parent
176a0e08
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
kria-cluster-3d-demo/qml/main.qml
+5
-9
5 additions, 9 deletions
kria-cluster-3d-demo/qml/main.qml
with
5 additions
and
9 deletions
kria-cluster-3d-demo/qml/main.qml
+
5
−
9
View file @
248a4660
...
@@ -148,14 +148,12 @@ Item {
...
@@ -148,14 +148,12 @@ 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
:
tru
e
active
:
fals
e
visible
:
tru
e
visible
:
activ
e
source
:
"
qrc:/Navigation.qml
"
source
:
""
asynchronous
:
fals
e
asynchronous
:
tru
e
}
}
}
}
]
]
...
@@ -169,8 +167,6 @@ Item {
...
@@ -169,8 +167,6 @@ 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
;
...
@@ -179,7 +175,7 @@ Item {
...
@@ -179,7 +175,7 @@ Item {
else
else
studio3D
.
x
-=
0.1
;
studio3D
.
x
-=
0.1
;
}
}
*/
}
}
OverlayContainer
{
OverlayContainer
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment