From 34e5b2d0abf27812decb19ab4bc7b86448436318 Mon Sep 17 00:00:00 2001 From: Johanna Vanhatapio Date: Mon, 7 Sep 2020 16:49:09 +0300 Subject: Doc: Update info about materials Fixes: QDS-2753 Change-Id: I74eb64552af4ef0b222f8949291d7f6b34f0dbbb Reviewed-by: Miikka Heikkinen Reviewed-by: Mahmoud Badri Reviewed-by: Leena Miettinen --- .../qtdesignstudio-3d-custom-effects-materials.qdoc | 12 +++++++++--- .../src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc | 10 +++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc index 7d98babad7..dd10c8528f 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-custom-effects-materials.qdoc @@ -160,15 +160,21 @@ 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 - command types from \uicontrol Library to the custom material in + command types from \uicontrol Library to the pass component 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. + \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 type 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 + type 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 + \uicontrol Shaders field. \li Select the shader components in \uicontrol Navigator to set the paths to the shader files in the \uicontrol Source field in \uicontrol Properties. diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc index 8354f8943a..5f64768056 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-texture.qdoc @@ -113,11 +113,11 @@ \section1 Applying Textures to Materials Drag and drop an image from \uicontrol Library > \uicontrol Assets - on a material to create and set the texture automatically, or use - a Texture component. For a default material the created \uicontrol Texture - is assigned to the \uicontrol {Diffuse Map} property and for a principled - material to the \uicontrol {Base Color Map}. For a custom material, you - must assign the texture to a map. + on a material to create a texture component. Dragging an image + to a default or principled material opens a + \uicontrol {Select Texture Property} dialog. You can select the + property to attach the texture to in the \uicontrol {Set texture to property} + field. For a custom material, you must assign the texture to a map. To use Texture components to apply textures to materials: -- cgit v1.2.3