aboutsummaryrefslogtreecommitdiffstats
path: root/doc/qtdesignstudio/src/qtquick3d-editor
Commit message (Collapse)AuthorAgeFilesLines
* Doc: Update info about materialsqds/v1.6.0-rc2qds/1.6.0-rc2Johanna Vanhatapio2020-09-082-8/+14
| | | | | | | | Fixes: QDS-2753 Change-Id: I74eb64552af4ef0b222f8949291d7f6b34f0dbbb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Describe using uniforms in custom effects and materialsLeena Miettinen2020-09-041-6/+58
| | | | | | Fixes: QDS-2723 Change-Id: Iea02261220026ab210fc82fb27ceee0277abb62d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Update the topic on editing 3D scenesJohanna Vanhatapio2020-09-031-11/+11
| | | | | | Task-number: QDS-2724 Change-Id: I4b9f4523e647edfafb7f052efcdf5c8c95f00687 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Describe 3D MaterialsJohanna Vanhatapio2020-09-033-5/+407
| | | | | | | Fixes: QDS-2677 Change-Id: Ia0e617084e4614c194fce0f53c58a6013831cad2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Update topic on working in 3D EditorJohanna Vanhatapio2020-09-031-20/+23
| | | | | | | Fixes: QDS-2655 Change-Id: If8e5e1051ceca8b405facdf36747c4d887d830bf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Describe creating custom effects and materialsLeena Miettinen2020-09-026-31/+178
| | | | | | | | | | ...using Qt Quick 3D custom shader utilities and commands Fixes: QDS-2613 Change-Id: I5807c1617d2b54b3fba183c1278ec1266f899c70 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Describe custom shader utilitiesJohanna Vanhatapio2020-09-014-3/+203
| | | | | | | | | Using the utilities will be described in another change. Task-number: QDS-2613 Change-Id: I41ca69f84df6e977e41ff30508c8a77d779e1c01 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Fix missing imageJohanna Vanhatapio2020-08-141-1/+1
| | | | | | Fixes: QDS-2622 Change-Id: Ie9b8ec1f8a15e8be9c70e7f2ef65e8ee6b1c5470 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Edit Maya export optionsJohanna Vanhatapio2020-08-131-1/+3
| | | | | | | Fixes: QDS-2124 Change-Id: Iefc42fdcc168c7eb41220525a2ef061541fa066f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Describe the 3D effects in QDSJohanna Vanhatapio2020-08-114-2/+373
| | | | | | | | Fixes: QDS-2224 Change-Id: I8d5737af34805e75eb74a3fe86591f86e99b6d4b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Doc: Describe converting projects from Qt 3D Studio to Qt Design StudioJohanna Vanhatapio2020-07-013-1/+335
| | | | | | | | | | | Draft of the migration guide describing the best practices and including a step-by-step guide for the converting process. Fixes: QDS-2252 Change-Id: I501b57450525cd3122510d5f9d784804996dd70f Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Fix menu paths to submenus and items that moved to View menuLeena Miettinen2020-06-301-1/+1
| | | | | | | | | The Views and Workspaces menus as well as some menu items were moved from Windows to View. Change-Id: I2e196c09f0e9e2bf8ef1623167ec3e87ed1f77f5 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Doc: Edit Maya export options for FBX filesJohanna Vanhatapio2020-06-171-5/+40
| | | | | | | | | Task-number: QDS-2125 Change-Id: I9397870d577f8f64c217a98a15c9bc00e3907731 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Knud Dollereder <knud.dollereder@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Merge remote-tracking branch 'origin/qds-1.59'Eike Ziller2020-06-082-2/+19
|\ | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/formeditoritem.cpp src/plugins/qmlpreview/qmlpreviewconnectionmanager.cpp Change-Id: Ifa7c66330c1995378280cdb4c57c30015dc11b68
| * Merge remote-tracking branch 'origin/4.12' into qds-1.50qds/v1.5.0Tim Jenssen2020-05-155-172/+176
| |\ | | | | | | | | | Change-Id: Ia70d4b47f578021f29197a22b3e07e792342d05c
| * | Doc: Add missing punctuationLeena Miettinen2020-05-151-1/+1
| | | | | | | | | | | | | | | Change-Id: If0af93ec6f64fc5c48c33df87cf37b4189dfc72e Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
| * | Doc: Describe SpotLight Qt Quick 3D typeLeena Miettinen2020-05-151-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update screenshots of all light types in 3D Editor. Task-number: QDS-2056 Change-Id: I5f4fbacd01850c7cedcbd187969b9f310507649c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | | Doc: Change the link to info on exporting 3D assetsJohanna Vanhatapio2020-06-051-2/+2
| |/ |/| | | | | | | Change-Id: I6ba7933928563343ea0f3420f1cb3b47bc262360 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: Update information about views for editing 3D assetsJohanna Vanhatapio2020-05-151-43/+27
| | | | | | | | | | | | | | | | Task-number: QDS-2056 Change-Id: Iee6aab42c4cd6d97d99eafc3599e55828f0d9657 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* | Doc: Update information about project wizardsLeena Miettinen2020-05-151-15/+17
| | | | | | | | | | | | | | | | | | | | Qt Quick 3D, Flow Item and Flow view wizards have been added, the Qt for MCUs wizard is now included in Qt Design Studio, and the font loader wizard has been removed. Task-number: QDS-2056 Change-Id: Ie5d42320661977d57767c3bf58fd480e7d6c3c8d Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* | Doc: Update information about 3D EditorJohanna Vanhatapio2020-05-152-108/+127
| | | | | | | | | | | | | | Change-Id: I047b96e1db411ccbbe73a94f701cc7e632bc98c9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* | Doc: Update information about Scene Environment propertiesLeena Miettinen2020-05-141-6/+5
|/ | | | | | | | | | "Blend mode" field seems to have been removed. The Skybox option has been added to "Background mode" field. Task-number: QDS-2056 Change-Id: Ie5c5b5fae4aba83bd8b9b50357bb83d58fbb69c2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Remove obsolete \contentspage commandLeena Miettinen2020-05-1116-16/+0
| | | | | | | This prints a QDoc warning when building with QDoc 5.15. Change-Id: Id6f4646738f3e09956a243dc0da639f5567470f3 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Doc: Describe 3D Editor local and global orientation modeJohanna Vanhatapio2020-05-041-16/+24
| | | | | | | Change-Id: Ibe281ba6d06c68a9c5f36a743563b6fc40fe7e0a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Doc: Describe downloading Qt Bridge from Qt MarketplaceLeena Miettinen2020-05-041-5/+6
| | | | | | | | | Adjust the info about exporting and importing assets. Change-Id: Ibc66fac68e14483fda050b7501fc7e091115ce89 Reviewed-by: Johanna Vanhatapio <johanna.vanhatapio@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Fix 3D editor icon filenamesLeena Miettinen2020-04-091-5/+5
| | | | | | Task-number: QTCREATORBUG-23364 Change-Id: I0cfe1b5040eea9675f9b7508c5a6486beffd5adb Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Update info on Qt Quick 3D materials and shadersLeena Miettinen2020-04-071-13/+44
| | | | | | | Task-number: QDS-1651 Change-Id: I510f954387b4f13b23755059cc6c6a9961b53c36 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Update info about attaching texture to materialsLeena Miettinen2020-04-071-1/+23
| | | | | | Change-Id: Idc934db3e8b9b083fd60ae348eb84c095d2fca72 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Edit info about Qt Quick 3D View typeLeena Miettinen2020-04-021-1/+12
| | | | | | | Add screenshots. Change-Id: I06cb35deabb7c4a2bb6fda3b47dfc3ee49be1b32 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Add screenshot of Qt Quick 3D Model type propertiesLeena Miettinen2020-04-021-1/+3
| | | | | | | | Also update screenshot of Qt Quick 3D Components section in Library view QML Types tab. Change-Id: Id70c5cb8400c81473eb1d2e3a9c8e41cd53db3d9 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Describe Qt Quick Designer 3D editorLeena Miettinen2020-03-129-12/+119
| | | | | | | | | | | | | - Pull source files from /doc/qtdesignstudio/srcqtquick3d-editor - Add the necessary defines to link to additional Qt modules - Use the same structure and files for the Qt Quick Designer parts as in Qt Design Studio Manual - Move some overviews to /doc/qtcreator folder - Fix the TOC and the navigation links Change-Id: I2103a8e635e537fd276b3e14feeb8f50beb92cae Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* Doc: Fix typo "ajust"Leena Miettinen2020-02-271-1/+1
| | | | | Change-Id: I6a974dc9e9f9439392cf8029740fe72415f80e54 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* QmlDesigner: Rename resources to assets in the uiThomas Hartmann2020-02-142-4/+4
| | | | | | | Task-number: QDS-1646 Change-Id: I8937f70adc3ad59f28d40f99852f2be053ce6c3b Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Doc: Link to information about exporting 3D assets from BlenderLeena Miettinen2020-02-141-0/+47
| | | | | | | | | ...for importing them to Qt Design Studio. Fixes: QDS-1470 Change-Id: I47e8a947fecbf0971fdeab32ae41dcaa645cd359 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Doc: Add general guidelines for preparing 3D assets for exportLeena Miettinen2020-02-141-0/+196
| | | | | | | | | These guidelines help optimize the 3D assets for importing them to Qt Design Studio. Fixes: QDS-1431 Change-Id: I267c3897b8da42271948d2b1e45596e3928dbf1f Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* Doc: Update information about Qt Quick 3D Model typesLeena Miettinen2020-01-291-4/+8
| | | | | | | | | The primitive types are now available as components in Library > Qt Quick 3D. Fixes: QDS-1544 Change-Id: I472280bab4bd219eff14b8fd30546941a7ac6a95 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Add information about how pivot offset is visualizedLeena Miettinen2020-01-282-2/+12
| | | | | | | Fixes: QDS-1543 Change-Id: I79b00c3e5b3c23f91bf6c6b8b670d53f7870e3a0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Doc: Add Qt Design Studio Manual sourcesLeena Miettinen2020-01-2013-0/+1451
To build the manual, switch to qtcreator\doc\qtdesignstudiodoc, run qmake, and then "make docs". The example documentation does not get built with this change. We need to decide whether to move the examples or fetch their docs from the other repository. Task-number: QDS-1487 Change-Id: Ic0a8c15b226eba8ac90686953568f3deaa000fb0 Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>