summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/qtdesignstudio/images/ai-logo.pngbin0 -> 1084 bytes
-rw-r--r--doc/qtdesignstudio/images/blender-logo.pngbin0 -> 4585 bytes
-rw-r--r--doc/qtdesignstudio/images/figma-logo.pngbin0 -> 1378 bytes
-rw-r--r--doc/qtdesignstudio/images/maya-logo.pngbin0 -> 5485 bytes
-rw-r--r--doc/qtdesignstudio/images/ps-logo.pngbin0 -> 1112 bytes
-rw-r--r--doc/qtdesignstudio/images/qt-3ds-logo.pngbin0 -> 3915 bytes
-rw-r--r--doc/qtdesignstudio/images/sketch-logo.pngbin0 -> 1789 bytes
-rw-r--r--doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc76
-rw-r--r--doc/qtdesignstudio/src/qtquick3d-editor/exporting-3d/exporting-3d-assets.qdoc13
9 files changed, 41 insertions, 48 deletions
diff --git a/doc/qtdesignstudio/images/ai-logo.png b/doc/qtdesignstudio/images/ai-logo.png
new file mode 100644
index 0000000000..d42b426071
--- /dev/null
+++ b/doc/qtdesignstudio/images/ai-logo.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/blender-logo.png b/doc/qtdesignstudio/images/blender-logo.png
new file mode 100644
index 0000000000..6aa1effa9c
--- /dev/null
+++ b/doc/qtdesignstudio/images/blender-logo.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/figma-logo.png b/doc/qtdesignstudio/images/figma-logo.png
new file mode 100644
index 0000000000..a21a9c1b91
--- /dev/null
+++ b/doc/qtdesignstudio/images/figma-logo.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/maya-logo.png b/doc/qtdesignstudio/images/maya-logo.png
new file mode 100644
index 0000000000..901246a1d9
--- /dev/null
+++ b/doc/qtdesignstudio/images/maya-logo.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/ps-logo.png b/doc/qtdesignstudio/images/ps-logo.png
new file mode 100644
index 0000000000..abd5c4979d
--- /dev/null
+++ b/doc/qtdesignstudio/images/ps-logo.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/qt-3ds-logo.png b/doc/qtdesignstudio/images/qt-3ds-logo.png
new file mode 100644
index 0000000000..b786b9920a
--- /dev/null
+++ b/doc/qtdesignstudio/images/qt-3ds-logo.png
Binary files differ
diff --git a/doc/qtdesignstudio/images/sketch-logo.png b/doc/qtdesignstudio/images/sketch-logo.png
new file mode 100644
index 0000000000..d27f103e77
--- /dev/null
+++ b/doc/qtdesignstudio/images/sketch-logo.png
Binary files differ
diff --git a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
index 8bc50df787..da7748a9a8 100644
--- a/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
+++ b/doc/qtdesignstudio/src/qtbridge/qtbridge-overview.qdoc
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of the Qt Design Studio documentation.
@@ -30,50 +30,54 @@
\title Exporting from Design Tools
- You need to use \QB to first export 2D assets from design tools and then to
- \l{Importing Designs}{import} them into \QDS.
+ When working with 2D assets, you can use \QB to export them from design
+ tools into a metadata format that you can then \l{Importing Designs}{import}
+ into \QDS.
When working with 3D assets, you can use the export functions provided by
the 3D graphics tools to save the assets in widely-used 3D graphics formats,
and then use \QB to import them into \QDS.
- You can use the Qt Installer to install \QB if you have a commercial
- \QDS license. You can also purchase a \QB license separately from the
- \l{https://marketplace.qt.io/}{Qt Marketplace} and then install \QB using
- the Qt Installer.
-
For best results when importing assets, follow
the guidelines for creating and exporting them.
- \list
-
- \li \l{Exporting Designs from Adobe Illustrator}
-
- You can either copy-paste your assets to Adobe Photoshop as
- \e {smart objects} or export them into file formats supported
- by \QDS.
-
- \li \l{Exporting Designs from Adobe Photoshop}
-
- You can use the \QBPS export tool in Adobe Photoshop to convert
- designs into \e {.metadata} format that you can import into
- projects in \QDS.
+ \section1 2D Assets
- \li \l{Exporting Designs from Sketch}
-
- You can use the \QBSK export tool in Sketch to convert designs into
- metadata that you can import into projects in \QDS.
-
- \li \l{Exporting Designs from Figma}
-
- You can use the \QBF export tool in Figma to convert designs into
- metadata that you can import into projects in \QDS.
-
- \li \l{Exporting 3D Assets}
+ You can use the Qt Installer to install \QB if you have a commercial
+ \QDS license. You can also purchase a \QB license separately from the
+ \l{https://marketplace.qt.io/}{Qt Marketplace} and then install \QB using
+ the Qt Installer.
- You can import files you created using 3D graphics applications and
- stored in several widely-used formats, such as .blend, .dae, .fbx,
- .glb, .gltf, .obj, .uia, or .uip.
+ \table
+ \row
+ \li \inlineimage ai-logo.png
+ \li \inlineimage ps-logo.png
+ \li \inlineimage sketch-logo.png
+ \li \inlineimage figma-logo.png
+ \row
+ \li \l{Exporting Designs from Adobe Illustrator}{Adobe Illustrator}
+ \li \l{Exporting Designs from Adobe Photoshop}{Adobe Photoshop}
+ \li \l{Exporting Designs from Sketch}{Sketch}
+ \li \l{Exporting Designs from Figma}{Figma}
+ \endtable
+
+ \section1 3D Assets
+
+ You can import files you created using 3D graphics applications and
+ stored in several widely-used formats, such as .blend, .dae, .fbx,
+ .glb, .gltf, .obj, .uia, or .uip.
+
+ For an overview, see \l{Exporting 3D Assets}.
+
+ \table
+ \row
+ \li \inlineimage blender-logo.png
+ \li \inlineimage maya-logo.png
+ \li \inlineimage qt-3ds-logo.png
+ \row
+ \li \l{Exporting from Blender}{Blender}
+ \li \l{Exporting from Maya}{Maya}
+ \li \l{Exporting from Qt 3D Studio}{Qt 3D Studio}
+ \endtable
- \endlist
*/
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 36fe041e22..b47c9d5209 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
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 1993-2009 NVIDIA Corporation.
-** Copyright (C) 2020 The Qt Company Ltd.
+** Copyright (C) 2021 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Design Studio.
@@ -202,15 +202,4 @@
\QDS supports importing hierarchical information. Hierarchies of arbitrary
depth are supported, including grouped nodes. Hierarchical transforms are
applied as expected.
-
- \section1 Exporting from Different Tools
-
- The following sections provide additional information about exporting
- 3D assets from a particular tool:
-
- \list
- \li \l{Exporting from Blender}{Blender}
- \li \l{Exporting from Maya}{Maya}
- \li \l{Exporting from Qt 3D Studio}{Qt 3D Studio}
- \endlist
*/