Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtCanvas3D
Commits
05c00555
Commit
05c00555
authored
9 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I61edafed8a790578e13ca2beeacfd8bf42b74465
parents
5591f03a
f12f84d2
6.2
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.6
5.7
5.8
5.9
5.9.8
6.2.0
6.2.1
6.2.2
dev
wip/threading
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
No related merge requests found
Changes
142
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
creatortemplates/qtcanvas3d/deployment.pri
+27
-0
creatortemplates/qtcanvas3d/deployment.pri
creatortemplates/qtcanvas3d/glcode.js
+99
-62
creatortemplates/qtcanvas3d/glcode.js
creatortemplates/qtcanvas3d/main.cpp
+5
-23
creatortemplates/qtcanvas3d/main.cpp
creatortemplates/qtcanvas3d/main.qml
+14
-7
creatortemplates/qtcanvas3d/main.qml
creatortemplates/qtcanvas3d/project.pro
+9
-2
creatortemplates/qtcanvas3d/project.pro
creatortemplates/qtcanvas3d/qtcanvas3d.qrc
+1
-1
creatortemplates/qtcanvas3d/qtcanvas3d.qrc
creatortemplates/qtcanvas3d/wizard.xml
+2
-1
creatortemplates/qtcanvas3d/wizard.xml
creatortemplates/qtcanvas3dthreejs/3rdparty/three.js
+47
-17
creatortemplates/qtcanvas3dthreejs/3rdparty/three.js
creatortemplates/qtcanvas3dthreejs/deployment.pri
+27
-0
creatortemplates/qtcanvas3dthreejs/deployment.pri
creatortemplates/qtcanvas3dthreejs/glcode.js
+72
-0
creatortemplates/qtcanvas3dthreejs/glcode.js
creatortemplates/qtcanvas3dthreejs/main.cpp
+48
-0
creatortemplates/qtcanvas3dthreejs/main.cpp
creatortemplates/qtcanvas3dthreejs/main.qml
+69
-0
creatortemplates/qtcanvas3dthreejs/main.qml
creatortemplates/qtcanvas3dthreejs/project.pro
+15
-0
creatortemplates/qtcanvas3dthreejs/project.pro
creatortemplates/qtcanvas3dthreejs/qtcanvas3d.png
+0
-0
creatortemplates/qtcanvas3dthreejs/qtcanvas3d.png
creatortemplates/qtcanvas3dthreejs/qtcanvas3dthreejs.qrc
+7
-0
creatortemplates/qtcanvas3dthreejs/qtcanvas3dthreejs.qrc
creatortemplates/qtcanvas3dthreejs/wizard.xml
+57
-0
creatortemplates/qtcanvas3dthreejs/wizard.xml
examples/canvas3d/canvas3d.pro
+1
-2
examples/canvas3d/canvas3d.pro
examples/canvas3d/canvas3d/3rdparty/ThreeJSLoader.js
+0
-0
examples/canvas3d/canvas3d/3rdparty/ThreeJSLoader.js
examples/canvas3d/canvas3d/3rdparty/gl-matrix.js
+0
-0
examples/canvas3d/canvas3d/3rdparty/gl-matrix.js
examples/canvas3d/canvas3d/3rdparty/three.js
+35302
-0
examples/canvas3d/canvas3d/3rdparty/three.js
with
35802 additions
and
115 deletions
Preview
Supports
Markdown
0%
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
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets