summaryrefslogtreecommitdiffstats
path: root/src/Authoring/Studio/Qt3DStudio.pro
Commit message (Collapse)AuthorAgeFilesLines
* Support alpha channel initial workMahmoud Badri2019-05-021-2/+1
| | | | | | | | | | | 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>
* Remove unused codePasi Keränen2019-04-291-1/+0
| | | | | | | | | Remove stateapplication (Architect integration) code. Remove perflog code. Task-number: QT3DS-3331 Change-Id: I208cce7551b3d332fb7905ae7cd4151c883b3728 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Add distance field rendering to OpenGL runtimeJere Tuliniemi2019-04-161-0/+1
| | | | | | | | | | | | | | The old text rendering remains in the background and is used to render clipped text, since that feature is not yet implemented for distance field fonts. Building the runtime with Qt version older than 5.12.2 also causes a fallback to the old text rendering. Depth pass rendering also needs to be redone in the future to avoid another full render pass. Task-number: QT3DS-3210 Change-Id: Ib7666c437d23ae25e1872682f010df3721476a14 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Flatten OpenGL source directory hierarchyPasi Keränen2019-04-151-8/+7
| | | | | | | | | | Flatten Source,Include and PrivateInclude directories away. Replace camelcase directory names with lowercase names. Remove random Qt3DS prefixes from directory names. Task-number: QT3DS-16 Change-Id: I5b23349232c760afa9a8efcc5e8945ee19d2e31a Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>
* Support variants property on componentsMahmoud Badri2019-04-111-3/+0
| | | | | | | | | | | | | | | 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>
* Rename Slayer runtime moduleTomi Korpipaa2019-04-041-2/+2
| | | | | | Task-number: QT3DS-3256 Change-Id: I813ad2e02c619754252a90ed150c12ebaeacc9ce Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix qmake error when breakpad source is missingMiikka Heikkinen2019-04-011-3/+3
| | | | | | | | Exists check prints out an error if the checked string is empty. Change-Id: I9d01dd2270cdec598b17b623961b9a6c2ffa3341 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Show tags names in dark color when when group color is brightMahmoud Badri2019-03-181-2/+4
| | | | | | | | 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>
* Disable breakpad on macOS and LinuxPasi Keränen2019-03-151-1/+2
| | | | | | | | | Breakpad causes issues with macOS and Linux builds, as a quick patch disable it. Task-number: QT3DS-3164 Change-Id: I2b94850f6be53cd2b36280c285d8cafc3aeffe77 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement variants filtering dialogMahmoud Badri2019-03-121-2/+6
| | | | | | | | | | | 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>
* Implement variants tags inspector workMahmoud Badri2019-02-111-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* Timeline clean upsMahmoud Badri2019-01-171-1/+0
| | | | | | | | | | | | - Unify the timeline time unit to be long (milliseconds), to save the back and forth conversion between seconds/mills. Note that some parts of the code still use float, but that is out of the scope. - Remove a useless interface (ITimelineKeyframesInterface). - Remove unused code plus some tweaks here and there. Task-number: QT3DS-2850 Change-Id: Iff8e245826d6030fd5ddf3a962b4c274cef464fe Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Integrate Google breakpad with Qt 3D StudioMahmoud Badri2018-11-151-0/+5
| | | | | | | | | | | | | When a crash happens, a minidump file is generated and a friendly popup appears that collects info and send it along the crash minidump file to the server. Sentry.io is used as the crash server. Breakpad is referenced via an environmental variable (BREAKPAD_SOURCE_DIR) Task-number: QT3DS-2522 Task-number: QT3DS-2523 Change-Id: I1fd53b9bfea4512ef74abc2a43834ad17224f561 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support timeline timebars commentsKaj Grönholm2018-11-091-2/+4
| | | | | | | | | Each timeline bar can contain comment text line. Comments mode can be toggled from toolbar, from context menu and with shortcut. Task-number: QT3DS-1508 Change-Id: Ib1af74fdef1ccedb3d207a3e60d3a91dfc2c42d7 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement scene camera tabMiikka Heikkinen2018-11-021-3/+11
| | | | | | | | | The scene camera tab on the bottom dockable area provides a zoomable pixel perfect view of the scene camera. Task-number: QT3DS-709 Change-Id: I7d96464e8208b9e57a1bd980fc6b71656028e49a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Make effect/material asset importing more robustMiikka Heikkinen2018-10-121-1/+0
| | | | | | | | | | | | Refactored how effect and material assets are imported to remove code duplication and support also importing from another project rather than just from content library. Task-number: QT3DS-2476 Change-Id: I738e80d5df6a76a8ccc8834c2ce8308eac8f8512 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Remove hierarchies from Referenced material dialogMahmoud Badri2018-09-261-2/+4
| | | | | | | | | | | | The select reference material dialog now only shows a compact list of existing scene materials (Standard and custom). The material's object name is also shown between parenthesis. - Small tweaks for the property linking, inspector combo box style. - Arrow on image and mesh comboboxes switch direction upon click Task-number: QT3DS-2312 Change-Id: Id9613bc7bf8b32c48be900247a0fd6aa646003ff Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix style issue with timeline time labelTomi Korpipaa2018-09-121-2/+0
| | | | | | | | | Also removed obsolete styles from style.qss, as it was being edited anyway. Task-number: QT3DS-1928 Change-Id: Iec7bf2bc47202cada7de2cf613b1c740586b9dd2 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Fix Qt 3D Studio authoring tool macOS deploymentKimmo Leppälä2018-08-221-0/+13
| | | | | | | | | macOS app bundle was missing dependency libraries which resulted in Qt 3D Studio failing to launch Task-number: QT3DS-2058 Change-Id: I7e8fba0f354acdc1f920f59242bb4a88a91f1542 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Welcome screen updatesKaj Grönholm2018-08-211-2/+4
| | | | | | | | | | | | | | Improve and update welcome screen: - Reducing height and slicing page indicator away from tutorial images. - Implement page indicator as a widget, interactive for page switching. - Animate page in/out opacity when switching pages. - Some refactoring. Task-number: QT3DS-1853 Change-Id: Ide8887f80492ec1bfaab38aeedb0ba9df5bcb9c0 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io>
* Fix macOS ColorDialog crashTomi Korpipaa2018-08-091-0/+1
| | | | | | | | | | Got rid of the QML ColorDialog altogether, as this functionality now replaces the old functionality fully. Task-number: QT3DS-2043 Change-Id: Ia48cc996a6a4df634b29d8dba360b66f896f9510 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement uip subpresentation preview in studioMäättä Antti2018-07-311-0/+7
| | | | | | | Task-number: QT3DS-1849 Change-Id: I3ec3803ea1fbe0d59ba933d69ab0da92c42a9054 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Allow DnD presentations from the project palette to the timeline rowsMahmoud Badri2018-07-271-3/+6
| | | | | | | Task-number: QT3DS-1951 Change-Id: Iae861c2f777d8e62a17e2331aea1913390d05453 Reviewed-by: Janne Kangas <janne.kangas@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Add presentation id to the presentation settings panelMahmoud Badri2018-07-261-9/+10
| | | | | | | | | | | | | | | | | | | | | | - The presentation settings panel appear after creating a new presentation - The presentation settings panel now show the presentation Id (for the currently open presentation) - Added logic to make sure the presentation id remains unique - Added a command prompt option (--add) to add a presentation to project, if the option is absent, a new project is created - Added a context menu 'edit presentation id' action to the presentation items in the project palette - removed the sub presentations menu option and dialogue - Added the ability to import a presentation. This will also import all presentations related assets (images, models, fonts...etc). If an asset already exists a message box is displayed so that the user can choose whether to override or skip the file. The only missing thing is that subpresentations are not imported. This part is to be discussed and/or implemented in a separate task. Change-Id: I9fa96227efa82b4cef90615f1f069530419db7b6 Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Improve slide data input control visualizationJanne Kangas2018-07-251-0/+1
| | | | | | | | | Adds indicator to slide panel that shows the controlling data input name. Change-Id: I148facafc4d02e764d44a543c2152796d008522d Task-id: QT3DS-1668 Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io>
* Initial work in the project/presentations handling tasksMahmoud Badri2018-07-041-1/+1
| | | | | | | | Check task description for details. Task-number: QT3DS-1950 Change-Id: Ibf3e235d8fc8c622a87c42399107f9ccb01a851d Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Implement preview of qml streamer content in studioMäättä Antti2018-06-191-1/+3
| | | | | | | Task-number: QT3DS-665 Change-Id: Ib8adeaa68e7116161bf898dd898215240a64f1ab Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Consolidate stdafx headers into Qt3DSCommonPrecompile.hMiikka Heikkinen2018-06-121-1/+1
| | | | | | | | | Task-number: QT3DS-256 Change-Id: I1ab44e93bf505f68690114f2a2c5f1a012e02af1 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Antti Määttä <antti.maatta@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Handle trivial timeline TODOsMiikka Heikkinen2018-06-011-2/+0
| | | | | | | | | | | Went through timeline TODOs and removed ones that are no longer valid and did trivial ones. Task-number: QT3DS-1828 Change-Id: I717c4fae21bd2d95136c0cec63e4b304bbb3d24d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clean up old controlsMiikka Heikkinen2018-06-011-40/+0
| | | | | | | | | | Remove unused controls from Authoring/Studio/Controls and some ancillary files elsewhere. Task-number: QT3DS-1828 Change-Id: I6461112a02cc24ef0c169b3a99de26b034065040 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Remove old timeline codeMiikka Heikkinen2018-05-311-37/+1
| | | | | | | | | | | | Remove unused files and unused functionality from remaining files. Moved some still used functionality to better places. It is likely that a lot of unnecessary code still remains. Task-number: QT3DS-1828 Change-Id: I199f67e7d34acbc4d707b75502a4b54e0f9a7d02 Reviewed-by: Kaj Grönholm <kaj.gronholm@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Fix double headers and remove unused from Qt3DStudio.proMäättä Antti2018-05-291-96/+0
| | | | | Change-Id: I4c98501ffb5dc89dab91d5f6b63c0968c7fd2014 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Re-organize folder structure to remove obsolete _Win folderTomi Korpipaa2018-05-091-175/+261
| | | | | | | Task-number: QT3DS-1594 Change-Id: I2f4b1b5b7b38e56c38f7ed9bb7f2081924db660b Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Clean up Qt3DStudio.proMiikka Heikkinen2018-05-091-100/+92
| | | | | | | | | | Some headers were included two or even three times, and there were two separate HEADERS sections. Consolidated the sections, removed duplicates, and grouped related headers and sources together. Change-Id: I63e90651c2ee5ce8e9a8b16bfb64af60d73947a6 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* Support opening presentations from FinderTomi Korpipaa2018-05-091-0/+4
| | | | | | | Task-number: QT3DS-991 Change-Id: Icd4d3d2a7838ffd21a7a1a5b905edd3ac3f330fe Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* Merge remote-tracking branch 'origin/master' into wip/timelineMiikka Heikkinen2018-05-031-1/+6
|\ | | | | | | Change-Id: Ifbb90bc53b80e50a7015ed5862814f214cd95bea
| * Implement camera and lights perspective modeMäättä Antti2018-04-271-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Add visual representation for camera and lights. Add camera and light picking using billboards. Task-number: QT3DS-375 Task-number: QT3DS-376 Task-number: QT3DS-383 Change-Id: I36548a993aeeb44421a71d56248539687f2f3a68 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Timeline property graphKaj Grönholm2018-04-271-2/+4
| | | | | | | | | | | | | | | | | | Implement graph view for timeline properties. Appears and disappears with double-clicking the property. Also simplify animations. Task-number: QT3DS-1434 Change-Id: I21c1eb805048bcdf86e912d48ec84c493cb72e70 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Merge remote-tracking branch 'origin/master' into wip/timelineMiikka Heikkinen2018-04-231-3/+5
|\| | | | | | | Change-Id: I58176ea495831aee6eb35b9057bdecb6f3a6e1fe
| * Activate existing instance if desired presentation matchesMiikka Heikkinen2018-04-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | When starting studio with a command line parameter to launch a presentation, instead of launching a new instance, check if there is and existing instance already showing that presentation and activate it. Task-number: QT3DS-888 Change-Id: I0aa74e40d9796808eb8b07228e85f9dfb382952a Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
| * Remove LUATomi Korpipaa2018-04-191-1/+0
| | | | | | | | | | | | | | | | | | | | There are two files left with LuaSocket 3.0 license header. Should be checked if those are still needed or not. Task-number: QT3DS-12 Change-Id: Ifd3c7f7599a96e86addf18c7d9170c681dfecd93 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Add command line option to create a presentationTomi Korpipaa2018-04-131-2/+0
| | | | | | | | | | | | | | | | | | | | Repurpose "silent" option for creating new presentation without starting UI. Remove "test" option, as it does nothing. Task-number: QT3DS-887 Task-number: QT3DS-1421 Change-Id: Ic080905fdf5cf5f329778875aadfcbbbc936f8fa Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| * Implement gradient backgroundMäättä Antti2018-04-111-2/+4
| | | | | | | | | | | | | | | | | | | | Gradient background is drawn always in other modes than scene view. The gradient is never drawn on scene view. Task-number: QT3DS-375 Change-Id: I41b32a0997e5620e9498b2090899912e9a2e0cc9 Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Implement playhead and keyframe edit time dialogueMahmoud Ali2018-04-231-0/+1
| | | | | | | | | | | | | | Task-number: QT3DS-1451 Task-number: QT3DS-1426 Change-Id: If0f692d0fc626994dacacfff764c60d69fd39036 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Implement timeline tree navigation barKaj Grönholm2018-04-191-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Navigation bar is a "breadcrumb" UI to navigate between scene and sub components. Double-clicking a component icon makes that a timeline root item similarly to context menu "Edit Component". Task-number: QT3DS-1441 Change-Id: I1f9a7f3b45c0015e4b7d5fa6474d6d47bb19cd1b Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io> Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Move timeline context menu into own classKaj Grönholm2018-04-121-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Cleanup TimelineGraphicsScene by moving timeline context menu into own class similarly to RowTreeContextMenu. Also fix crashing when inserting keyframes into a property row, it will now do insert into property's parent row. Task-number: QT3DS-1373 Change-Id: I29d42ec88e5d4f44b759db4c49eb5e38ab9bded2 Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
* | Add context menu for timeline tree rowsKaj Grönholm2018-04-101-2/+4
| | | | | | | | | | | | | | Task-number: QT3DS-1410 Change-Id: I8f3c0edc9942a25ca2a581880dc8c2d6106c234d Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io> Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
* | Merge branch 'master' into wip/timelineMiikka Heikkinen2018-04-091-4/+6
|\| | | | | | | | | | | | | This merge loses datainput functionality in timeline toolbar. It needs to be readded in a separate commit. Change-Id: I92ca36e87718e9451b589465eb7ebbd801932820
| * Add "Create" to sub-presentation dialogTomi Korpipaa2018-03-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Previously it was very difficult to create new sub-presentations, as the flag for it was removed from file creation dialog. Now they can be created to the main presentation folder structure via the sub-presentation dialog. Task-number: QT3DS-1291 Change-Id: I4c347e6e3783d702f684535e2da5339c204c8e09 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>
| * Remove Qt3DSExceptionClass and files needed by itTomi Korpipaa2018-03-081-0/+1
| | | | | | | | | | | | Task-number: QT3DS-352 Change-Id: I0d84891f9d1e3124c1985d059c359b936d9e9099 Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 19:27:34 +0000