From 077a807f014d32911565134c01650f18e63048cb Mon Sep 17 00:00:00 2001 From: Leena Miettinen Date: Fri, 24 Sep 2021 16:03:50 +0200 Subject: [PATCH] Doc: Update View 3D, Node, and Group properties - Update screenshots - Add missing properties - Divide the Group topic into Node and Group topics because the Node properties are common to all components that inherit Node. Task-number: QDS-4888 Change-Id: Iaf114cd09ead755c9754423fb6b47eff0292cb3f Reviewed-by: Johanna Vanhatapio --- doc/qtcreator/src/qtcreator-toc.qdoc | 1 + .../library/qtquick-preset-components.qdoc | 1 + .../src/qtquick/qtquick-library.qdoc | 1 + .../images/studio-3d-properties-node.png | Bin 0 -> 4752 bytes .../images/studio-3d-properties-transform.png | Bin 0 -> 10520 bytes .../images/studio-3d-properties-type.png | Bin 2592 -> 6593 bytes .../images/studio-qtquick-3d-view.png | Bin 11307 -> 6349 bytes .../src/qtdesignstudio-toc.qdoc | 1 + .../qtdesignstudio-3d-group.qdoc | 51 ++++++++++++++++++ .../qtdesignstudio-3d-instancing.qdoc | 2 +- .../qtdesignstudio-3d-node.qdoc | 36 +++++++------ .../qtdesignstudio-3d-view.qdoc | 2 +- 12 files changed, 76 insertions(+), 19 deletions(-) create mode 100644 doc/qtdesignstudio/images/studio-3d-properties-node.png create mode 100644 doc/qtdesignstudio/images/studio-3d-properties-transform.png create mode 100644 doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-group.qdoc diff --git a/doc/qtcreator/src/qtcreator-toc.qdoc b/doc/qtcreator/src/qtcreator-toc.qdoc index 1daf929e54d..e38b0bdea64 100644 --- a/doc/qtcreator/src/qtcreator-toc.qdoc +++ b/doc/qtcreator/src/qtcreator-toc.qdoc @@ -131,6 +131,7 @@ \li \l{Lists and Other Data Models} \li \l{Animations} \li \l{3D Views} + \li \l{Node} \li \l{Group} \li \l{Instanced Rendering} \li \l{Skeletal Animation} diff --git a/doc/qtcreator/src/qtquick/library/qtquick-preset-components.qdoc b/doc/qtcreator/src/qtquick/library/qtquick-preset-components.qdoc index 0f110e2fee8..cc896f78c9c 100644 --- a/doc/qtcreator/src/qtquick/library/qtquick-preset-components.qdoc +++ b/doc/qtcreator/src/qtquick/library/qtquick-preset-components.qdoc @@ -69,6 +69,7 @@ \list \li \l {3D Views} + \li \l {Node} \li \l {Group} \li \l {Instanced Rendering} \li \l {Skeletal Animation} diff --git a/doc/qtcreator/src/qtquick/qtquick-library.qdoc b/doc/qtcreator/src/qtquick/qtquick-library.qdoc index 46b7dfeb8ef..3c73fcfa4ae 100644 --- a/doc/qtcreator/src/qtquick/qtquick-library.qdoc +++ b/doc/qtcreator/src/qtquick/qtquick-library.qdoc @@ -70,6 +70,7 @@ \endif \li \l Animations \li \l{3D Views} + \li \l{Node} \li \l{Group} \li \l{Instanced Rendering} \li \l{Skeletal Animation} diff --git a/doc/qtdesignstudio/images/studio-3d-properties-node.png b/doc/qtdesignstudio/images/studio-3d-properties-node.png new file mode 100644 index 0000000000000000000000000000000000000000..62db01c2f4d1417cc9c37776f11586cdc573aaea GIT binary patch literal 4752 zcmeAS@N?(olHy`uVBq!ia0y~yV60_eVCdptVqjo6`I}dmfk7zT)5S5Q;?~={KjVYb z7ajlj(|^mkx2ucOt#Z}X6$O}7-YBp*v9P90Rb8+sCpDg>nV+4B6!2w zlDTR9GnU`ocW+%keKqB9ze~7qtlj;+uaCaX;%e2Hx>4GgrQu!9jk(EZC*QwUrLda& zU(!-**Dgo7;_vHh!{TfAUkHAX`s@1snqREOAqJmz=pIYi{_CsmtK#ZhZFH|69>3B=(>9S8;vTTZRvgCF&X)D-vb(rthBlu0Zo#tMa3m-}YI% zKS!SEeRap`s&=p{V(IvXWcT67XI+^*1JD9w`VOgpS#cI+~og} zRW|ECRTS>ByvA~w`NP7P^vuhfSH5_2X}8_4=!nIS!X#2l_X@9xdVl2g+H##r=gZ;z zYogx^9FKbDI+11FW(K=ieEq+x#haLZ+rHpC(0+HW`Qq!{wqeV69W9S~^7qyG&32nS{^mIr>9!@G zO}HWFu`2k?b{ENPyYsu|J~;OAgT({kzzZ9HJc-lE-JUjQ*^=6K^G@^0+(`dvnfH-l zfwii?{qqntKJZoaa3!M7*8 zYZJCctf8$t5MunuI`2 z+>;}+{rUnSvHK@HI;$|bM}~QFg=^F6L$6MK?qoj`zR2mh%hPy4uJy5xmjAYX(|z)3 ztF_=X#+Tx^kE!ss*3>!XmBqy^60c3oX*Y`pt89-b-}3KlAmeE!Wo? zT0UR0`990+0Grdt{@WG4_ww@!x;J;_^1aLFWX}7zGjioe!@!F(oo?1-&oS*Ru)6uT zBrIgoJb~#`=Do;&9l30Z*e*ez`7Om~lbsLE$+@@k$rJCt%&zmMJk9icJ7~Y& zCr`d(czfD{>lx~C|7#u_8i$skePe%8j=}w@5pkZrdp}IRAZy?wHgWs4(&Ik@j=s2H$-n7a?j`eB@w}ZE z-G0sfx1)6Ryz6U9%8pd2XPvD&?z{EgO1_0J%a5!4n7#6!jF|Sqx{SKa!YIp2_PbWR z;+uK2+9Xcat2(vZsos-9IjSL(jhsx3XSny=v>ioG^(+yY~whe=m&hGhTRK*6qyQo9vQ_u1STR=B26z zi-SVT-&~SEbEh{g=fd3Pri}}qy7pBad9iHcHxa)VrJ3(D%^Kew*!G6+q~_}CU7E92 zzC7~q*UpDbW*Z+KTl+WQ>#F5SmOFETFW&riS8-x&#a{1Ex4s;xUAIn7F>?EHajPKN zY08TxOk=aMvf3%D_pffB{q)WA?Jc6DUmn(FPQD#@# z$3+!7ucaqytK2uA%fCHbv{~{*zL>Xat?Z%AGb<0R+jjZ)iDPeCx_&nowdQPCZg=(V zgO}F4Gf#V~98&uev^>k9FnN}- zQT)2jo$1HE`fc>F`{FR;>E>V0Go|xt;?+NI`(OR^Y4*y`bMC)1u$upBQh4jEeedJB z?l#IY->uZ$y(NG7tVI%SmZ1zU`VN*HKc}tJarQ^-uH;7#&hkDp;3-+fa6#6goZ*6O z2|L4GMi2oipg=+p-p_*NTny*k*%^M^U0}`704Wn8)c)<|-!?Ka>|);aE~nd&5o82N z&jneA685`{4&`9;AUsD1hv9DI;f}PltSuiet7@1S?=q~k{v#Bf%Q7=7$3?=g{Mz}W z-)1uXVA!2J`+~wg$>r7WHpeDCcKAEJENli}bg8O;fEc z0w20x%~hPZ)}pc9!spP1y8pVSP4CJRe_Vfl{+4j={RE%aN31_dU+gJ25x=F$P;#6> za9#SZW7&sZ%*sF8f2H^Pr-+o{mGN;}#EH^*)NcJr2E@rmcxv5WTD|6m_IyhB$%B$*9r^r{H z3*UiDyp`vZrCw*8d%8+0F*VYW?fT6bOYSbUy8cvos-(L2zIE%gY#*k(UVM9L-j~(U zI?R{!xAl5TasB+$bmz^UJudoZXP;K=nJ$0U@Rr$K!)G6M)%`pF`T762EZ?$4doIq{ z^=^&rlKf=7FT0&fIZo~hi7no%@^pdfx;+bRJ`%__U;6DQ0F*8l%8uy6InS9*6#r=@XU zR(}}t`NjkT_1WcGmOq33J4}53Y4$aCjA7q>5;YVPmudSu@FIr5@EE`JDf zDd%YntvMay-Zl4?_U|v}PFipDne?qi?arrPPq!X_`!z4%)%@386E|yTSFf(PSQ5SG ztoQEEhf1eytUr1qVc+Uk-f20XL!z6eD#oQ7Ce5C|Qg2zEtR}BP^v-34J^Ocm$iKR5 zezjlqjGROt-*PhxP-v|QUw%N#&tzStfbG%E84hbS?G{+SpB)@_{z>oRXDZ!~w=di6 zZ}n>ag_hcu2M?cIj<2sYGcVD;efy2-^Ie%0cT4iG-8);_?!v!*_N%i+DmqG1YP*eO zc|QN+yZP_*?a%*%N}tIyyY36Cek_&#-~X@ge@p$#YkPO@x))jRasOD1#X3Jm?dAWM zs~b<&epVmA@u%=S`&~nhl>VfjM?~X4H=N@1RBT^Uzi$1$rmT0f)MovB*K+sR^IfTP zGPc>C{1$rGQbR&ID(=Y&gT=Ft-3qo?czx;K4<^Vv%AqC!-@lLh|x7$zYB>q8DWkCltN-_2ffqOVCM| zrTaf}b5|7m1$6YcuQu*JtovqWX7Bcx;&s!1+_c_g(--%m`p)-NzpY=L&*ExZo_C~Z zPNYt@)JeUq#fx@^te7HJz2|x8|Lk|#!FM;w{aLbW>E}N`?M1_#CHAMDx%zI6Jt*wA zd@t9KbG`Jl?~TK>#fvw0&)&V7cbfH!zJ(h&_G|2_|G#fVOZL7`WuNV8mn#OBI$68L zXTFu1pp|m?Ztov~=uP+ZR+X71vx0!wzEcq42+`*ZDzUAn72+-Qk^ zHAUmeqhluNO$ke{+E3BdVBL32rTJZ-70d6<(QNW@T$@$uZqG2g7{8rcX@<1SrR|2| zw=@Ip`WN@Ee4Ky?<`(t?j|H z`XfQb+4ER~!Vk~bitp8zfy+)%SqCcoz#I?*r4)Q{)a}8~7oZXoT7JSQwrueOd`<6i zX1{x&aDdNl=0#W;3^xc|f--=cjGz)({qwnZe649)uOGcR&vWsmGcS&%fC_BIiEDQr zmF;R(KVMh1%fwz&JawaH*qj5-GS9r{)p}lgyR>5JskWbU!fjP1OO_TtYtLNi^2c|{ z_Gc@1STC_QS$<*5W^ug_#{C=4p0JqDc(+n`+Qzfpr?Lh8cy_InJbdcl$%&q(p9D3I z?p!ndiA%oz&9wRr`@4^7yDk3}+SC0x=E{5Tx6BvI4~5KRo1#5WBljv8nOJ zXA9hzcWusWiQZT7XSTqsxDF;nAt&rOuhDal(!tWi(x*Rztg3;H6z(4<*P|r_M~CT~xo$_9EAElLgkZ-T2qe z`x{wjtbghDM8C*=MxQ(_uG^TYoH_Yyu9uC7(EQm`rR0T0=W0$lyZu!ydobKk~ z_11VVE&4H7>F~Z?=IU#o9zA|cb^aM$AIprSh~TH8HcHyxuj|}B@y_+r$<_Np=3H)g zx91?Q+_Qrwj;9~IIsgCnX{YrMHt25rXVsnKV)|7x+>0ypd(oF~K{lp$H~MAG-@E;y z{ZEs;w4ymhuRxg9=#s2UT00quZ2IC9?g8}@&Co5Rf11=cOQOa zE47|)Y3@4f*T+r1iT0emV=MXSas8SdL;5n)dzUsW>nb=^^JDQQwUfuEK9!8N z+;e00)wK2mY>_eD9V2QO?;PyyptF#@w0lOcbM4xNEQE z@$+{wPm~1z_s&1#w_=CAM)(P~>Q}*~+uMAayKc2`@}15W|JFJC>`%K@rF_M2XT1An zXr6L7_s}fq?X%=P#GXez+PirDmNH%s(M=EExz%;(-u$ra)E(o;Rm&sP|RX%sp|3yyw4HK8|r=P6pk6_t=72!JS)pcNWpZh4gpNwOfZWRM=TD9C*(L=~Z8l jWdL=qF{mE}f9!d#im@%?*t?Q}fq}u()z4*}Q$iB}XSRXM literal 0 HcmV?d00001 diff --git a/doc/qtdesignstudio/images/studio-3d-properties-transform.png b/doc/qtdesignstudio/images/studio-3d-properties-transform.png new file mode 100644 index 0000000000000000000000000000000000000000..e0b25a6d420d76af5042afce6ffe8da2cf48cbb2 GIT binary patch literal 10520 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 g0d%;HZSsHqoRsVzopr0KfqSLI3~& literal 0 HcmV?d00001 diff --git a/doc/qtdesignstudio/images/studio-3d-properties-type.png b/doc/qtdesignstudio/images/studio-3d-properties-type.png index 3b171820c09f752cf668d1f708545624adc4acb2..c0363d0233bbf359bd9530beb6b02beee3590e06 100644 GIT binary patch literal 6593 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%0AX=ltI1-2794+LZ`FW_u z>Bq_~7e8ZW{8uUQd{O0zmrJXIE-k-*?D(<%?$}vpBKUU6)ZO?c+ix~ISR(D`B3`rE zkCi2t{qAefGP}9)j96ps4~K879p!E)TJ}C%&J(;VuI|_*hcg$Qbk^3-eI1u%VQ)2k zcH-o}rF;LpYVkj7+1?#~>@SZ@)DFi76MS^9C{EM}>5#Qp_V8nBUQSZMeS6~F@BZZWh%oj0T1^K& z&2B#N`ok1Arc^U#~+1GSDt(Fb-|`%cKZzsc06-F7^fE8 zUHU`XjM4amMdlaDKg(`>;w&@Hyu3{$Jx@QK$DsRlj*x{)aKVX(6K<=dVQaY%p_9!p(&`Y1C`NiwAuCiYi)VjUh>XOs!xZQxnt<%zdoa3 z@gC$h1M8xHG4w?{^H zui19AeO{9Aj;T_jm$DyooWGEIO=Q`uI%WsvmPhQX`8kHODMV#jn_otI>cm4i9j$GgRxa8=Kuq}2=U&JrD+kNWE%!m6e zO0ut=C_ZlGqWfVk^Hvk!j_O$B@z z@@c+%AQE={*{93q?_c-rzwow2d(kRmU{byI7Dgz07y85}Sb4q9e0QlYWlK=n! diff --git a/doc/qtdesignstudio/images/studio-qtquick-3d-view.png b/doc/qtdesignstudio/images/studio-qtquick-3d-view.png index 9cba7fcd1a4b94ecb64ae420d009b3742d935eb1..9c0e8fc82bf31a71ede3f8e028b851fd6c4fc547 100644 GIT binary patch literal 6349 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 diff --git a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc index de254f33961..12bae906f41 100644 --- a/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc +++ b/doc/qtdesignstudio/src/qtdesignstudio-toc.qdoc @@ -88,6 +88,7 @@ \li \l{Logic Helpers} \li \l Animations \li \l{3D Views} + \li \l{Node} \li \l{Group} \li \l{Instanced Rendering} \li \l{Skeletal Animation} diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-group.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-group.qdoc new file mode 100644 index 00000000000..25a9d5f90d4 --- /dev/null +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-group.qdoc @@ -0,0 +1,51 @@ +/**************************************************************************** +** +** Copyright (C) 2021 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Design Studio documentation. +** +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** +****************************************************************************/ + +/*! + \page studio-3d-group.html + \previouspage studio-3d-node.html + \nextpage studio-3d-instancing.html + + \title Group + + The \uicontrol Group component is a \l Node component that can be + used to wrap other objects for the purpose of grouping them. This allows you + to transform and set the opacity and visibility of multiple 3D components in + the \l Properties view simultaneously. + + To add a \uicontrol Group component + to your scene, drag-and-drop it from \l Library > \uicontrol Components > + \uicontrol {Qt Quick 3D} > \uicontrol {Qt Quick 3D} to the \l {3D Editor} + view or to \l Navigator > \uicontrol View3D > \uicontrol {Scene Environment} + > \uicontrol Scene. + + If the \uicontrol Group component is not displayed in + \uicontrol Library, you should add the \uicontrol {Qt Quick 3D} module to + your project, as described in \l {Adding and Removing Modules}. + + Select the \uicontrol Group component in \uicontrol Navigator to modify + \uicontrol Node properties for its child components in the + \uicontrol Properties view. +*/ diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-instancing.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-instancing.qdoc index 91863bd40b4..31a9c90be95 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-instancing.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-instancing.qdoc @@ -25,7 +25,7 @@ /*! \page studio-3d-instancing.html - \previouspage studio-3d-node.html + \previouspage studio-3d-group.html \nextpage studio-skeletal-components.html \title Instanced Rendering diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc index d524fd8da00..871e6664150 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-node.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. @@ -25,27 +25,22 @@ /*! \page studio-3d-node.html - \previouspage quick-animations.html - \nextpage studio-3d-instancing.html + \previouspage studio-3d-view.html + \nextpage studio-3d-group.html - \title Group + \title Node - The \uicontrol Group component is a \uicontrol Node component that can be - used to wrap other objects for the purpose of grouping them. This allows you - to transform and set the opacity and visibility of multiple 3D components in - the \l Properties view simultaneously. To add a \uicontrol Group component - to your scene, drag-and-drop it from \l Library > \uicontrol Components > - \uicontrol {Qt Quick 3D} > \uicontrol {Qt Quick 3D} to the \l {3D Editor} - view or to \l Navigator > \uicontrol View3D > \uicontrol {Scene Environment} - > \uicontrol Scene. If the \uicontrol Group component is not displayed in - \uicontrol Library, you should add the \uicontrol {Qt Quick 3D} module to - your project, as described in \l {Adding and Removing Modules}. - - Select the \uicontrol Group component in \uicontrol Navigator to modify its - properties in the \uicontrol Properties view. + You can set properties for 3D components that are based on the + \uicontrol Node component in \uicontrol Properties > \uicontrol Node + and \uicontrol Transform. \section1 Setting Node Opacity and Visibility + You can set the opacity and visibility of 3D components that are based on + the \uicontrol Node component in \uicontrol Properties > \uicontrol Node. + + \image studio-3d-properties-node.png "Node properties" + All components have an \uicontrol Opacity value applied to them. The opacity of 100 makes a component fully opaque, while the opacity of 0 prevents a component from rendering at all. @@ -61,8 +56,15 @@ show components. It is useful when you want to show a component in a particular state, but hide it in another state, for example. + The \uicontrol {Static flags} property is currently not used. + \section1 Managing 3D Transformations + You can manage 3D transformations for components that are based on the + \uicontrol Node component in \uicontrol Transform. + + \image studio-3d-properties-transform.png "Transform properties" + The value of the \uicontrol Translation property contains the position translation of the component in the local coordinate space established by the parent component. The \uicontrol Orientation property specifies whether diff --git a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc index 1e285e9ec15..c80e6ffcba3 100644 --- a/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc +++ b/doc/qtdesignstudio/src/qtquick3d-editor/qtdesignstudio-3d-view.qdoc @@ -31,7 +31,7 @@ \title 3D Views To create a Qt Quick 3D UI project, we recommend using a \uicontrol - {Qt Quick 3D Application Template} wizard template that adds the + {Qt Quick 3D Application} wizard template that adds the \l {3D Components}{Qt Quick 3D} components to \l Library > \uicontrol Components and contains a 3D view. A 3D view component includes a \l {Scene Environment}{scene environment} as well as a scene