summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Palettes
Commit message (Collapse)AuthorAgeFilesLines
* Switch to qt3dstudio/ogl-runtime submodulePasi Keränen2019-06-10232-41563/+0
| | | | | | | | Module config change so that ogl-runtime builds from submodule. Task-number: QT3DS-3600 Change-Id: Ib22fda6aed1cf9336f15b79256b5f9db8774159f Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Allow specifying range property precisionMahmoud Badri2019-05-285-35/+33
| | | | | | | | | | | | | - Add a new (optional) attribute "decimals" to range properties. If the decimals attribute is present, the property will show number of decimals as set, else the number of decimals will be calculated automatically. - Few tweaks. Task-number: QT3DS-3523 Change-Id: I7ebb5075253effe5d91a12c0b29127e6c5fb8b95 Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Correct RowTree::rowType() for materialsMahmoud Badri2019-05-249-97/+68
| | | | | | | | | | | | RowTree::rowType() retuned OBJTYPE_MATERIAL for all types of materials. now it is fixed. Also code that uses it is updated. Additionally it is renamed to objectType() which is more matching with its purpose. Change-Id: Idaccc206ab053dbfad11a06469d60bd3adc73ad7 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Jari Karppinen <jari.karppinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Some CString to QString conversionsMahmoud Badri2019-05-2312-60/+48
| | | | | | | | | plus some tweaks. Change-Id: I714c9fea4afcfd3f15380c2e74c11fba515ae107 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add runtime support for DataOutputPasi Keränen2019-05-232-7/+12
| | | | | | | | | | | | | Observes attribute changes in the CPresentation attributes and timeline changes for DataInput definitions. Slide changes are ignored as there is already API for slide change notifications. Task-number: QT3DS-3516 Change-Id: I9c384bccae391ddfb0b840ece67d2b412b4f86fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Set datainput controller target to be source referenced materialJanne Kangas2019-05-233-11/+29
| | | | | | | | | | For referenced materials, use source material as target for "Set datainput controller". Also, do not show menu choice at all for default materials. Change-Id: Ie208f81390cc88665008a8a31a6ea98a6cb45a59 Task-id: QT3DS-3417 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Some Doc class clean ups (non exhaustive)Mahmoud Badri2019-05-186-12/+12
| | | | | | Change-Id: I98554bdb805df0e2418f44f8c9d6e0040b160f8b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Increment UIP versionMahmoud Badri2019-05-162-9/+8
| | | | | | | | | | | | - increment UIP version and show a warning if a UIP version is lower - remove 3 obsolete text shadow props - small update to checking for material container in the timeline - few cleanups Task-number: QT3DS-3366 Task-number: QT3DS-2903 Change-Id: Ib4d8c33e786001d0e5a18037a52303449630adf5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix wrong timeline rows placement after a Layer copy/pasteMahmoud Badri2019-05-166-161/+47
| | | | | | | | | | | | - Material container is part of the scene graph but not the timeline. This caused wrong index to be sent from the graph to the timeline when an object is added. Fixed by keeping the material container in the timeline but hiding it. - Few relevant clean ups and removing useless code. Task-number: QT3DS-3406 Change-Id: I9ed8da3db4d935269650c00fc5b0a92349cf6fa3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix crash when opening a color picker while renaming a materialMahmoud Badri2019-05-133-3/+15
| | | | | | | Task-number: QT3DS-3407 Change-Id: Ia8048e7816933736b9be9dea35721821099a9342 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement fixes to the distance field rendererJere Tuliniemi2019-05-061-1/+2
| | | | | | | | | | | | | | - Change modelView matrix to mvp for sharper texts - Support global opacity from parents - Allow changing alpha from the text color picker - Change shadow color to be the same as the text color Task-number: QT3DS-3343 Task-number: QT3DS-3363 Change-Id: I37178abe6c9239619a3f9de440d2b9245a138a82 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Allow subpresentations as textures for custom materials and effectsJere Tuliniemi2019-05-024-11/+26
| | | | | | | | | | | | | | | | | Effects already supported taking the subpresentation as a texture in the runtime. That behavior is now copied by the custom materials. This also fixes a runtime bug where the subpresentation was rendered only if a default material already had the subpresentation as a texture. Now custom material and effect properties are iterated prior rendering If they contain subpresentations, those are added the to the render task list. Task-number: QT3DS-3165 Change-Id: I7bddec2fece442065d517320d0e381eba5f1b159 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Support alpha channel initial workMahmoud Badri2019-05-0211-44/+53
| | | | | | | | | | | In this initial work, all (almost) color properties are converted into a new type (float4) to support an alpha channel. Alpha channel option is shown in the color dialog for Layer and Scene background properties only. The following is remaining: - Scene background alpha doesn't work in the editor (works in the viewer RT1) Task-number: QT3DS-3128 Change-Id: Ib5540ebc8e2ff68709473451e4a92bf66ddb8ad2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Ctrl-deselect a single objectMahmoud Badri2019-05-021-15/+17
| | | | | | Task-number: QT3DS-3372 Change-Id: I572d57fe0cb0589d090c18123e8309bbd2d3344a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Check inspector instances remain validKaj Grönholm2019-04-292-1/+10
| | | | | | | | | | Deleting slide makes instance not valid causing a crash. So continue checking runtime validity. Also fix null checking typo. Task-number: QT3DS-3344 Change-Id: I7d08a93212aeb59d3a3850ce6941172abf88ae75 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support variants property on componentsMahmoud Badri2019-04-1124-1052/+467
| | | | | | | | | | | | | | | Also the following tasks are done in this commit: - show active root component properties in the inspector. - fix a crash when opening the light scope drop down. - remove a lot of dynamic casts and useless code and cleanups, mainly from the inspector classes. There is still more dynamic casts and memory leaks that should be tackled in another commit. - move a method to more appropriate place. Change-Id: I5bec3858ba34d307ab6236ee665f1474302c1f57 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support variants property on Group typesMahmoud Badri2019-04-081-7/+4
| | | | | | | | | Also few usual cleanups. Task-number: QT3DS-3234 Change-Id: I4624aeac27ee512cdbe62677bb9469e2748cc58b Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement variants support for ModelsMahmoud Badri2019-04-058-45/+43
| | | | | | | | Also some relevant tweaks here and there. Next: supporting variants on Groups, then Components. Task-number: QT3DS-3234 Change-Id: I3943baef1118cecbcd4211b6eefca3d54b21a89e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Disallow modifying default material by dragging things on itMiikka Heikkinen2019-04-026-10/+23
| | | | | | | | Task-number: QT3DS-3245 Change-Id: I0ef73c495522311527fce221fb996bdcd953353e Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Merge branch '2.3'Miikka Heikkinen2019-04-012-47/+52
|\ | | | | | | Change-Id: If005b2e6e32c3616152e3049dbfa934fb28005da
| * Fix crash when hovering over property row of a layerv2.3.02.3Mahmoud Badri2019-03-292-47/+52
| | | | | | | | | | | | Task-number: QT3DS-3251 Change-Id: Id46611e6d661b045aab3a9663ac5030709a4969c Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Fix variant tag font looks larger on macOSMahmoud Badri2019-04-011-2/+8
| | | | | | | | | | | | Task-number: QT3DS-3254 Change-Id: I8c8646d33354b1f2ec265b220651d388fec1aff8 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Implement timeline rows filtering based on variants filterMahmoud Badri2019-04-0111-61/+118
| | | | | | | | | | | | | | | | Plus assorted small tweaks. Task-number: QT3DS-3225 Change-Id: I127fc7f356b7d63eaffc3137679552db4d42f11a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Change timeline comment datatype to QStringMahmoud Badri2019-03-297-22/+18
|/ | | | | Change-Id: Idf27515b2e0589e228ac4fd048168281ad2246bb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix timeline keyframe update when the entire animation is deletedMiikka Heikkinen2019-03-282-1/+2
| | | | | | | Change-Id: Id511ec52d6b69f531f1bfc1f887fe52b140b4eb0 Fixes: QT3DS-3237 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix persistent drag source row indicatorMiikka Heikkinen2019-03-281-1/+3
| | | | | | | Change-Id: Idf3706db17571241ec41f517d5bbfea914961063 Fixes: QT3DS-2306 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update inspector variants model upon undoing setting tagMahmoud Badri2019-03-271-1/+4
| | | | | | Task-number: QT3DS-3231 Change-Id: I0a530e83ce279e96a5e9c2effbed747627ffa38d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix master slide item grouping issuesv2.3.0-rc2Miikka Heikkinen2019-03-265-7/+30
| | | | | | | | | | | | Disallow grouping mixed non-master and master items. If master items are grouped, the resulting group is a master group. Disallow dragging master items under non-master items in some edge cases that still allowed it. Change-Id: Id4e18405526fb5b0f9ed17bc29e758101a19875e Fixes: QT3DS-3224 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Delete guide if it is moved off-presentation via inspectorMiikka Heikkinen2019-03-263-3/+32
| | | | | | | Change-Id: Ifd8188da43d334e315df2e9b6be6768953c6f1e7 Fixes: QT3DS-3222 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix drag-adjusting float fields when shift or ctrl is pressedMiikka Heikkinen2019-03-261-0/+4
| | | | | | | Change-Id: I78d9edcb79f942893738864ddb5550aa5d15eb9f Fixes: QT3DS-3221 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix variant group label width when it is just above previous maxMiikka Heikkinen2019-03-211-2/+2
| | | | | | Change-Id: I618d47d0b84c9ef168c4cdb960384de4728acb6e Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix the dialog size issues for tag edit dialogMiikka Heikkinen2019-03-212-2/+4
| | | | | | | | | | In some environments title bar was too short and height was bit too small. Also, dialog shouldn't be resizable. Task-number: QT3DS-3170 Change-Id: I032599734fca317ce47e2799f99cc5ca102222ae Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Improve timeline playback/scrubbing performanceMahmoud Badri2019-03-204-86/+35
| | | | | | | | | | | | Inspector model was being refreshed on every time change. Removed this unnecessary model refresh and corrected an issue so that inspector is updated on every property change. This greatly improved playback performance. Also removed few other unneeded code and some cleanups along the way. Task-number: QT3DS-3184 Change-Id: I77606b52239c8bfbcf235ebfd1189ba45acc2abb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Rename "qml streams" folder to "qml"Tomi Korpipaa2019-03-201-3/+3
| | | | | | | | Task-number: QT3DS-3182 Change-Id: Ifb1b7f18b6652d26f38eeab2351c329e7cbeb425 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow dropping on entire timeline row if insertion above is invalidMiikka Heikkinen2019-03-202-6/+24
| | | | | | | | | | This improves user experience when dragging things under scene or the topmost layer. Task-number: QT3DS-2652 Change-Id: I278504f1da14fa47941f8fa1b5d931b68b267958 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Correct timeline playback buttonMahmoud Badri2019-03-191-4/+4
| | | | | | | | The timeline toolbar playback button had a wrong icon as it shares the same icon with the preview button. Also some image name cleanups. Change-Id: Id7a1414084d883aa86fc0395282cae2412907641 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Increase size of EditPresentationIdDlgMiikka Heikkinen2019-03-191-2/+2
| | | | | | | | | In some cases the title gets cut off or controls are slightly squished vertically. Increasing the dialog size a bit should fix these issues. Task-number: QT3DS-3170 Change-Id: I9329ff92fdbddad7842db2e30e5026513374a864 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix qml asset import on non-windowsTomi Korpipaa2019-03-181-0/+4
| | | | | | | Task-number: QT3DS-3007 Change-Id: I0205c06e4015383a1778ffc9eae440b9d9b46964 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Show tags names in dark color when when group color is brightMahmoud Badri2019-03-183-2/+7
| | | | | | | | Applies to the inspector and filter dialog Change-Id: I668bb905b171cb96f83f1da7bfd20c1fd672dd18 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Prevent special characters in variants group/tag namev2.3.0-beta3Mahmoud Badri2019-03-151-0/+5
| | | | | | | Only underscore is alloweed. Specifically , and : are problematic. Change-Id: Iaddcd7f1476c6377236ecce51512b055616a3f7d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Show warning instead of empty popup when there are no valid refmatsMiikka Heikkinen2019-03-153-19/+33
| | | | | | | Task-number: QT3DS-3141 Change-Id: I4f3c87af213199bd4b743b79b36b79e2d5c4d09f Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Refresh variant indicators on slide view when presentation is loadedMiikka Heikkinen2019-03-151-0/+2
| | | | | | | Task-number: QT3DS-3154 Change-Id: Icdaa192f3e6a4b66a555ee9409db9fab829ebc49 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix a 'select master slide' crash related to variantsMahmoud Badri2019-03-152-18/+15
| | | | | | Change-Id: I248f49df0993f61a1ffe8e38e27264dd8d5554cb Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix variant label cropping on macOSTomi Korpipaa2019-03-151-2/+2
| | | | | | | Task-number: QT3DS-3163 Change-Id: I91d943070f4ed425e8763c56f1f8bec7b7d46288 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Improve several parts of the variant tags featureMahmoud Badri2019-03-149-34/+57
| | | | | | | | | | | | | | - Update slide view variants tooltip immediately upon tag/group rename. - Fix flicker upon first showing of the filtering dialog. - Word wrap the "empty variants" hint text. - Preserve groups addition order (in inspector and filter dialog). - Use predefined colors for newly created groups. - Add a border around tags in the timeline rows. - Other minor relevant tweaks. Task-number: QT3DS-3114 Change-Id: I2b345f94784fefda5fa1a004bb73dccbad2ddae9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update variants slide view UIMahmoud Badri2019-03-142-10/+11
| | | | | | | | | Make variants appear as squares instead of numbers in the slide view. Task-number: QT3DS-3087 Change-Id: If5857a9cfd20ce00e00b33a09bc71f3881946d77 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Refresh variants asynchronouslyMiikka Heikkinen2019-03-142-3/+11
| | | | | | | | | | | Synchronous refresh when deleting slides caused a crash. Asynchronous refresh is also much more efficient when deleting/undoing deep object trees. Task-number: QT3DS-3146 Change-Id: I9f63f0edb44e6f557a77132eeaaa9c76df868ce6 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
* Fix cursor issues with drag adjusting float fieldsMiikka Heikkinen2019-03-134-19/+70
| | | | | | | | | | | | | | Now properly account for the screen when setting the mouse position. Also use the center of the parent widget for reference point instead of the center of the main screen. This fixes an issue where cursor sometimes resets incorrectly to what the scene view needs instead of the default arrow after the drag. Task-number: QT3DS-3144 Change-Id: Ia1b5c5244ae89bcc57ccd946fbb007beb40a8975 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Implement variants filtering dialogMahmoud Badri2019-03-127-42/+49
| | | | | | | | | | | Implement variants filtering toolbar action, when clicked it shows the filtering dialog where the user can choose the tags to be used by the viewer. Also update the 'preview on remote device' icon. Task-number: QT3DS-3115 Change-Id: I4d93c8cefe94726f1f04aa6fc7e6f9f07fb8a8b2 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Allow grouping of single objectsKaj Grönholm2019-03-111-3/+3
| | | | | | | | Adjust logic to match this behavior. Task-number: QT3DS-2673 Change-Id: Ib3519e1abc10086469de767c3427f3864609fb5b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 01:42:53 +0000