diff options
author | Miikka Heikkinen <miikka.heikkinen@theqtcompany.com> | 2015-06-09 11:03:36 +0300 |
---|---|---|
committer | Jani Heikkinen <jani.heikkinen@theqtcompany.com> | 2015-06-10 04:37:22 +0000 |
commit | debe68a85b571b70e2fe0824e5ed40484a72c216 (patch) | |
tree | 5e4a0030df24ea31cb68d993561a0f0ad5751283 | |
parent | 0f5e0a235e942e5b274fca7158ac179141014c0a (diff) |
Fix jsonmodels example docsv5.5.0-rc1v5.5.0
Snippets were missing due to obsolete paths.
Task-number: QTBUG-46568
Change-Id: I4f0bde17ea33513973a2b7195bf74756c2f98221
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
-rw-r--r-- | examples/canvas3d/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/examples/canvas3d/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc b/examples/canvas3d/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc index 39b6add..86fddcf 100644 --- a/examples/canvas3d/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc +++ b/examples/canvas3d/canvas3d/jsonmodels/doc/src/jsonmodels.qdoc @@ -58,7 +58,7 @@ First we include a JSON model parser, which handles parsing the JSON models into our internal models: - \snippet canvas3d/jsonmodels/jsonmodels.js 0 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 0 The \c{ThreeJSLoader.js} includes a reimplementation of the JSON parser in \c{three.js}, but we will not go into its implementation details. @@ -67,22 +67,22 @@ First we need to initialize all array buffers for the models: - \snippet canvas3d/jsonmodels/jsonmodels.js 1 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 1 \dots Then we request the models to be loaded: - \snippet canvas3d/jsonmodels/jsonmodels.js 2 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 2 \dots Then, when the load requests return, we handle the models: - \snippet canvas3d/jsonmodels/jsonmodels.js 3 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 3 \dots Each buffer is bound and filled with the data parsed from the json models: - \snippet canvas3d/jsonmodels/jsonmodels.js 4 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 4 \section1 Loading the Textures @@ -91,42 +91,42 @@ \c imageLoadingFailed signals. In the \c imageLoaded signal handlers we create the OpenGL textures: - \snippet canvas3d/jsonmodels/jsonmodels.js 5 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 5 \dots \section1 Input Handling First we add a MouseArea to fill the Canvas3D: - \snippet canvas3d/jsonmodels/jsonmodels.qml 0 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 0 \dots Before adding some functionality on it, we need to add properties to the canvas with initial values set: - \snippet canvas3d/jsonmodels/jsonmodels.qml 1 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 1 After that, we add rotation on mouse movement when the left mouse button is pressed: - \snippet canvas3d/jsonmodels/jsonmodels.qml 2 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 2 We need to keep the previous x and y values to avoid rotation jumping when the mouse button is released and pressed again. We store them in these properties: - \snippet canvas3d/jsonmodels/jsonmodels.qml 3 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 3 Then we add zooming by mouse wheel: - \snippet canvas3d/jsonmodels/jsonmodels.qml 4 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.qml 4 These properties are then used in the JavaScript side when calculating eye/camera movement: - \snippet canvas3d/jsonmodels/jsonmodels.js 7 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 7 Converting the rotation values into movement is done as follows: - \snippet canvas3d/jsonmodels/jsonmodels.js 8 + \snippet canvas3d/jsonmodels/qml/jsonmodels/jsonmodels.js 8 */ |