feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Doc: Add more links to topics covering views

Browse Source 
Also some miscellaneous fixes.

Task-number: QDS-3407
Change-Id: If47cdb0b7bc16f3fc624b96c2e0dabfde2d2f2db
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
This commit is contained in:
Johanna Vanhatapio
2021-04-23 16:34:13 +03:00
parent ca3b8f3b32
commit 2043b91ebe
15 changed files with 46 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc
View File

@@ -81,25 +81,25 @@
To create a custom effect:
\list 1
\li Drag and drop an \uicontrol {Effect} component from the
\li Drag-and-drop an \uicontrol {Effect} component from the
\uicontrol {Qt Quick 3D Custom Shader Utils} tab of
\uicontrol Library to a Model component in \uicontrol Navigator.
\uicontrol Library to a Model component in \l Navigator.
\li Select the custom effect component in \uicontrol Navigator to edit
the values of its properties in the \uicontrol Properties view.
the values of its properties in the \l Properties view.
\image studio-qtquick-3d-custom-effect.png "Custom effect properties"
\li In the \uicontrol Passes field, select the pass components for
the effect.
\li Select the pass component in \uicontrol Navigator to specify values
for its properties in \uicontrol Properties.
\image studio-qtquick-3d-pass.png "Pass properties"
\li To execute commands during the pass, drag and drop the following
\li To execute commands during the pass, drag-and-drop the following
command components from \uicontrol Library to the custom material in
\uicontrol Navigator: \uicontrol Blending, \uicontrol {Buffer Blit},
\uicontrol {Buffer Input}, \uicontrol {Cull Mode},
\uicontrol {Depth Input}, \uicontrol {Render State}, and
\uicontrol {Set Uniform Value}. Then select the commands in the
\uicontrol Commands field.
\li To allocate a buffer for the pass, drag and drop a \uicontrol Buffer
\li To allocate a buffer for the pass, drag-and-drop a \uicontrol Buffer
component to the custom material. Then select the buffer in the
\uicontrol Buffer field.
\li Select the shader component in \uicontrol Navigator to set the path
@@ -133,7 +133,7 @@
To create a custom material:
\list 1
\li Drag and drop a \uicontrol {Custom Material} component from the
\li Drag-and-drop a \uicontrol {Custom Material} component from the
\uicontrol {Qt Quick 3D Custom Shader Utils} tab of
\uicontrol Library to a Model component in \uicontrol Navigator.
\li Select the custom material component in \uicontrol Navigator to
@@ -159,7 +159,7 @@
\li Select the pass component in \uicontrol Navigator to specify values
for its properties in \uicontrol Properties.
\image studio-qtquick-3d-pass.png "Pass properties"
\li To execute commands during the pass, drag and drop the following
\li To execute commands during the pass, drag-and-drop the following
command components from \uicontrol Library to the pass component in
\uicontrol Navigator: \uicontrol Blending, \uicontrol {Buffer Blit},
\uicontrol {Buffer Input}, \uicontrol {Cull Mode},
@@ -167,10 +167,10 @@
\uicontrol {Set Uniform Value}. The command components are created
at the same level as the pass component and automatically added to
the \uicontrol Commands field.
\li To allocate a buffer for the pass, drag and drop a \uicontrol Buffer
\li To allocate a buffer for the pass, drag-and-drop a \uicontrol Buffer
component to the custom material. Then select the buffer in the
\uicontrol Buffer field.
\li To add a shader to the pass, drag and drop the \uicontrol Shader
\li To add a shader to the pass, drag-and-drop the \uicontrol Shader
component from the \uicontrol Library to the pass component in
\uicontrol Navigator. The shader components are created at the same
level as the pass component and automatically added to the

2
doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc
View File

@@ -42,7 +42,7 @@
described in \l {Adding and Removing Modules}.
Select the \uicontrol Group component in \uicontrol Navigator to modify its
properties in the \l Properties view.
properties in the \uicontrol Properties view.
\section1 Setting Node Opacity and Visibility

4
doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc
View File

@@ -133,8 +133,8 @@
\image studio-qtquick-3d-material-texture.png "Material properties"
To change the source file for the texture, select the \uicontrol Texture
component in \uicontrol Navigator, go to the \uicontrol Properties view, and
specify a new image to use in the \uicontrol Source field.
component in \uicontrol Navigator, go to the \l Properties view, and specify
a new image to use in the \uicontrol Source field.
\image studio-qtquick-3d-texture-properties.png "Texture properties"
*/

4
doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc
View File

@@ -55,8 +55,8 @@
scene created by using the wizard template mentioned above. To use other
light and camera types, select the component in \uicontrol {3D Editor} or
\uicontrol Navigator and change the type of the component in the \uicontrol
Type field in \uicontrol Properties. For example, to use a point light,
enter \e {PointLight}.
Type field in \l Properties. For example, to use a point light, enter
\e {PointLight}.
\image studio-3d-properties-type.png "Type field in Properties view"

8
doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d.qdoc
View File

@@ -35,7 +35,7 @@
\title Editing 3D Scenes
You can use \l{3D Editor} in the Design mode to edit files you
You can use \l{3D Editor} in the \uicontrol Design mode to edit files you
created using 3D graphics applications and stored in one of the supported
formats. You cannot create 3D models or other assets in the editor, but you
can \l{Importing 3D Assets}{import} the assets you need and work with them
@@ -64,9 +64,9 @@
\endif
\li \l{Adding 3D Views}
You can drag and drop 3D components from \uicontrol Library
to the scene or to \uicontrol Navigator. You must add all 3D
components into a 3D view.
You can drag-and-drop 3D components from \l Library >
\uicontrol Components to \uicontrol {3D Editor} or to \l Navigator.
You must add all 3D components into a 3D view.
\li \l {Using 3D Components}
You can speficy properties for 3D components, such as cameras,