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
5591f03a
Commit
5591f03a
authored
9 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I96e549fdf43c4aee70a5f802b81c7305e17d23c7
parents
c085f612
ea4d7711
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
94
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
20 changed files
creatortemplates/qtcanvas3d/cube.js
+3
-3
creatortemplates/qtcanvas3d/cube.js
examples/canvas3d/3rdparty/ThreeJSLoader.js
+47
-43
examples/canvas3d/3rdparty/ThreeJSLoader.js
examples/canvas3d/3rdparty/gl-matrix.js
+0
-0
examples/canvas3d/3rdparty/gl-matrix.js
examples/canvas3d/3rdparty/three.js
+35272
-0
examples/canvas3d/3rdparty/three.js
examples/canvas3d/canvas3d.pro
+2
-4
examples/canvas3d/canvas3d.pro
examples/canvas3d/canvas3d/canvas3d.pro
+5
-0
examples/canvas3d/canvas3d/canvas3d.pro
examples/canvas3d/canvas3d/framebuffer/doc/images/framebuffer-example.png
+0
-0
...d/canvas3d/framebuffer/doc/images/framebuffer-example.png
examples/canvas3d/canvas3d/framebuffer/doc/src/framebuffer.qdoc
+11
-11
...es/canvas3d/canvas3d/framebuffer/doc/src/framebuffer.qdoc
examples/canvas3d/canvas3d/framebuffer/framebuffer.pro
+1
-1
examples/canvas3d/canvas3d/framebuffer/framebuffer.pro
examples/canvas3d/canvas3d/framebuffer/framebuffer.qrc
+0
-0
examples/canvas3d/canvas3d/framebuffer/framebuffer.qrc
examples/canvas3d/canvas3d/framebuffer/main.cpp
+0
-0
examples/canvas3d/canvas3d/framebuffer/main.cpp
examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
+11
-41
...vas3d/canvas3d/framebuffer/qml/framebuffer/framebuffer.js
examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/main.qml
+5
-5
...es/canvas3d/canvas3d/framebuffer/qml/framebuffer/main.qml
examples/canvas3d/canvas3d/framebuffer/qml/framebuffer/qtlogo.png
+0
-0
.../canvas3d/canvas3d/framebuffer/qml/framebuffer/qtlogo.png
examples/canvas3d/canvas3d/interaction/3dmodels.txt
+0
-0
examples/canvas3d/canvas3d/interaction/3dmodels.txt
examples/canvas3d/canvas3d/interaction/doc/images/interaction-example.png
+0
-0
...d/canvas3d/interaction/doc/images/interaction-example.png
examples/canvas3d/canvas3d/interaction/doc/src/interaction.qdoc
+10
-10
...es/canvas3d/canvas3d/interaction/doc/src/interaction.qdoc
examples/canvas3d/canvas3d/interaction/interaction.pro
+1
-1
examples/canvas3d/canvas3d/interaction/interaction.pro
examples/canvas3d/canvas3d/interaction/interaction.qrc
+0
-0
examples/canvas3d/canvas3d/interaction/interaction.qrc
examples/canvas3d/canvas3d/interaction/main.cpp
+0
-0
examples/canvas3d/canvas3d/interaction/main.cpp
with
35368 additions
and
119 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