diff options
| author | Casper van Donderen <casper.vandonderen@nokia.com> | 2012-06-25 12:28:30 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-10 20:01:44 +0200 |
| commit | 2222dbd1d27256d7ab5d06342e315d6991ade9a0 (patch) | |
| tree | 852bf166e47e8c4b9b4e4980540ea1b834e08ade /doc | |
| parent | 9cc7c809875024df0cf6bcef049b4ee11044b812 (diff) | |
Doc: Modularize Qt3D Documentation.
Change-Id: I2e273e8dd15c80eb9b7d4ea503cba1e8f361d18c
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
Diffstat (limited to 'doc')
119 files changed, 0 insertions, 1345 deletions
diff --git a/doc/src/images/REAME-ODF b/doc/src/images/REAME-ODF deleted file mode 100644 index 6d1a820b2..000000000 --- a/doc/src/images/REAME-ODF +++ /dev/null @@ -1,5 +0,0 @@ -The *.odf files here are OpenOffice formula files. - -To edit the formulas shown here as png's, open the corresponding odf file -with OpenOffices formula editor, edit, save, then export as PDF. The -PDF can be opened with gimp to create a PNG. diff --git a/doc/src/images/affine-transform.odf b/doc/src/images/affine-transform.odf Binary files differdeleted file mode 100644 index 4ead5ccae..000000000 --- a/doc/src/images/affine-transform.odf +++ /dev/null diff --git a/doc/src/images/affine-transform.png b/doc/src/images/affine-transform.png Binary files differdeleted file mode 100644 index c520623f0..000000000 --- a/doc/src/images/affine-transform.png +++ /dev/null diff --git a/doc/src/images/attenuation.odf b/doc/src/images/attenuation.odf Binary files differdeleted file mode 100644 index a3c35333f..000000000 --- a/doc/src/images/attenuation.odf +++ /dev/null diff --git a/doc/src/images/attenuation.png b/doc/src/images/attenuation.png Binary files differdeleted file mode 100644 index fa64ebed9..000000000 --- a/doc/src/images/attenuation.png +++ /dev/null diff --git a/doc/src/images/basket-screenshot.png b/doc/src/images/basket-screenshot.png Binary files differdeleted file mode 100644 index 21d72a287..000000000 --- a/doc/src/images/basket-screenshot.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-1.png b/doc/src/images/build-qt3d-qtcreator-1.png Binary files differdeleted file mode 100644 index c81185856..000000000 --- a/doc/src/images/build-qt3d-qtcreator-1.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-2.png b/doc/src/images/build-qt3d-qtcreator-2.png Binary files differdeleted file mode 100644 index 78bbea3ec..000000000 --- a/doc/src/images/build-qt3d-qtcreator-2.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-3.png b/doc/src/images/build-qt3d-qtcreator-3.png Binary files differdeleted file mode 100644 index 95ff3c000..000000000 --- a/doc/src/images/build-qt3d-qtcreator-3.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-4.png b/doc/src/images/build-qt3d-qtcreator-4.png Binary files differdeleted file mode 100644 index d30428701..000000000 --- a/doc/src/images/build-qt3d-qtcreator-4.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-5.png b/doc/src/images/build-qt3d-qtcreator-5.png Binary files differdeleted file mode 100644 index 996d04cda..000000000 --- a/doc/src/images/build-qt3d-qtcreator-5.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-6.png b/doc/src/images/build-qt3d-qtcreator-6.png Binary files differdeleted file mode 100644 index dabffb392..000000000 --- a/doc/src/images/build-qt3d-qtcreator-6.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-7.png b/doc/src/images/build-qt3d-qtcreator-7.png Binary files differdeleted file mode 100644 index e6d0a452e..000000000 --- a/doc/src/images/build-qt3d-qtcreator-7.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-8.png b/doc/src/images/build-qt3d-qtcreator-8.png Binary files differdeleted file mode 100644 index 0a050127c..000000000 --- a/doc/src/images/build-qt3d-qtcreator-8.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-9.png b/doc/src/images/build-qt3d-qtcreator-9.png Binary files differdeleted file mode 100644 index befcce200..000000000 --- a/doc/src/images/build-qt3d-qtcreator-9.png +++ /dev/null diff --git a/doc/src/images/build-qt3d-qtcreator-set-to-release.png b/doc/src/images/build-qt3d-qtcreator-set-to-release.png Binary files differdeleted file mode 100644 index 882a80d83..000000000 --- a/doc/src/images/build-qt3d-qtcreator-set-to-release.png +++ /dev/null diff --git a/doc/src/images/cube-screenshot.png b/doc/src/images/cube-screenshot.png Binary files differdeleted file mode 100644 index 564646753..000000000 --- a/doc/src/images/cube-screenshot.png +++ /dev/null diff --git a/doc/src/images/cylinder-texture-coords.png b/doc/src/images/cylinder-texture-coords.png Binary files differdeleted file mode 100644 index 8ad69b43e..000000000 --- a/doc/src/images/cylinder-texture-coords.png +++ /dev/null diff --git a/doc/src/images/faceted-q.png b/doc/src/images/faceted-q.png Binary files differdeleted file mode 100644 index a809976bc..000000000 --- a/doc/src/images/faceted-q.png +++ /dev/null diff --git a/doc/src/images/forest-screenshot.png b/doc/src/images/forest-screenshot.png Binary files differdeleted file mode 100644 index 9984d0bea..000000000 --- a/doc/src/images/forest-screenshot.png +++ /dev/null diff --git a/doc/src/images/forest-screenshot2.png b/doc/src/images/forest-screenshot2.png Binary files differdeleted file mode 100644 index 3de77cfa8..000000000 --- a/doc/src/images/forest-screenshot2.png +++ /dev/null diff --git a/doc/src/images/forest-screenshot3.png b/doc/src/images/forest-screenshot3.png Binary files differdeleted file mode 100644 index 5589e2adf..000000000 --- a/doc/src/images/forest-screenshot3.png +++ /dev/null diff --git a/doc/src/images/gradient.png b/doc/src/images/gradient.png Binary files differdeleted file mode 100644 index 2ef36edd0..000000000 --- a/doc/src/images/gradient.png +++ /dev/null diff --git a/doc/src/images/icon-qt3d.png b/doc/src/images/icon-qt3d.png Binary files differdeleted file mode 100644 index 36b7e2d9c..000000000 --- a/doc/src/images/icon-qt3d.png +++ /dev/null diff --git a/doc/src/images/imports-dir.png b/doc/src/images/imports-dir.png Binary files differdeleted file mode 100644 index 69528e1a6..000000000 --- a/doc/src/images/imports-dir.png +++ /dev/null diff --git a/doc/src/images/lander-screenshot.png b/doc/src/images/lander-screenshot.png Binary files differdeleted file mode 100644 index c070e30dc..000000000 --- a/doc/src/images/lander-screenshot.png +++ /dev/null diff --git a/doc/src/images/line-int-1.png b/doc/src/images/line-int-1.png Binary files differdeleted file mode 100644 index 74e9be24f..000000000 --- a/doc/src/images/line-int-1.png +++ /dev/null diff --git a/doc/src/images/line-int-2.png b/doc/src/images/line-int-2.png Binary files differdeleted file mode 100644 index 9ca443740..000000000 --- a/doc/src/images/line-int-2.png +++ /dev/null diff --git a/doc/src/images/line-intersection.odf b/doc/src/images/line-intersection.odf Binary files differdeleted file mode 100644 index 4e0fe2d49..000000000 --- a/doc/src/images/line-intersection.odf +++ /dev/null diff --git a/doc/src/images/line-intersection.pdf b/doc/src/images/line-intersection.pdf Binary files differdeleted file mode 100644 index cf9ef0b43..000000000 --- a/doc/src/images/line-intersection.pdf +++ /dev/null diff --git a/doc/src/images/line-intersection2.odf b/doc/src/images/line-intersection2.odf Binary files differdeleted file mode 100644 index 4e959aff6..000000000 --- a/doc/src/images/line-intersection2.odf +++ /dev/null diff --git a/doc/src/images/line-intersection2.pdf b/doc/src/images/line-intersection2.pdf Binary files differdeleted file mode 100644 index bd624790b..000000000 --- a/doc/src/images/line-intersection2.pdf +++ /dev/null diff --git a/doc/src/images/monkeygod-screenshot.png b/doc/src/images/monkeygod-screenshot.png Binary files differdeleted file mode 100644 index 931237abc..000000000 --- a/doc/src/images/monkeygod-screenshot.png +++ /dev/null diff --git a/doc/src/images/moon-screenshot.png b/doc/src/images/moon-screenshot.png Binary files differdeleted file mode 100644 index cafeffff3..000000000 --- a/doc/src/images/moon-screenshot.png +++ /dev/null diff --git a/doc/src/images/mouse3dtest-screenshot.png b/doc/src/images/mouse3dtest-screenshot.png Binary files differdeleted file mode 100644 index 518a915e4..000000000 --- a/doc/src/images/mouse3dtest-screenshot.png +++ /dev/null diff --git a/doc/src/images/nesting-screenshot.png b/doc/src/images/nesting-screenshot.png Binary files differdeleted file mode 100644 index 9e60ddf1f..000000000 --- a/doc/src/images/nesting-screenshot.png +++ /dev/null diff --git a/doc/src/images/normalized.odf b/doc/src/images/normalized.odf Binary files differdeleted file mode 100644 index d75e70448..000000000 --- a/doc/src/images/normalized.odf +++ /dev/null diff --git a/doc/src/images/pageflip-screenshot.png b/doc/src/images/pageflip-screenshot.png Binary files differdeleted file mode 100644 index 2a081a217..000000000 --- a/doc/src/images/pageflip-screenshot.png +++ /dev/null diff --git a/doc/src/images/painter-screenshot.png b/doc/src/images/painter-screenshot.png Binary files differdeleted file mode 100644 index e11a5a34f..000000000 --- a/doc/src/images/painter-screenshot.png +++ /dev/null diff --git a/doc/src/images/penguin-0-screenshot.png b/doc/src/images/penguin-0-screenshot.png Binary files differdeleted file mode 100644 index d65d590f0..000000000 --- a/doc/src/images/penguin-0-screenshot.png +++ /dev/null diff --git a/doc/src/images/penguin-screenshot.png b/doc/src/images/penguin-screenshot.png Binary files differdeleted file mode 100644 index eb3349803..000000000 --- a/doc/src/images/penguin-screenshot.png +++ /dev/null diff --git a/doc/src/images/pvcolor.png b/doc/src/images/pvcolor.png Binary files differdeleted file mode 100644 index 380a19a3c..000000000 --- a/doc/src/images/pvcolor.png +++ /dev/null diff --git a/doc/src/images/pyramid-screenshot.png b/doc/src/images/pyramid-screenshot.png Binary files differdeleted file mode 100644 index 6a585a6ce..000000000 --- a/doc/src/images/pyramid-screenshot.png +++ /dev/null diff --git a/doc/src/images/qray3d-project.png b/doc/src/images/qray3d-project.png Binary files differdeleted file mode 100644 index 1288f204f..000000000 --- a/doc/src/images/qray3d-project.png +++ /dev/null diff --git a/doc/src/images/qt-creator-config-3ds.png b/doc/src/images/qt-creator-config-3ds.png Binary files differdeleted file mode 100644 index 87ac89fd9..000000000 --- a/doc/src/images/qt-creator-config-3ds.png +++ /dev/null diff --git a/doc/src/images/qt-creator-lib-path.png b/doc/src/images/qt-creator-lib-path.png Binary files differdeleted file mode 100644 index 5f988437e..000000000 --- a/doc/src/images/qt-creator-lib-path.png +++ /dev/null diff --git a/doc/src/images/qt-creator-plugins.png b/doc/src/images/qt-creator-plugins.png Binary files differdeleted file mode 100644 index 8b469ab02..000000000 --- a/doc/src/images/qt-creator-plugins.png +++ /dev/null diff --git a/doc/src/images/qt-creator-shadow-build.png b/doc/src/images/qt-creator-shadow-build.png Binary files differdeleted file mode 100644 index 9b231d5f4..000000000 --- a/doc/src/images/qt-creator-shadow-build.png +++ /dev/null diff --git a/doc/src/images/qt-logo.png b/doc/src/images/qt-logo.png Binary files differdeleted file mode 100644 index 14ddf2a02..000000000 --- a/doc/src/images/qt-logo.png +++ /dev/null diff --git a/doc/src/images/qt3d-logo.png b/doc/src/images/qt3d-logo.png Binary files differdeleted file mode 100644 index 1196826b2..000000000 --- a/doc/src/images/qt3d-logo.png +++ /dev/null diff --git a/doc/src/images/quad-extrude.png b/doc/src/images/quad-extrude.png Binary files differdeleted file mode 100644 index c4b6ee445..000000000 --- a/doc/src/images/quad-extrude.png +++ /dev/null diff --git a/doc/src/images/quad-extrude.xcf b/doc/src/images/quad-extrude.xcf Binary files differdeleted file mode 100644 index 0d1650ac2..000000000 --- a/doc/src/images/quad-extrude.xcf +++ /dev/null diff --git a/doc/src/images/quads.png b/doc/src/images/quads.png Binary files differdeleted file mode 100644 index 28a030999..000000000 --- a/doc/src/images/quads.png +++ /dev/null diff --git a/doc/src/images/sampleshapes.png b/doc/src/images/sampleshapes.png Binary files differdeleted file mode 100644 index f468da558..000000000 --- a/doc/src/images/sampleshapes.png +++ /dev/null diff --git a/doc/src/images/scenegraph_scenario1.png b/doc/src/images/scenegraph_scenario1.png Binary files differdeleted file mode 100644 index c1d3b1a37..000000000 --- a/doc/src/images/scenegraph_scenario1.png +++ /dev/null diff --git a/doc/src/images/scenegraph_scenario2.png b/doc/src/images/scenegraph_scenario2.png Binary files differdeleted file mode 100644 index 66216f6fa..000000000 --- a/doc/src/images/scenegraph_scenario2.png +++ /dev/null diff --git a/doc/src/images/scenegraph_scenario3.png b/doc/src/images/scenegraph_scenario3.png Binary files differdeleted file mode 100644 index fe2cdc75d..000000000 --- a/doc/src/images/scenegraph_scenario3.png +++ /dev/null diff --git a/doc/src/images/scenegraph_scenario4.png b/doc/src/images/scenegraph_scenario4.png Binary files differdeleted file mode 100644 index 81189ac0c..000000000 --- a/doc/src/images/scenegraph_scenario4.png +++ /dev/null diff --git a/doc/src/images/scenegraph_scenario5.png b/doc/src/images/scenegraph_scenario5.png Binary files differdeleted file mode 100644 index 2803a4ad6..000000000 --- a/doc/src/images/scenegraph_scenario5.png +++ /dev/null diff --git a/doc/src/images/scenegraph_scenario6.png b/doc/src/images/scenegraph_scenario6.png Binary files differdeleted file mode 100644 index 070eecd12..000000000 --- a/doc/src/images/scenegraph_scenario6.png +++ /dev/null diff --git a/doc/src/images/scenegraph_scenario7.png b/doc/src/images/scenegraph_scenario7.png Binary files differdeleted file mode 100644 index 3353d3d12..000000000 --- a/doc/src/images/scenegraph_scenario7.png +++ /dev/null diff --git a/doc/src/images/scenegraph_scenario8.png b/doc/src/images/scenegraph_scenario8.png Binary files differdeleted file mode 100644 index 6d3c99fc0..000000000 --- a/doc/src/images/scenegraph_scenario8.png +++ /dev/null diff --git a/doc/src/images/shaders-screenshot.png b/doc/src/images/shaders-screenshot.png Binary files differdeleted file mode 100644 index 41d8f6a50..000000000 --- a/doc/src/images/shaders-screenshot.png +++ /dev/null diff --git a/doc/src/images/shapes-screenshot.png b/doc/src/images/shapes-screenshot.png Binary files differdeleted file mode 100644 index ad0a0f433..000000000 --- a/doc/src/images/shapes-screenshot.png +++ /dev/null diff --git a/doc/src/images/soup.png b/doc/src/images/soup.png Binary files differdeleted file mode 100644 index c84c07295..000000000 --- a/doc/src/images/soup.png +++ /dev/null diff --git a/doc/src/images/sphere-detail.png b/doc/src/images/sphere-detail.png Binary files differdeleted file mode 100644 index 90e40fb45..000000000 --- a/doc/src/images/sphere-detail.png +++ /dev/null diff --git a/doc/src/images/spiky-teapot.png b/doc/src/images/spiky-teapot.png Binary files differdeleted file mode 100644 index 2871d83e9..000000000 --- a/doc/src/images/spiky-teapot.png +++ /dev/null diff --git a/doc/src/images/stereo-nhd-screenshot.png b/doc/src/images/stereo-nhd-screenshot.png Binary files differdeleted file mode 100644 index 74df719e6..000000000 --- a/doc/src/images/stereo-nhd-screenshot.png +++ /dev/null diff --git a/doc/src/images/stereo-screenshot-qml.png b/doc/src/images/stereo-screenshot-qml.png Binary files differdeleted file mode 100644 index d7e8f7a39..000000000 --- a/doc/src/images/stereo-screenshot-qml.png +++ /dev/null diff --git a/doc/src/images/stereo-screenshot-qml2.png b/doc/src/images/stereo-screenshot-qml2.png Binary files differdeleted file mode 100644 index d91f959f3..000000000 --- a/doc/src/images/stereo-screenshot-qml2.png +++ /dev/null diff --git a/doc/src/images/stereo-screenshot.png b/doc/src/images/stereo-screenshot.png Binary files differdeleted file mode 100644 index 020fcb683..000000000 --- a/doc/src/images/stereo-screenshot.png +++ /dev/null diff --git a/doc/src/images/stereo-wide-screenshot.png b/doc/src/images/stereo-wide-screenshot.png Binary files differdeleted file mode 100644 index f9e165a66..000000000 --- a/doc/src/images/stereo-wide-screenshot.png +++ /dev/null diff --git a/doc/src/images/teapot-china-screenshot.png b/doc/src/images/teapot-china-screenshot.png Binary files differdeleted file mode 100644 index d38602fcc..000000000 --- a/doc/src/images/teapot-china-screenshot.png +++ /dev/null diff --git a/doc/src/images/teapot-distortion.png b/doc/src/images/teapot-distortion.png Binary files differdeleted file mode 100644 index 76b4a3db7..000000000 --- a/doc/src/images/teapot-distortion.png +++ /dev/null diff --git a/doc/src/images/teapot-distortion2.png b/doc/src/images/teapot-distortion2.png Binary files differdeleted file mode 100644 index 573503bdc..000000000 --- a/doc/src/images/teapot-distortion2.png +++ /dev/null diff --git a/doc/src/images/teapot-logo.png b/doc/src/images/teapot-logo.png Binary files differdeleted file mode 100644 index a82c33c1a..000000000 --- a/doc/src/images/teapot-logo.png +++ /dev/null diff --git a/doc/src/images/teapot-qml-screenshot.png b/doc/src/images/teapot-qml-screenshot.png Binary files differdeleted file mode 100644 index cb9dea919..000000000 --- a/doc/src/images/teapot-qml-screenshot.png +++ /dev/null diff --git a/doc/src/images/teapot-qt-screenshot.png b/doc/src/images/teapot-qt-screenshot.png Binary files differdeleted file mode 100644 index 2a5c2ead9..000000000 --- a/doc/src/images/teapot-qt-screenshot.png +++ /dev/null diff --git a/doc/src/images/teapot-rotated.png b/doc/src/images/teapot-rotated.png Binary files differdeleted file mode 100644 index f66a93efd..000000000 --- a/doc/src/images/teapot-rotated.png +++ /dev/null diff --git a/doc/src/images/teapot-screenshot.png b/doc/src/images/teapot-screenshot.png Binary files differdeleted file mode 100644 index 07922e9e9..000000000 --- a/doc/src/images/teapot-screenshot.png +++ /dev/null diff --git a/doc/src/images/teaservice-qml-screenshot.png b/doc/src/images/teaservice-qml-screenshot.png Binary files differdeleted file mode 100644 index ee2b935a1..000000000 --- a/doc/src/images/teaservice-qml-screenshot.png +++ /dev/null diff --git a/doc/src/images/teaservice-screenshot.png b/doc/src/images/teaservice-screenshot.png Binary files differdeleted file mode 100644 index 35e6fc8ee..000000000 --- a/doc/src/images/teaservice-screenshot.png +++ /dev/null diff --git a/doc/src/images/texture-coords-gen.png b/doc/src/images/texture-coords-gen.png Binary files differdeleted file mode 100644 index 5f155b1a2..000000000 --- a/doc/src/images/texture-coords-gen.png +++ /dev/null diff --git a/doc/src/images/texture-coords-gen.xcf b/doc/src/images/texture-coords-gen.xcf Binary files differdeleted file mode 100644 index b6540bb41..000000000 --- a/doc/src/images/texture-coords-gen.xcf +++ /dev/null diff --git a/doc/src/images/texture-seam.png b/doc/src/images/texture-seam.png Binary files differdeleted file mode 100644 index 2cd97233b..000000000 --- a/doc/src/images/texture-seam.png +++ /dev/null diff --git a/doc/src/images/triangle3d-center.png b/doc/src/images/triangle3d-center.png Binary files differdeleted file mode 100644 index da6fabb03..000000000 --- a/doc/src/images/triangle3d-center.png +++ /dev/null diff --git a/doc/src/images/triangle3d-dimensions.png b/doc/src/images/triangle3d-dimensions.png Binary files differdeleted file mode 100644 index 5efe28ec2..000000000 --- a/doc/src/images/triangle3d-dimensions.png +++ /dev/null diff --git a/doc/src/images/triangle3d.xcf b/doc/src/images/triangle3d.xcf Binary files differdeleted file mode 100644 index 798fafd29..000000000 --- a/doc/src/images/triangle3d.xcf +++ /dev/null diff --git a/doc/src/images/triangulated-face.png b/doc/src/images/triangulated-face.png Binary files differdeleted file mode 100644 index fab481265..000000000 --- a/doc/src/images/triangulated-face.png +++ /dev/null diff --git a/doc/src/images/triangulated-face.xcf b/doc/src/images/triangulated-face.xcf Binary files differdeleted file mode 100644 index 74b08edf1..000000000 --- a/doc/src/images/triangulated-face.xcf +++ /dev/null diff --git a/doc/src/images/tutorials/converting-screenshot.png b/doc/src/images/tutorials/converting-screenshot.png Binary files differdeleted file mode 100644 index 9fb738ff4..000000000 --- a/doc/src/images/tutorials/converting-screenshot.png +++ /dev/null diff --git a/doc/src/images/tutorials/cube1-screenshot.png b/doc/src/images/tutorials/cube1-screenshot.png Binary files differdeleted file mode 100644 index a0da12f07..000000000 --- a/doc/src/images/tutorials/cube1-screenshot.png +++ /dev/null diff --git a/doc/src/images/tutorials/cube2-screenshot.png b/doc/src/images/tutorials/cube2-screenshot.png Binary files differdeleted file mode 100644 index 20e05d1b3..000000000 --- a/doc/src/images/tutorials/cube2-screenshot.png +++ /dev/null diff --git a/doc/src/images/tutorials/cube3-screenshot.png b/doc/src/images/tutorials/cube3-screenshot.png Binary files differdeleted file mode 100644 index 49cf8cbcd..000000000 --- a/doc/src/images/tutorials/cube3-screenshot.png +++ /dev/null diff --git a/doc/src/images/tutorials/cube4-screenshot.png b/doc/src/images/tutorials/cube4-screenshot.png Binary files differdeleted file mode 100644 index 4f71452db..000000000 --- a/doc/src/images/tutorials/cube4-screenshot.png +++ /dev/null diff --git a/doc/src/images/tutorials/shader-tutorial-varying.png b/doc/src/images/tutorials/shader-tutorial-varying.png Binary files differdeleted file mode 100644 index 6e0c78e91..000000000 --- a/doc/src/images/tutorials/shader-tutorial-varying.png +++ /dev/null diff --git a/doc/src/images/tutorials/shader-tutorial.png b/doc/src/images/tutorials/shader-tutorial.png Binary files differdeleted file mode 100644 index 97db13d32..000000000 --- a/doc/src/images/tutorials/shader-tutorial.png +++ /dev/null diff --git a/doc/src/images/vector-mag.odf b/doc/src/images/vector-mag.odf Binary files differdeleted file mode 100644 index 96222af07..000000000 --- a/doc/src/images/vector-mag.odf +++ /dev/null diff --git a/doc/src/images/vector-mag.png b/doc/src/images/vector-mag.png Binary files differdeleted file mode 100644 index 0d913ee69..000000000 --- a/doc/src/images/vector-mag.png +++ /dev/null diff --git a/doc/src/images/vector-normalized.png b/doc/src/images/vector-normalized.png Binary files differdeleted file mode 100644 index c1c4b968d..000000000 --- a/doc/src/images/vector-normalized.png +++ /dev/null diff --git a/doc/src/images/vector-point.odf b/doc/src/images/vector-point.odf Binary files differdeleted file mode 100644 index 6b73097c3..000000000 --- a/doc/src/images/vector-point.odf +++ /dev/null diff --git a/doc/src/images/vector-point.png b/doc/src/images/vector-point.png Binary files differdeleted file mode 100644 index c78410fd0..000000000 --- a/doc/src/images/vector-point.png +++ /dev/null diff --git a/doc/src/qt3d-all-classes.qdoc b/doc/src/qt3d-all-classes.qdoc deleted file mode 100644 index 867c56882..000000000 --- a/doc/src/qt3d-all-classes.qdoc +++ /dev/null @@ -1,49 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qt3d-all-classes.html - \title Qt3D Classes - \keyword Qt3D Classes - - \generatelist classes -*/ - -/*! - \group qt3d - \title Qt3D Classes - - \generatelist{related} -*/ - -/*! - \page qt3d-all-namespaces.html - \title Qt3D Namespaces - \keyword All Namespaces - - \l{QGL}{QGL Namespace} -*/ diff --git a/doc/src/qt3d-all-modules.qdoc b/doc/src/qt3d-all-modules.qdoc deleted file mode 100644 index 015de171c..000000000 --- a/doc/src/qt3d-all-modules.qdoc +++ /dev/null @@ -1,50 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qt3d-modules.html - \title Qt3D Modules - \keyword Qt3D Modules - - \table - \header - \li Functionality Areas - \row - \li - \list - \li \l {Qt3D Arrays and Vertex Buffers}{Arrays and Vertex Buffers} - \li \l {Qt3D Geometry}{Geometry Building} - \li \l {Qt3D Graphics View Integration}{Graphics View Integration} - \li \l {Qt3D Materials}{Materials} - \li \l {3D Math Basis}{Mathematical Primitives} - \li \l {Qt3D Painting}{Painting in 3D} - \li \l {Qt3D Scene Management}{Scene Management} - \li \l {Qt3D Texture Handling}{Texture Management} - \li \l {Qt3D Viewing}{Viewing Widgets} - \endlist - \endtable -*/ diff --git a/doc/src/qt3d-arrays.qdoc b/doc/src/qt3d-arrays.qdoc deleted file mode 100644 index 54fadedee..000000000 --- a/doc/src/qt3d-arrays.qdoc +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \group qt3d::arrays - \title Qt3D Arrays and Vertex Buffers - \keyword Vertex Buffer - - \generatelist{related} -*/ diff --git a/doc/src/qt3d-building.qdoc b/doc/src/qt3d-building.qdoc deleted file mode 100644 index bb35663ca..000000000 --- a/doc/src/qt3d-building.qdoc +++ /dev/null @@ -1,242 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qt3d-building.html - \title Building Qt3D - \keyword Building Qt3D - - \section1 Qt3D Binary Packages - - Do you have to build Qt3D? Check if binary packages are available - for your platform on the \l{http://qt.nokia.com/downloads}{Qt downloads page}. - - This page gives guidelines on how to build Qt3D either from a source package - or from a repository snapshot. - - \section1 Obtaining Qt3D sources - - If you want to work with the latest bleeding edge Qt3D features, or if - you would like to modify or contribute to Qt3D you can build it from - our source repository. - - The source for Qt3D is hosted on Gitorious as the git repository - \l{http://qt.gitorious.org/qt/qt3d}{\c{qt/qt3d.git}}. - It can be cloned as follows: - - \code - $ mkdir -p $HOME/depot/qt - $ cd $HOME/depot/qt - $ git clone git://gitorious.org/qt/qt3d.git - \endcode - - More stable versions of the Qt3D source code is available as source - packages from \l{ftp://ftp.qt.nokia.com/qt3d/noarch}{Qt3D downloads page}. - Just unzip or untar it into your \c{depot} directory. - - \section1 Building Qt3D - - The latest version of Qt3D requires Qt 5.0. The QtSDK currently ships with Qt 4.8 so - you will need to \l{http://developer.qt.nokia.com/wiki/Building_Qt_5_from_Git}{build from Git}. - - Just make sure that when you build Qt, that you use the - -developer-build option, and do not do a \c{make install} as root. - The reason for this is when Qt3D builds in it will place the libraries, - headers and plugins into the correct position in the hosted Qt library, - so that will need to be writable. - - If you're working with Qt4.8.x, and want to use Qt3D, you will need to check-out the - qt4 branch for Qt3D. After the git clone command earlier, checkout the qt4 code branch - by running: - - \code - $ git checkout --track -b qt4 origin/qt4 - \endcode - - Instructions for building against Qt4 are fundamentally the same as for Qt5 (except that - wherever we select Qt5 in these instructions, you should use Qt4.8), however - you should make and review the docs provided in the qt4 branch for accuracy. - - \section1 Building Qt3D Using QtCreator / QtSDK - - Here is a step-by-step guide to building Qt3D using the - \l{http://qt.nokia.com/products/appdev/developer-tools/developer-tools}{QtCreator IDE}. - QtCreator is the development environment for the QtSDK. As you can see in the screenshot - below, we're using the beta version 2.5 on Linux, but other operating systems and - versions should look similar. Always use the latest release of QtCreator if possible. - - \image build-qt3d-qtcreator-1.png - - \b{Step 1} - Open the Qt3D project. - - Choose \c{Open} from the \c{File} menu and navigate to the qt3d.pro project - file \c {$HOME/depot/qt/qt3d/qt3d.pro}. Click \c{Open}. - - \image build-qt3d-qtcreator-2.png - - \b{Step 2} - Select the Qt and load Qt3D. - - \image build-qt3d-qtcreator-3.png - - Set the Qt5 build that you created above. In the screenshot below there is a - situation where we have a number of Qt versions to choose from, so it is - easiest to uncheck all of the ones we don't need, then check the one we want - which - is the Qt5 version created above. You may need to add it using the "Manage" button first. - - After a short time QtCreator will have loaded up the Qt3D project, read all its - project files and display the source tree as shown below. - - \image build-qt3d-qtcreator-4.png - - \b{Step 3} - Set up for Building. - - Click the projects tab at the left to display the Qt3D target's \c{Build Settings} - pane, marked in the screenshot below. - - \image build-qt3d-qtcreator-5.png - - Here you can specify a Shadow Build directory. It is always a good idea to - build in a shadow directory, instead of inside the source tree. - - In the screenshot below we use file management windows invoked by the the browse button to create - the shadow build directory as a "new folder", which we'll call "qt3d" to match the project name. - - \image build-qt3d-qtcreator-6.png - - Here's another handy trick - set QtCreator to use multiple cores when it builds, if its supported - on your platform. On Mac and other platforms that use GCC I can set the \c{-j 4} argument to \c{make}. - - Do this by expanding the details of the make step in the projects page, then enter the extra arguments, - as shown below. - - \image build-qt3d-qtcreator-7.png - - For Windows check for the \c{jom} tool which you will already be using automatically, to see how many - parallel jobs your build will use. - - \b{Special note for Windows} - make sure that the type of build matches the - Qt that you are building against. In the case of binary packages, and the Qt - that ships with the SDK these are binary release builds - so in those cases set - your Qt3D to a release build also. One way to tell that this has gone wrong is - that your Qt3D library will be called \c{Qt3Dd.dll} (note the lower case "d" - for debug) when your QtGui library is called \c{QtGui4.dll} (no lower case "d"). - - \image build-qt3d-qtcreator-set-to-release.png - - \b{Step 4} - Build Qt3D and run a test App. - - By default the Qt build system used by QtCreator will build Qt3D in debug mode. - - Now hit the build button (marked with a red arrow in the screenshot below) - - \image build-qt3d-qtcreator-8.png - - Qt3D will go ahead and compile all its libraries, plugins and QML imports. - - The build is set up so that these will be placed into the directories as specified - by the host qmake - inside the Qt build tree. To find what these directories are run - \c{qmake -query}. If you like after the build you can check those directories to be sure - that Qt3D's files got placed there correctly. - - As explained above for this reason you will need to have the privileges on your - computer to write to the directories given by \c{qmake -query}. On Windows this is - generally not a problem. On Mac and Linux it should work fine when building with the - SDK which is by default installed in your home directory. It will also be fine - with builds from a source package. - - Qt3D will also place its \c{qt3d.prf} and \c{qt3dquick.prf} files into the - host Qt's QMAKE_MKSPECS/features directory. Again see \c{qmake -query} for what - that directory is on your system. This means that you can write Qt3D applications - in C++ that use the libraries by simply adding \c{CONFIG += qt3d} to your - .pro file. - - If you get early errors about not being able to copy the .prf files then check - that you have set up QtCreator to use a Qt that you can write to. - - The build will then continue on and compile all of Qt3D's examples and demos, - using the libraries as installed. When finished a message like "The process /usr/bin/make - exited normally" should be displayed. - - There is no need to run a make install step. - - Now you can use QtCreator to run one of the examples. You can do this by right clicking on - the example you want to run in the build tree (in this case, the "basket" app), then clicking - the green arrow bottom to actually launch the app. - - \image build-qt3d-qtcreator-9.png - - Congratulations on building Qt3D! - - \section1 Building from the Command Line - - On Linux assuming that you have built Qt 5 in - \c{$HOME/build/qt5}, you would configure and build Qt3D as follows: - - \code - $ cd $HOME/build/qt5 - $ make module-qt3d - $ make -j 4 - $ bin/basket - \endcode - - Note that the \c{$} above means the shell prompt (don't type the \{$}). - - The last line runs the example QML application \c{moon} to check that - the build went OK. - - On Windows (with Visual Studio) those commands look like this: - - \code - cd \build\qt5 - nmake module-qt3d - bin\basket - \endcode - - These commands for Windows assume that your Qt build for Qt5 is in - the current PATH - so that the qmake invoked above is actually going to - be the Qt5 qmake. - - Once you have built Qt3D, you can run the "teapot" example: - - \code - $ cd $HOME/build/qt5/qt3d - $ bin/teapot - \endcode - - If all goes well, you should see something like the following - on the screen: - - \image teapot-screenshot.png - - Qt3D has been tested with Qt/X11 and Qt/Embedded under Linux, on MacOSX - and Windows XP. It also runs on Symbian^3 and MeeGo/Maemo. - - Patches for other platforms are welcome. - - \l{index.html}{Return to the main Qt3D page} or - \l{qt3d-examples.html}{Continue to the Tutorials and Examples}. -*/ diff --git a/doc/src/qt3d-contrib.qdoc b/doc/src/qt3d-contrib.qdoc deleted file mode 100644 index 951d39d0a..000000000 --- a/doc/src/qt3d-contrib.qdoc +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qt3d-contrib.html - \title Contributing to Qt3D - \keyword Contributing to Qt3D - - Qt3D is developed primarily in the Brisbane office of Qt Development Frameworks, but anyone is welcome to join the effort withpatches, new examples, and major feature development. - - Jump on the IRC channel at #qt-3d on irc.freenode.net, or join our qt3d - mailing list at \l{http://lists.qt.nokia.com/mailman/listinfo/qt-3d}. - - All contributions need to conform with the - \l{http://qt.gitorious.org/qt/pages/QtContributionGuidelines}{Qt Contribution Model Guidelines}. - - The source for the main repository of Qt3D is hosted on Gitorious at - \l{http://qt.gitorious.org/qt/qt3d}. - - Bugs can be reported against the "Qt3D" component of the "Qt" project - at \l{http://bugreports.qt-project.org/}. - - \l{index.html}{Return to the main Qt3D page}. -*/ diff --git a/doc/src/qt3d-examples.qdoc b/doc/src/qt3d-examples.qdoc deleted file mode 100644 index fee0f3bba..000000000 --- a/doc/src/qt3d-examples.qdoc +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qt3d-examples.html - \title Qt3D Tutorials and Examples - \keyword Qt3D Tutorials and Examples - - Building 3D applications in QML with Qt3D: - - \list - \li \l{Teapot Example in QML}{Hello Teapot} in Qt3D - \li \l{Basket Example#Basket in QML}{Basket} in Qt3D - \li \l{Object Effects}{Cube} in Qt3D - \li \l{Monkey God in QML}{Monkey God} in Qt3D - \li \l{Tea Service Demo in QML}{Tea Service} in Qt3D - \li \l{Using GLSL shaders in QML} - \endlist - - Using C++ to extend QML Qt3D and to build applications with Qt3D: - - \list - \li \l{Teapot Example}{Hello Teapot} - drawing a basic object in 3D. - \li \l{Object Effects#Cube in QML}{Cube in C++} - applying transformations and materials to objects. - \li \l{qt3d/nesting}{Nesting} - drawing into framebuffer objects. - \li \l{Loading a 3DS model with Qt3D}{Penguin} - loading a 3DS model with Qt3D. - \li \l{qt3d/pageflip}{Page Flip} - using shaders to combine textures. - \li \l{qt3d/shapes}{Shapes} - paints all of the basic OpenGL shapes. - \endlist - - Other topics: - - \list - \li \l{Scene Format Plugin}{Writing a scene format plug-in for Qt3D} - \endlist - - \l{index.html}{Return to the main Qt3D page}. -*/ - -/*! - \page qt3d-examples-placeholder.html - \title Qt3D Examples - \keyword Qt3D Examples - - Check the \l{http://doc.qt.nokia.com/4.7/all-examples.html}{Qt Examples for sample code specific to Qt itself.} - - For examples specific to Qt3D check our \l{qt3d-examples.html}{examples page}. -*/ diff --git a/doc/src/qt3d-geometry.qdoc b/doc/src/qt3d-geometry.qdoc deleted file mode 100644 index b1b150f58..000000000 --- a/doc/src/qt3d-geometry.qdoc +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\group qt3d::geometry -\title Qt3D Geometry -\keyword Qt3D Geometry - -\generatelist{related} -*/ diff --git a/doc/src/qt3d-graphicsview.qdoc b/doc/src/qt3d-graphicsview.qdoc deleted file mode 100644 index 756913075..000000000 --- a/doc/src/qt3d-graphicsview.qdoc +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \group qt3d::graphicsview - \title Qt3D Graphics View Integration - \keyword Qt3D Graphics View Integration - - \generatelist{related} -*/ diff --git a/doc/src/qt3d-materials.qdoc b/doc/src/qt3d-materials.qdoc deleted file mode 100644 index 73d4d6f81..000000000 --- a/doc/src/qt3d-materials.qdoc +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\group qt3d::materials -\title Qt3D Materials -\keyword Qt3D Materials - -\generatelist{related} -*/ diff --git a/doc/src/qt3d-math.qdoc b/doc/src/qt3d-math.qdoc deleted file mode 100644 index e64a2f6f9..000000000 --- a/doc/src/qt3d-math.qdoc +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\group qt3d::math -\title Qt3D Math -\keyword Qt3D Math - -\generatelist{related} -*/ diff --git a/doc/src/qt3d-painting.qdoc b/doc/src/qt3d-painting.qdoc deleted file mode 100644 index a278648f1..000000000 --- a/doc/src/qt3d-painting.qdoc +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\group qt3d::painting -\title Qt3D Painting -\keyword Qt3D Painting - -Porting between desktop OpenGL and embedded OpenGL/ES has traditionally -been difficult. The usual sequence of operations for a drawing request -in OpenGL consists of: - -\list - \li Select an appropriate shader program, or fixed-function pipeline - rendering options. - \li Set or adjust the current projection and modelview matrices. - \li Specify vertex, normal, texture co-ordinate, and other attribute arrays. - \li Specify textures, variables, and other rendering objects needed - by the shader program. - \li Draw fragments: triangles, triangle fans, quads, etc. - \li Disable the arrays, textures, and modes that were selected. -\endlist - -Desktop OpenGL, OpenGL/ES 1.1, and OpenGL/ES 2.0 all posses functionality -for the above, but they are all different. OpenGL/ES 2.0 in particular -presents unique problems because it lacks a fixed-function pipeline mode -to perform common painting operations. - -In Qt3D the QGLPainter class wraps OpenGL to present a consistent -OpenGL painting API across all platforms. Shaders and fixed-function -options are supplied as an instance of QGLAbstractEffect. Several -built-in standard effects are provided for drawing with flat colors, -material-based lighting, and simple texturing. - -\generatelist{related} -*/ diff --git a/doc/src/qt3d-qml3d.qdoc b/doc/src/qt3d-qml3d.qdoc deleted file mode 100644 index 91dd6c2f2..000000000 --- a/doc/src/qt3d-qml3d.qdoc +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\group qt3d::qml3d -\title Qt3D for Scripting 3D Apps in QML -\keyword Qt3D QML - -The following QML elements are provided by the \c{Qt3D} namespace -for importing 3D elements into QML applications: - -\generatelist{related} - -See the \l{Teapot Example in QML Qt3D}{Teapot} example for an introduction -to using these elements. - -Qt3D also provides some \l{Stock Shapes for QML}{stock shapes} -in the \c{Qt3D.Shapes} namespace as convenience elements. -*/ - -/*! -\group qt3d::qml3d::shapes -\title Stock Shapes for QML - -The following QML elements are provided by the \c{Qt3D.Shapes} namespace -as convenience elements: - -\generatelist{related} - -See the \l{Object Effects}{Cube} example for an introduction to using these convenience shapes in QML. -*/ diff --git a/doc/src/qt3d-scene.qdoc b/doc/src/qt3d-scene.qdoc deleted file mode 100644 index e9057e30c..000000000 --- a/doc/src/qt3d-scene.qdoc +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\group qt3d::scene -\title Qt3D Scene Management -\keyword Qt3D Scene Management - -\generatelist{related} -*/ diff --git a/doc/src/qt3d-textures.qdoc b/doc/src/qt3d-textures.qdoc deleted file mode 100644 index e77a3a407..000000000 --- a/doc/src/qt3d-textures.qdoc +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \group qt3d::textures - \title Qt3D Texture Handling - \keyword Qt3D Texture Handling - - \generatelist{related} -*/ diff --git a/doc/src/qt3d-troubleshooting.qdoc b/doc/src/qt3d-troubleshooting.qdoc deleted file mode 100644 index 2f6aa4f19..000000000 --- a/doc/src/qt3d-troubleshooting.qdoc +++ /dev/null @@ -1,295 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qt3d-troubleshooting.html - \title Qt3D Troubleshooting Guide - \keyword Building QML Qt3D - - Qt3D has been developed with the intention of supporting a variety - of platforms and systems, and in doing so leverages the plugin and - import architecture used by Qt. - - This architecture occasionally causes confusion for newcomers to - the Qt plugin architecture, however, which can cause runtime problems to - occasionally arise. - - \section1 Common Qt3D Problems - - \section2 PROBLEM 1: I Can't See Warnings from my QML/3D Application - - Many problems with QML (both 2D and 3D) can only be diagnosed through - warning and status messages. - - In the QMLViewer application these can be viewed by selecting the "Show - Warnings" item in the "Debugging" menu. - - For QML applications which do not use the QMLViewer, however, no such - option exists. - - For Linux & Mac: - \list - \li Run the application within QtCreator - the warning messages will be - visible in the Application Output pane. - \li Run the application from the command line - the warning messages - will now be displayed directly in the terminal window. - \endlist - - For Windows - \list - \li Run the application within QtCreator - the warning messages will be - visible in the Application Output pane. - \li Run the application from within Visual Studio - the warning messages - will be visible in the Output window. - \li Use an application such as Windows Sysinternals' "DebugView.exe" to - capture warning and error messages from your QML application. - \endlist - - \section2 PROBLEM 2: Qt3D Plugin File Not Found - - By far the most prevalant problems encountered by Qt3D newcomers are - those relating to inability for an application to find the correct plugins - at runtime. - - This problem is characterised by a blank screen being displayed, and the - following warning message: - - \code - file:///C:/path/to/qml/app/my_app.qml:42:1: module "Qt3D" plugin "qthreedqmlplugin" not found - import Qt3D 1.0 - - ^ - \endcode - - To resolve this problem try each of the Resolution Actions listed, one at - a time, retrying your application after each step. - - \section2 PROBLEM 3: Qt3D Not Installed - - This is related to the Problem 2, though is characterised by error messages - containing the following: - - \code - module "Qt3D" is not installed - \endcode - - To resolve this problem try each of the Resolution Actions listed, one at - a time, retrying your application after each step. - - \section2 PROBLEM 4: The Specified Module Could Not Be Found - - This is related to Problem 2, though in this case it is characterised by error - messages similar to the following: - - \code - file:///path/to/quick3d/app.qml:10:1: plugin cannot be loaded for module "Qt3D": Cannot load library C:/path/to/Qt/imports/qthreedqmlplugin.dll: The specified module could not be found. - \endcode - - To resolve this problem try each of the Resolution Actions listed, one at - a time, retrying your application after each step. - - \section2 PROBLEM 5: 3D Models Fail to Load - - Usually this problem will be accompanied by a message similar to this one: - - \code - Could not create handler for format - check plugins are installed correctly in /path/to/Qt/plugins - Could not load file:///path/to/model/my_model.obj (possibly plugin could not be found) - \endcode - - In this case the problem is that the plugins for various scene formats are - missing. - - Follow the instructions in Resolution Action 4 onward. - - \section2 PROBLEM 6: Build Keys Do Not Match - - Sometimes users may encounter an error similar to the one shown below: - - \code - plugin: my_plugin.dll: failed to load: The plugin 'C:/path/to/qt/plugins/my_plugin.dll' uses incompatible Qt library. Expected build key "Windows mingw debug full-config", got "Windows mingw release full-config" - \endcode - - This error is caused by a mismatch between the Qt library against which the plugin - was compiled, and the Qt library being used at runtime. - - To resolve this problem follow Resolution Action 5 onward, below. - - \section2 PROBLEM 7: Case mis-match on loading QML plugins - - You get a blank screen when the Qt3D application runs. The debug output - (see Problem 1 above) reveals a message similar to - \code - Starting C:\Qt\4.7.3\bin\qmlviewer.exe -I C:/Qt/4.7.3/imports C:/Qt/4.7.3/qt3d/bin/resources/examples/basket_qml/qml/basket.qml - C:/Qt/4.7.3/qt3d/bin/resources/examples/basket_qml/qml/basket.qml: File name case mismatch - \endcode - - This issue can occur when a custom install directory for Qt is used, which does not - match the expected directory used by the Qt3D binary installer, but still installs - without apparent error due to Windows tolerance for case error. - - For example you install Qt applications into \b{C:\\qt} such as Qt Creator - but then when you install Qt 4.7.3 you accept the default install location - of "C:\\Qt" - this succeeds, even though the case preserved name of the - directory is "C:\\qt". When Qt Declarative's case checking code parses the - import statement it refuses to load the qml file. - - This error is very difficult to diagnose and the best way to fix it is to - uninstall everything from the directory in question, using the package uninstallers - in the start menu, then remove the directory itself, the finally reinstall everything. - - \section1 Resolution Actions - - \section2 ACTION 1: Ensure that Qt3D is Building Correctly - - As obvious as this sounds, it is sometimes the case that a problem is - caused simply by one of the runtime libraries or plugins for Qt3D - failing to build, even while the user's application itself builds without - error. - - Ensure that all of the components of Qt3D have built without error - before attempting further resolution actions. - - \section2 ACTION 2: Ensure Import Files Are Correctly Located - - Ensure that the Qt3D import libraries are in the directory specified by - the QtQuick import path. - - The core Qt3D import directory is: \c{imports\Qt3D} in the directory - where Qt is installed. - - This directory should contain the files as shown in the following diagram: - - \image imports-dir.png - - Here for the sake of illustration it is assumed Qt 4.7.3 is intalled under - \c{C:\Qt\4.7.3}. - - If these files are not in the correct locations copy them manually into the - specified locations and retry your Qt3D application before moving on to - other fixes. The dll's should have been built as part of your build process - and the other files are shipped in the source tree, and can be simply copied - over if somehow the build process has failed to do this. - - \section2 ACTION 3: Ensure Qt3D Libraries Are Correctly Located - - Ensure that the Qt3D libraries can be found by the application. The - files that should be found are: - - \list - \li Qt3D.dll - \li Qt3DQuick.dll - \endlist - - There are three ways to make these files available to your application: - - \list - \li 1. Copy these files into the same directory as your application executable. - \li 2. Add the current location of these files to your PATH environment variable. - \li 3. Copy these files into the Qt binaries directory. - \endlist - - The Qt binaries directory is: - \code - \path\to\qt\bin - \endcode - - Having executed one of these fixes, retry your application before trying any - other troubleshooting tips. - - \section2 ACTION 4: Ensure Additional Plugin Libraries Are Correctly Located - - Ensure that the Qt3D plugin libraries are in the directory specified by - the QtQuick plugins path. - - The Qt3D scene format plugins (which are responsible for loading model files) - should be found in: - - \code - \path\to\qt\plugins\sceneformats - \endcode - - This should contain the following files: - - \list - \li qsceneai4.dll - \li qscenebezier4.dll - \endlist - - Additional Qt3D image format plugins (which are responsible for loading some - image files) should be found in: - - \code - \path\to\qt\plugins\imageformats - \endcode - - This should contain the following files: - - \list - \li qtga4.dll - \endlist - - If these files are not in the correct locations copy them manually into the - specified locations and retry your Qt3D application before moving on to - other fixes. - - \section2 ACTION 5: Check Your Build Configuration - - It is possible that Qt3D libraries which have been built against a given - set of Qt libraries have problems when used with another build of Qt. - - This may be resolved by trying each of the following: - - \list - \li Ensure that the Qt and Qt3D libraries use the same toolchain/compiler. - \li Ensure that the Qt Configuration used to build Qt3D matches that used in - your runtime Qt libraries. - \li Ensure that the Qt used to build Qt3D and the Qt runtimes are both either - Debug or Release, not a mixture of both. - \endlist - - After making this change, retry your Qt3D application before implementing - other troubleshooting tips. - - \section2 ACTION 6: Clear the Plugin Cache - - Qt stores certain information about plugins in the plugin cache. The plugin - cache is stored through QSettings, and so is platform independent. - - It is possible that obselete plugin data for an older version of your Qt3D - plugins could be causing your Qt3D applications to fail. - - On Windows the entries in the plugin cache are stored in the registry, and - typically begin with one of the following strings: - - \code - HKEY_CURRENT_USER\Software\Trolltech\OrganizationDefaults\Qt Plugin Cache 4.2.debug - HKEY_CURRENT_USER\Software\Trolltech\OrganizationDefaults\Qt Plugin Cache 4.2.false - \endcode - - Delete these entries and retry your Qt3D application. -*/ diff --git a/doc/src/qt3d-viewing.qdoc b/doc/src/qt3d-viewing.qdoc deleted file mode 100644 index 7271dd8f4..000000000 --- a/doc/src/qt3d-viewing.qdoc +++ /dev/null @@ -1,34 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! -\group qt3d::viewing -\title Qt3D Viewing -\keyword Qt3D Viewing - -\generatelist{related} -*/ diff --git a/doc/src/qt3d.qdoc b/doc/src/qt3d.qdoc deleted file mode 100644 index 42fc1bb01..000000000 --- a/doc/src/qt3d.qdoc +++ /dev/null @@ -1,197 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/ -** -** This file is part of the Qt3D documentation of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:FDL$ -** GNU Free Documentation License -** Alternatively, this file may be used under the terms of the GNU Free -** Documentation License version 1.3 as published by the Free Software -** Foundation and appearing in the file included in the packaging of -** this file. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms -** and conditions contained in a signed written agreement between you -** and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -/*! - \page qt3d-reference.html - \title Qt3D Module - \ingroup technology-apis - \ingroup overviews - \ingroup qt-gui-concepts - - \brief The Qt 3D module provides a set of APIs to make 3D graphics programming easy and declarative. - - - \section1 Overview - - \section1 What is Qt 3D? - The Qt 3D module provides a set of APIs to make 3D graphics programming easy and declarative. Seamless integration - with the Qt Quick module allows for developers to add 3D contents to any Qt application in the same way icons and - pixmaps are used in a regular Qt application. At the same time, Qt 3D is powerful enough for creating full scale - 3D applications or games. To guarantee the graphics performance on various platforms, Qt 3D is hardware accelerated - using GPU. For more direct and low-level access to 3D graphics hardware, please see OpenGL ES APIs. - - - \section1 Common Use Cases - \list - \li Adding 3D models to 2D applications - Qt 3D's ViewPort item that defines the logical viewport for a 3D scene can be - placed in any 2D application. For example, it is possible to place a 3D avatar on a 2D contacts application. - \li 3D User Interface Elements - Qt 3D handles external inputs such as touch or key events so that it is possible to - interact with any Qt 3D items on the screen. - \li 3D Visualizations in media player - Qt 3D's QML API supports regular QML features such as property bindings and QML - animation framework. Therefore, developers can create a 3D visualization application with less code. - \li Casual games - Combining Qt 3D features with other Qt modules such as Qt Sensors allows developers to create interactive - 3D games easily. - \endlist - - - \section1 C++ and QML APIs - Qt 3D consists of two libraries which support the same features in C++ interface and QML respectively. Both libraries - share the same primary goal which is to make the 3D graphics programming easy. Qt 3D's C++ API is originally developed - to make the OpenGL programming as cross-platform as possible. Traditionally porting between desktop and embedded OpenGL - variants has been difficult due to differing function names, as well as a shader-based versus fixed function rendering - pipeline. The C++ API for Qt3D eases this difficulty by abstracting these differences away beneath a Qt like API layer. The QML bindings for Qt 3D takes this further and make the 3D programming declarative. - - To use the C++ library in your application, add the following configuration option to your .pro file. - - \code - QT += 3d - \endcode - - To use Qt 3D in your QML application you need the following import statement in your qml file. - - \code - import Qt3D 1.0 - \endcode - - Asset loading, built-in shapes, shaders and texture management are the main features and they are explained below in - details. Developers may choose a suitable interface depending on requirements or preference. - - - \section1 Asset Loading - Using Qt 3D it is easy to load 3D content from a standard interchange file format into your application. Currently - supported formats are: - - \table - \header - \li \b {Developed by} - \li \b {File Extension} - \li \b {Description} - \row - \li Waterfront Technologies - \li .obj - \li Originally developed for Advanced Visualizer by Waterfront Technologies. The OBJ file format that represents 3D geometry is open and widely adopted. - \row - \li Autodesk - \li .3ds - \li Format used in 3D Studio MAX. This format is popular among video game developers. - \row - \li COLLADA - \li .dae - \li COLLADA(COLLAborative Design Activity) is managed by Khronos Group. - \row - \li id Software - \li .MD2 - \li Format used by Quake II and many other games. - \row - \li Inivis - \li .ac - \li Popular format for games and simulations. - \row - \li N/A - \li .bez - \li Bezier Surface File specifices collection of bezier patches. - \endtable - - A QML Example that loads a teapot shaped 3D model: - - \code - import QtQuick 2.0 - import Qt3D 1.0 - - Viewport { - width: 640; height: 480 - Item3D { - id: teapot - mesh: Mesh { source: "teapot.bez" } - effect: Effect {} - } - } - \endcode - - - \section1 Built-in Shapes - Qt 3D comes with a number of built-in primitive shapes. To use these shapes in your application you need the following import statement in your QML application. - - \code - import Qt3D.Shapes 1.0 - \endcode - - \image sampleshapes.png - - - \section1 Shader and Textures - Both external 3D models and built-in shapes can be decorated using ShaderProgram and Effect element. The ShaderProgram item is derivative class of the more general Effect class in QML Qt 3D. Whereas the Effect class provides support for standard effects under OpenGL, the ShaderProgram supports effects based on custom shader programs for the GPU. - - - \section1 3D Asset Viewer - Qt 3D comes with a 3D Asset Viewer application which helps the developer to visually scale, rotate, and position a 3D model before adding it to a viewport. The application can then auto create a QML file that can later be used as a component in a QML application. 3D Asset Viewer is launched from Qt Creator as an external application by clicking Tools and External options from the menu tab. - - - \section1 Getting Started - \list - \li \l {qt3d-building.html}{Building} - \li \l {qt3d-examples.html}{Tutorials and Examples} - \li \l {Writing a scene format plug-in for Qt3D}{Scene format plug-ins} - \li \l {QGL}{QGL Namespace} - \li \l {qt3d-acceptance.html}{Acceptance tests} - \li \l {qt3d-troubleshooting.html}{Troubleshooting Qt3D} - \endlist - - \section1 Qt3D Core Concepts - \list - \li \l {Qt3D Arrays and Vertex Buffers}{Arrays and Vertex Buffers} - \li \l {Qt3D Geometry}{Geometry Building} - \li \l {Qt3D Graphics View Integration}{Graphics View Integration} - \li \l {Qt3D Materials}{Materials} - \li \l {Qt3D Math}{Mathematical Primitives} - \li \l {Qt3D Painting}{Painting in 3D} - \li \l {Qt3D Scene Management}{Scene Management} - \li \l {Qt3D Texture Handling}{Texture Management} - \li \l {Qt3D Viewing}{Viewing Widgets} - \endlist - - \section1 API Reference documentation - \list - \li \l {Qt3D Classes}{C++ APIs} - \li \l {Qt3D for Scripting 3D Apps in QML}{QML APIs} - \endlist - - \section1 Extending Qt 3D - Adding new 3D file format - Qt 3D has a plugin based system so that new format can be supported easily. - - Physics Integration - Physics integration is not officially supported yet, but you can integrate the commonly used Bullet physics engine with C++ Qt3D. - - - \section1 Future Roadmap & Contributions - Please visit \l{http://bugreports.qt-project.org}{Qt bugreports system, JIRA}, to see our future roadmap. - - For more information on contributions please visit the Qt3D \l{qt3d-contrib.html}{contributions page}. - - We would like to hear your feedback and accept any contributions in forms of code, documentation, examples and bugs reports. Please contact us on the \l{http://lists.qt.nokia.com/mailman/listinfo/qt-3d}{Qt3D mailing list}. - - See \l{Other Licenses Used in Qt 3D} for details of Qt 3D licensing, and also of 3rd party code used in Qt 3D, including acknowledgements. -*/ |
