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
12804106
Commit
12804106
authored
May 14, 2018
by
Laszlo Agocs
Committed by
Janne Koskinen
May 14, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix demos for 2.0
Use runtime2 and correct surface format. Task-number: QT3DS-1646
parent
c585824a
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
10 additions
and
24 deletions
+10
-24
HomeAutomation/HomeAutom.pro
HomeAutomation/HomeAutom.pro
+1
-1
HomeAutomation/main.cpp
HomeAutomation/main.cpp
+3
-10
HomeAutomation/qml/HomeAutom/HomeView.qml
HomeAutomation/qml/HomeAutom/HomeView.qml
+1
-1
kria-cluster-3d-demo/kria3dclusterdemo.pro
kria-cluster-3d-demo/kria3dclusterdemo.pro
+1
-1
kria-cluster-3d-demo/main.cpp
kria-cluster-3d-demo/main.cpp
+3
-10
kria-cluster-3d-demo/qml/main.qml
kria-cluster-3d-demo/qml/main.qml
+1
-1
No files found.
HomeAutomation/HomeAutom.pro
View file @
12804106
...
...
@@ -12,7 +12,7 @@ KNX_BOARD {
CONFIG
+=
c
++
11
}
QT
+=
qml
quick
QT
+=
qml
quick
3
dstudioruntime2
CONFIG
+=
resources_big
...
...
HomeAutomation/main.cpp
View file @
12804106
...
...
@@ -59,6 +59,7 @@
#if defined(KNX_BACKEND)
#include "qmlknxdemo.h"
#endif
#include <q3dsruntimeglobal.h>
// Uncomment for 1280x900 window
//#define FIXEDWINDOW
...
...
@@ -75,18 +76,10 @@ int applyRatio(const int value, const int ratio)
int
main
(
int
argc
,
char
*
argv
[])
{
#if defined(Q_OS_MACOS)
QSurfaceFormat
openGLFormat
;
openGLFormat
.
setRenderableType
(
QSurfaceFormat
::
OpenGL
);
openGLFormat
.
setProfile
(
QSurfaceFormat
::
CoreProfile
);
openGLFormat
.
setMajorVersion
(
4
);
openGLFormat
.
setMinorVersion
(
1
);
openGLFormat
.
setStencilBufferSize
(
8
);
QSurfaceFormat
::
setDefaultFormat
(
openGLFormat
);
#endif
QGuiApplication
app
(
argc
,
argv
);
QSurfaceFormat
::
setDefaultFormat
(
Q3DS
::
surfaceFormat
());
// Define size variants for scaling
qreal
refDpi
=
96.
;
qreal
refWidth
=
1280.
;
...
...
HomeAutomation/qml/HomeAutom/HomeView.qml
View file @
12804106
...
...
@@ -50,7 +50,7 @@
import
QtQuick
2.8
import
QtQuick
.
Controls
2.1
import
QtStudio3D
1.1
import
QtStudio3D
2.0
Item
{
id
:
home
...
...
kria-cluster-3d-demo/kria3dclusterdemo.pro
View file @
12804106
TEMPLATE
=
app
QT
+=
qml
quick
QT
+=
qml
quick
3
dstudioruntime2
target
.
path
=
$$
[
QT_INSTALL_EXAMPLES
]
/
studio3d
/
$$
TARGET
INSTALLS
+=
target
...
...
kria-cluster-3d-demo/main.cpp
View file @
12804106
...
...
@@ -53,24 +53,17 @@
#include <QtQuick/QQuickView>
#include <QtQml/QQmlEngine>
#include <QtGui/QFontDatabase>
#include <q3dsruntimeglobal.h>
int
main
(
int
argc
,
char
*
argv
[])
{
#if defined(Q_OS_MACOS)
QSurfaceFormat
openGLFormat
;
openGLFormat
.
setRenderableType
(
QSurfaceFormat
::
OpenGL
);
openGLFormat
.
setProfile
(
QSurfaceFormat
::
CoreProfile
);
openGLFormat
.
setMajorVersion
(
4
);
openGLFormat
.
setMinorVersion
(
1
);
openGLFormat
.
setStencilBufferSize
(
8
);
QSurfaceFormat
::
setDefaultFormat
(
openGLFormat
);
#endif
qputenv
(
"QML_DISABLE_DISK_CACHE"
,
"true"
);
QCoreApplication
::
setAttribute
(
Qt
::
AA_EnableHighDpiScaling
);
QGuiApplication
app
(
argc
,
argv
);
QSurfaceFormat
::
setDefaultFormat
(
Q3DS
::
surfaceFormat
());
QQuickView
viewer
;
QFontDatabase
::
addApplicationFont
(
"qrc:/qml/fonts/TitilliumWeb-SemiBold.ttf"
);
...
...
kria-cluster-3d-demo/qml/main.qml
View file @
12804106
...
...
@@ -49,7 +49,7 @@
****************************************************************************/
import
QtQuick
2.9
import
QtStudio3D
1.1
import
QtStudio3D
2.0
import
QtQuick
.
Controls
2.1
Item
{
...
...
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