summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Improve scene translation push efficiencywip/runtime2Miikka Heikkinen2019-03-203-20/+78
| | | | | | | | | | There is no need to remove all scene content and recreate the layers every time anything changes in the scene. Change-Id: I16d9401f1977d5bcc4ac27d864800eb1db1d972e 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 scene camera previewMiikka Heikkinen2019-03-2018-175/+302
| | | | | | | | | | | | | | | Scene camera preview tab will use a completely separate renderer from the main scene renderer. This essentially duplicates the rendering overhead, but it is required as Qt3D underlying the runtime will not respond to any scene changes without some delay, making it impossible to render both preview and regular scene with the same renderer in a timely manner. Task-number: QT3DS-2070 Change-Id: I5e2c9f280990bf295ef84d83244c18a37f94aca3 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>
* Bump version number to 2.5.0Miikka Heikkinen2019-03-071-1/+1
| | | | | | | | Even though the target is to merge wip/runtime2 into master in 2.4.0, this bump is needed to avoid conflicts in coin. Change-Id: Iba463b812f00e4a2fba85f26b81c49e482732bb9 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Implement local/global manipulator toggle behaviorJere Tuliniemi2019-03-044-45/+137
| | | | | | | | | | Manipulators now should be able to manipulate the object in global space. Plane scaling works differently than in the old runtime in this patch as the logic of that is unclear at the moment. Task-number: QT3DS-3010 Change-Id: Ie6961727b32c530d55e41ed84f102526f018ace9 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clear selection box when selecting sceneJere Tuliniemi2019-03-041-0/+2
| | | | | | Task-number: QT3DS-3109 Change-Id: I2c4ef23ddd066b24ad3e9cb00740048bcb874a71 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fit selected supportMiikka Heikkinen2019-03-0412-268/+340
| | | | | | | | | | | | Also added an intermediate widget between glWidget and player window, which is always located at 0,0 to avoid glWidget bouncing around due to internal scroll range resets during geometry setting. Task-number: QT3DS-3072 Change-Id: Ife6b628f69d45b156f7c453f8cc3dd010ecedef2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Update qt3d-runtime submoduleMiikka Heikkinen2019-03-041-0/+0
| | | | | Change-Id: Ic0632d47f44d1fc96db56477d436383bb601d163 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Reset layer parameters to default when in edit viewMiikka Heikkinen2019-03-044-107/+261
| | | | | | | | | | | Same layers are used in edit views and scene view, but the layer parameters should not affect edit view. Task-number: QT3DS-2986 Change-Id: I6e4cbfe6980ad4e6c7a51bdd4f18b64b0bed665e 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>
* Merge branch '2.3' into wip/runtime2Miikka Heikkinen2019-03-01150-1239/+4370
|\ | | | | | | Change-Id: If322aa6beb43c54781e80ef38a9bd88b6aafd3ef
| * TimeEditDlg, DurationEditDlg fixesMahmoud Badri2019-02-269-146/+149
| | | | | | | | | | | | | | | | | | | | | | | | - Removed faulty white lines in the bottom and right sides of the dialogs. - Fixed an issue with auto focus change between text inputs in the TimeEditDlg. - Cleaned the DurationEditDlg to be similar to TimeEditDlg. Change-Id: I894f1d29cc219409e11617ed87a718848fb5a61a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix timeline snap issueMahmoud Badri2019-02-257-122/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | - Moving a timeline row duration bar or one of its ends while snapping, was offset by duration edge (15px). Fixed. Also changed a timeline row start_x and end_x to start at 0 instead of RULER_EDGE_OFFSET as part of the fix. - Assorted tweaks. Task-number: QT3DS-3102 Change-Id: Id8974ed0dcc05f4b32ffd89e81a36bf1afe65f75 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add docs for editor side of variant tagsMats Honkamaa2019-02-226-0/+128
| | | | | | | | | | | | | | Task-number: QT3DS-2913 Change-Id: I275ccc8ea2276d944b6c860860704f548ab41a94 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
| * Variants: make all group labels have equal width as the widest oneMahmoud Badri2019-02-221-2/+20
| | | | | | | | | | | | Task-number: QT3DS-2983 Change-Id: I90ba9612354809b3d690029c735b62a7e64c6f2d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Refresh variants model after editsMahmoud Badri2019-02-223-3/+12
| | | | | | | | | | | | Task-number: QT3DS-3091 Change-Id: I8fb23bf9c0508ceed98a1d0917005e070ea76531 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Implement variants UI on the slide viewMahmoud Badri2019-02-2112-59/+163
| | | | | | | | | | | | Task-number: QT3DS-3087 Change-Id: Ie402e48d2a948bde32388d0ea4c4245a87e94e21 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Update inspector palette documentationMats Honkamaa2019-02-211-80/+85
| | | | | | | | | | | | | | | | | | | | | | Add, remove, edit, re-arrange content to match with 2.3. Also added text eliding content from QT3DS-3059. Task-number: QT3DS-3061 Change-Id: I0efed23a8cd78183c9fbd5282c9b55f12cb6ca46 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add issues about material definitions to Known IssuesMats Honkamaa2019-02-211-0/+8
| | | | | | | | | | | | | | Task-number: QT3DS-2717 Change-Id: I2da75abc3cb52c41d3acca601410412794959a2c Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix a crash that happens on slide changeMahmoud Badri2019-02-201-6/+7
| | | | | | | | | | Change-Id: I5931500612714e21389ec3c695afea3f7788188d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Implement variants UI on the timeline rowsMahmoud Badri2019-02-2011-90/+203
| | | | | | | | | | | | | | | | | | Also some related fixes and tweaks. Task-number: QT3DS-3081 Change-Id: I7fd86479500fbbca247fb8a6517165ff6d0f742a Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix crash when editing playhead timeTomi Korpipaa2019-02-192-3/+5
| | | | | | | | | | | | | | | | Task-number: QT3DS-3076 Change-Id: I167ce00748e2fa62c0145a7db4373cb00358cdfe Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Variants: use QHash instead of QVectorMahmoud Badri2019-02-184-92/+39
| | | | | | | | | | | | | | | | | | To make lookup fast. Also neater. Task-number: QT3DS-3047 Change-Id: I3ce05252b9eb97a436ea66d4148fb5fa406898ff Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * implement variants import and export featuresMahmoud Badri2019-02-187-54/+190
| | | | | | | | | | | | | | Task-number: QT3DS-3047 Change-Id: Ifa7986c4a7ca7934cf903c005b9df19d9fb75924 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix variants tags property update issueMahmoud Badri2019-02-186-15/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | - update the in-memory variants property after renaming or deleting a tag or group to prevent the old value from being saved to the uip if the user saves. - refresh the 'variants empty text' and 'export button enabled' states when the groups empty state change - refresh the variants when creating a new presentation Task-number: QT3DS-2983 Change-Id: I2910dd6f5b69607e29ffa0c60d90ab33a2a0fc8b Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix crash when changing basic material colorJere Tuliniemi2019-02-181-3/+3
| | | | | | | | | | | | Task-number: QT3DS-3005 Change-Id: I0eabbc1177cb8f94cd747817e7c6aebeb30871ff Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Only highlight the properties with nonmatching datainput datatypeJanne Kangas2019-02-181-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | In datainput management dialog, highlight only the properties for the element that has mismatch between property datatype and controlling datainput type, not for other elements. Also increase element name field width to avoid clipping. Change-Id: I0521c98ee55bafedb93d88bf80f75705f9b2c0ce Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add clarifying text about scaling directional lightsMats Honkamaa2019-02-181-1/+11
| | | | | | | | | | | | | | | | Task-number: QT3DS-3009 Change-Id: I74ec957b26f595656802c1cf71bc40d28d3b2ed3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Create Known Issues pageMats Honkamaa2019-02-183-20/+56
| | | | | | | | | | | | | | | | | | | | | | Created Known Issues page, move known issues section from About Qt 3D Studio to the new page. Also added a known issue from QT3DS-2720. Task-number: QT3DS-2830 Change-Id: I31dba1e0f755761f210b788e425266aed51fcefa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Merge "Merge branch 'master' into 2.3" into refs/staging/2.3Miikka Heikkinen2019-02-184-0/+499
| |\
| | * Merge branch 'master' into 2.3Miikka Heikkinen2019-02-134-0/+499
| | |\ | | | | | | | | | | | | Change-Id: I6c6268a19292db90c7d9557fa07cf0567b5ef8be
| | | * Create glossary pageMats Honkamaa2019-02-132-0/+315
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Created a page with short explanations of terms used in Qt 3D Studio. Most content is copied from other parts of the documentation. Task-number: QT3DS-2829 Change-Id: Iaf02add4010d29578f7f07f725e78e9775f08bc9 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| | | * Move Qt 3D vs Qt 3D Studio section from wiki to docsMats Honkamaa2019-02-122-0/+184
| | |/ | | | | | | | | | | | | | | | | | | | | | Moving https://wiki.qt.io/Comparison_of_Qt_3D_and_Qt_3D_Studio to docs. Task-number: QT3DS-2883 Change-Id: I0649396c55b384773025de573304a89202a09cd3 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * / Fix breakpad linux build failMahmoud Badri2019-02-181-0/+6
| |/ | | | | | | | | Change-Id: I1626b2ffeddbae55388fe1d6d7e3d0c0885372ea Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Update qt3d-runtime submodulev2.3.0-beta1Miikka Heikkinen2019-02-121-0/+0
| | | | | | | | | | Change-Id: Iad7d56dde6cf540fb100a7e7fabfc10f23a18e80 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Implement variants tags inspector workMahmoud Badri2019-02-1120-18/+1633
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implemented features: - UI for the variants tags in the inspector. - adding, renaming, and deleting tags. - adding, renaming, and deleting tag groups. - adding, renaming tags/groups is checked for name uniqueness across project. - deleting tags/groups checked for in-use across the project. - toggling tags state. - tags are synced with the UIA/UIP. - changing group color. - the variants property in saved in the <Graph> part of the UIP. Remaining tasks: - implement import and export. - issue: renaming a selected tag, toggle it unselected till next project load. - issue: update the property after deleting a group that is in-use in the property in the currently open doc but not saved. - thorough test and tweaking. Task-no: QT3DS-2983 Change-Id: Iecbb6c854a00ec75864de5dd0f31f6ca3721c8ec Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add 2D assets pageMats Honkamaa2019-02-112-0/+122
| | | | | | | | | | | | | | | | | | Adding a page for 2D Assets overview, with links to relevant content. Task-number: QT3DS-2615 Change-Id: Id52c7ca54028aaeda6e59424cb6c9925b3d8c03e Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Add metadata field to datainput definitionJanne Kangas2019-02-076-1/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a single key-value metadata to datainput item definition. Add editable field in datainput dialog for entering metadata. Metadata is provided as convenience for the user integrating Q3DSPresentation with external code. It can be used to better identify the intended use for a specific datainput, for example. Metadata is stored in UIA (project) file. Corresponding getter function will be implemented on Runtime side. Change-Id: I60d4f8318a7552bd82b41c857d4314be0828f013 Task-id: QT3DS-2992 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix noncanonical uia/uip file savingTomi Korpipaa2019-02-072-3/+11
| | | | | | | | | | | | | | Task-number: QT3DS-2960 Change-Id: I0c994b9712a65a529fe269dbab9227ce1a3f199e Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Indicate datatype mismatches in datainput management dialogJanne Kangas2019-02-043-1/+41
| | | | | | | | | | | | | | | | | | | | | | In datainput list, add warning icon to datainputs that have invalid bindings(s) to mismatching property types. In right hand side property binding list, indicate invalid bindings with highlight color when a datainput with type mismatches is selected. Change-Id: Ib28ca5995b4e681a61e63101b28c4549f374cca6 Task-id: QT3DS-2792 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Add hires icons to scenegraph and timelineTomi Korpipaa2019-02-0443-135/+313
| | | | | | | | | | | | | | | | | | | | | | Also resized the original keyframe images uniformly. Task-number: QT3DS-2959 Task-number: QT3DS-2961 Change-Id: If4a4d1ed6770b473918dfc72b5dae47d58edd042 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
| * Enable collapsing inspector groupsMahmoud Badri2019-02-014-53/+118
| | | | | | | | | | | | | | | | | | | | Also divided Layer inspector properties into some groups. Task-number: QT3DS-2972 Change-Id: I17ce5276bb1b6c16432775b2470a468ff6cc46cd 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>
| * Add clarification about master slide visible propertyMats Honkamaa2019-02-011-0/+3
| | | | | | | | | | | | | | Task-number: QT3DS-2964 Change-Id: I945ae50dca2614309183f17bd0baf99e6b992e93 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Disable toggling eyeball on master slideTomi Korpipaa2019-01-315-4/+33
| | | | | | | | | | | | | | | | Task-number: QT3DS-2924 Change-Id: I497fa2357018403a4b946adb54ad76a96c706aa5 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Convert text elide property to enumTomi Korpipaa2019-01-307-6/+43
| | | | | | | | | | | | | | | | | | | | Elide has option for None, Left, Middle, and Right. Converting the original boolean to support those. Task-number: QT3DS-2707 Change-Id: I82afd0da38fd3f59a70d1c09e79fc99e0351eb5b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix 'set keyframe time' dialog issueMahmoud Badri2019-01-3012-148/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fixed an issue that happens when the user sets the time to a value that makes the keyframe with min. time go below zero when setting the time for multiple keyframes. - Highlighted the pressed keyframe from a multi-selection so that it is clear which keyframe is affected by setting the time or snapping. - removed some useless code and simplified some logic. Task-number: QT3DS-2957 Change-Id: I023b95f18c9f9902da3b71f0d5701251c33b6005 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix moving keyframe snap accuracyMahmoud Badri2019-01-285-22/+46
| | | | | | | | | | | | | | | | | | | | Instead of using delta x for moving keyframes which loses accuracy during snapping, use target x directly. Task-number: QT3DS-2937 Change-Id: I5324bde9406d594cc926f777649968858d57af02 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Don't show material container items in browserTomi Korpipaa2019-01-253-2/+34
| | | | | | | | | | | | | | | | | | Remove "Scene.__Container" and "materials//Default" from object browser views. Task-number: QT3DS-2777 Change-Id: Id9102d3bf88b3ca96c5a5737eee526195ba0b83f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add documentation about lightsMats Honkamaa2019-01-2415-1/+147
| | | | | | | | | | | | | | | | Added new page with basic information about lights. Task-number: QT3DS-2619 Change-Id: I2a8465c026e80f36ce2970dc726328796195456c Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Fix and bump version in Info.plistTomi Korpipaa2019-01-241-2/+4
| | | | | | | | | | | | Task-number: QT3DS-2869 Change-Id: I5bb4eb5b9b50081505c850914e64b232c27148da Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Fix missing initial color from Color DialogTomi Korpipaa2019-01-232-2/+1
| | | | | | | | | | | | | | Task-number: QT3DS-2923 Change-Id: Ia5eb0518fd69745697df1778c9504c250fb87931 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add HiDPI icon supportTomi Korpipaa2019-01-231-0/+1
| | | | | | | | | | | | | | Task-number: QT3DS-2928 Change-Id: I8d7a7582923694dbc67fc3bce142d12f1f598f83 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 03:34:21 +0000