diff options
| author | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2021-06-10 17:10:47 +0200 |
|---|---|---|
| committer | Leena Miettinen <riitta-leena.miettinen@qt.io> | 2021-06-24 07:54:20 +0000 |
| commit | a3fbc85ced348d728de3e41c72e0a033b573c49e (patch) | |
| tree | 78ca722f2863dfbd9eefb8c1dd4106cc0ae5faca /doc/qtdesignstudio/src/qtquick3d-editor | |
| parent | 116db827204cdc2565df41334907b44634afdda2 (diff) | |
| download | qt-creator-a3fbc85ced348d728de3e41c72e0a033b573c49e.tar.gz | |
Doc: Create a Prototyping chapter
Restructure existing information and fix navigation links.
Fixes: QDS-4470
Change-Id: I4a1118a4620527b461b99bf05b8b06d947018c80
Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io>
Diffstat (limited to 'doc/qtdesignstudio/src/qtquick3d-editor')
3 files changed, 19 insertions, 4 deletions
diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc index 68ab76c655..c96480bfc3 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc @@ -29,7 +29,7 @@ /*! \page exporting-3d-assets.html \if defined(qtdesignstudio) - \previouspage + \previouspage figmaqtbridge.html \else \previouspage quick-states.html \endif @@ -37,6 +37,17 @@ \title Exporting 3D Assets + \if defined(qtcreator) + \table + \row + \li \inlineimage blender-logo.png + \li \inlineimage maya-logo.png + \row + \li \l{Exporting from Blender}{Blender} + \li \l{Exporting from Maya}{Maya} + \endtable + \endif + You can import files you created using 3D graphics applications and exported to several widely-used formats, such as .blend, .dae, .fbx, .glb, .gltf, .obj, .uia, or .uip. For a list of formats supported by each \l{Qt Quick 3D} diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc index 29ef5c5406..96ecbb8b0d 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-from-qt3ds.qdoc @@ -28,7 +28,12 @@ /*! \page exporting-from-qt3ds.html \previouspage exporting-from-maya.html + \if defined(qtdesignstudio) \nextpage studio-importing-designs.html + \else + \nextpage studio-importing-3d.html + \endif + \title Exporting from Qt 3D Studio Use the following guidelines to achieve the best results when converting diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc index 06d8cf804a..624d7f5ecb 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-importing.qdoc @@ -26,12 +26,11 @@ /*! \page studio-importing-3d.html \if defined(qtdesignstudio) - \previouspage studio-importing-2d.html - \nextpage creator-exporting-qml.html + \previouspage qtquick-fonts.html \else \previouspage exporting-from-maya.html - \nextpage studio-3d-view.html \endif + \nextpage creator-exporting-qml.html \title Importing 3D Assets |