| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
Also removed a previous hot fix (QT3DS-2768) and some cleanups in the
undo/redo system.
Task-number: QT3DS-2827
Change-Id: Id1bb8e89c4121dd3cf447bf29c1a0d02d034e247
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A chooser is considered out of context when the property the chooser
was opened for no longer has visible control for it.
This change should ensure that user can never interact with
invalid properties via the chooser dialogs.
Task-number: QT3DS-2836
Change-Id: I6fca811cfccda0b0b4fbc0feb17935c3949f4f9f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
| |
Also prevent adding duplicates to the file change list
Task-number: QT3DS-2768
Change-Id: I3e3f2869f6bb215ce86425a5ea25f7ea07fdffdc
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
| |
Also renames *.material files to *.shader files inside the Material
Library.
Task-number: QT3DS-2787
Change-Id: Iaa3e64fae934b526ad0903c19d3cdb2b6923cc95
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-2750
Change-Id: Id301d9775f2d102911bcc3696dd55d0cfee9d6e5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- add tooltips
- keep current controller datainput always visible regardless of filtering
- add "(Current)" after the datainput name to indicate that it is not
filtered due to being the active controller
- change datainput selector code to follow _parentView naming convention
- update selection on datainput rename
- react properly to "Delete" key
Change-Id: I7ec47f32ebd01cfa10b243544a2a0dde7c0d07e7
Task-id: QT3DS-2718
Task-id: QT3DS-2719
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The paths were changed to always be relative to project file in
materialdef files. The default texture paths of materials and
effects are converted to presentation relative when an instance
is made out of them to keep paths consistent in presentations.
Importing materialdef file now imports all referenced assets,
including default assets of the shader.
In-use highlighting in project panel got fixed alongside import fixes
as they use same mechanism to determine referred assets.
Task-number: QT3DS-2656
Task-number: QT3DS-2657
Change-Id: I473e77ab5d76328c642dc16fc3a3b4016bf85313
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-2640
Change-Id: Iab9c2019cfd38f5cd34c0d4f7fb05f7c2b51ee69
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Now the chooser dialogs stick around until you doubleclick on item
or they lose focus naturally. Also fixes some related issues like
fixed choices never highlighting as selected.
Task-number: QT3DS-2655
Change-Id: I33b42383a303f9ba2ae10e1b7e3131e4bfd0c62f
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Change-Id: Ia181b9d1bda360fddbf1e01568b009b0f406c33f
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
| |
- New layout for management dialog
- Filters and search for datainput select/replace list
Change-Id: Idbfa26f1bb59a2d6185a9ad803b4be623db9b30d
Task-id: QT3DS-2513
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-2108
Change-Id: I12e5cb9e264600d55850a8ae7423b50c0eb9da31
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-2108
Change-Id: Iefc7a0054a1c506b19a3c1cafa45093cd6b0fd70
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Removes materials and children of materials from the source path
listings if inside the material container and not referenced by anything
outside the container. Unused shared materials are also now removed from
the presentation upon saving. Some functions are also moved from the
DocumentEditor to the ClientDataModelBridge.
Task-number: QT3DS-2473
Change-Id: I4a0f1744a677c5ed64ffa4f0f0e91a43f7b0bafc
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Introduced new options for CDialogs::showWidgetBrowser alignment:
Combobox, ToolButton, or Center. Combobox is the default and positions
the popup as it has before, which is suitable for comboboxes.
ToolButton alignment positions the corner of the popup over the
toolbutton and prefers to open the popup above rather than below.
Center alignment simply centers the popup on given point.
Task-number: QT3DS-2504
Change-Id: Ibca6895010baec19508259eb6b3976b6082740e9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Made StudioUtils a class of static functions instead of global
functions. Also cleaned up the code a bit where changes happened
because of this change.
Change-Id: Ic583dd25bf228c7e344be6664b6651958d84906e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
- You can now drag images from the project palette to the timeline
rows. Supported drop rows are layers, materials and images.
- Relevant tweaks.
Task-number: QT3DS-2267
Change-Id: I0646b47d31e38c89fe95461c7f2fb040a479b43e
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- A lot of CString, CFilePath, and Qt3DSFile occureneces and their
relevant code has been removed to save the costy back and forth
conversion between CString and QString.
- Renovated several classes as part of the process (Preferences
classes, recent items, build configuration, probably few more)
- Assorted tweaks here and there
Task-number: QT3DS-1899
Task-number: QT3DS-2455
Change-Id: Ibbf4c3b7ab0b9fe6e19d8aed822fa29d43b99086
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
- When setting a ref material, show the parent of the referenced
material between brackets in the combobox.
- Fix ref material popup not closing when selecting an item.
Task-number: QT3DS-2312
Change-Id: I206fae2de1b5a37bf3b15a6f43ce137aeb279d13
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
| |
- Corrected refreshing sub-presentation id(s) in the inspector when the
project file is edited externally.
- removed 1 method.
Change-Id: Ia039e313e846ce4edbc34799a4123b45d7b52064
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
| |
Right-clicking a property in the inspector allows opening the instance
referenced by the property.
Task-number: QT3DS-2370
Change-Id: I6bb814242bca6043e97524bf72d35271fadaaad3
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|\
| |
| |
| | |
Change-Id: I7a48e08645eb6817f1027ad9e0f9143cb11617c2
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
InspectorControlView::showDataInputChooser() returned a pointer to
DataInputSelectView instance, which caused the ownership of it to
transfer to QML engine. In general, when a plain QObject pointer is
returned from C++ side to QML, the QML engine assumes ownership of said
object unless ownership is explicitly retained on C++ side using
QQmlEngine::setObjectOwnership(). Since we did't use the returned
pointer from InspectorControlView::showDataInputChooser, I simply
removed the return value to retain the ownership on C++ side.
Task-number: QT3DS-2127
Change-Id: I5c10b5e4dbd3468015f96a87aa14365672bc93c2
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
Task-number: QT3DS-2124
Change-Id: Id946681a8a439a455abf3acbd125e0419b583397
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A file format with extension ".matdata" now holds material values for
standard and custom materials. A hidden object is created for each
layer. The hidden objects contain all the material nodes that are
created from the .matdata files. The objects in the scene can refer to
these hidden materials or use the previous ways provided by the editor.
This commit also enables editing the original material properties from
the referenced material. By default inserted object also have referenced
materials including imported models.
Task-number: QT3DS-2108
Change-Id: I09e97b2e14f81f66e60ec8a4d0c585f9135d7d3b
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Subpresentations can now be selected as images from image chooser.
Selecting a subpresentation will show it also as the image
property value of the material. Manually setting subpresentation
from image properties is disabled, though the value is still shown.
Task-number: QT3DS-2090
Change-Id: Ie02898c0e111c16b2b27368b03901d2adc20fa91
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Color dialog selection only affects the selected property
- Timebar color setting is now actually committed
- Canceling color dialog when setting color property value in action
palette now restores the old color
Task-number: QT3DS-2080
Change-Id: I67f6869f59c1840d76edcbaff5f9026cb3e00194
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Previously the path was relative to presentation, which typically
meant it was always prefixed with ../, which is not visually nice and
might be confusing.
Task-number: QT3DS-2056
Change-Id: I51816bc3f5e260f48ffbf0c2df7815356eed0db5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Changed the project name and path types to QString instead of the
notorious CString and CFilePath. Removed 2 member variables and a
method. Also improved the conversion from absolute to relative paths.
Task-number: QT3DS-2001
Change-Id: I79619ca2aebd21e5e29abc219a62831ee2117be4
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Task-number: QT3DS-2057
Change-Id: I6b2456b20cb853d5d6a054abed976b18d721b5e2
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- 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>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Show what is about to be deleted/duplicated
- Properly enable delete/duplicate items
- Action delete/copy/cut/paste is now fully contained in action view
- Every view and player window indicates when they are activated
(i.e. mouse is pressed on them) so we can track the context reliably
even when menu steals the focus. Required for slide duplicate/delete
enabling in edit menu.
Task-number: QT3DS-1911
Task-number: QT3DS-1958
Change-Id: Icf0bb173809740dd709b9e0525735de7aecba617
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- When adding a new data input the type is set correctly even if you
don't touch the type combo.
- When adding a new data input from popup menu for property, timeline,
or slide panel, the corresponding data input is not changed if the
new data input is of unsuitable type.
- Correct default type is shown for each property when setting data
input from inspector panel.
Task-number: QT3DS-1913
Change-Id: I704cb704fb1ec9aca916ed7f7542ace404bba77c
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Iterates through the presentation and checks if datainput control bindings
are using a valid datainput. If datainput definitions are missing, shows
a dialog that allows the user to automatically remove invalid bindings.
Task-ID: QT3DS-1658
Change-Id: I11db40813c8a7368b05f0a8b377472a9e0b1db12
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
- Unified various showBrowser functions under CDialogs as
showWidgetBrowser
- Fixed showWidgetBrowser logic to correctly determine browser
popup position in all screens
- Fixed startup dialog position when editor is maximized and on
a secondary screen
- Removed a few superfluous global utility functions.
Task-number: QT3DS-1545
Change-Id: Ia8c526d14d8b15b649600d71474f1ba29657c00e
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Layout changes in Inspector Panel and Datainput management dialog. Open
directly dialog for adding datainput when option "[Add new..." is selected
from datainput selector. Show datainput type in datainput selector.
Change-Id: I2e82cb2c10720d96b34a7e500f71dc86162a3003
Task-Id: QT3DS-1422
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
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>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Adds Float, Boolean, Vec3 and Variant datatypes. Adds support in Inspector
panel for toggling control on for all properties. (No user-visible changes
in inspector panel as properties are not yet set to controllable in
metadata.xml.)
Runtime handling will be implemented in a separate commit.
Task-id: QT3DS-1309
Change-Id: I6dd269ccd0e0bab308547980d02d2d10bf992ddd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1320
Change-Id: If50eb65bcae06eecc52fd9b4ca20fb28016c9a5a
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Antti Määttä <antti.maatta@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Enables choosing trigger/target objects for Actions from the
entire scene graph for the active slide. Also recreate Alias reference
selection list when user enters/leaves a component.
Change-Id: I3b66bf6a93296b5fef6168f1de8341bdd1284b11
Task-id: QT3DS-1278
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
| |
Fixes selection window stealing focus. UX changes. Code repartitioning in
InspectorControlView/Model.
Change-Id: I28bcaec1825c4e375955eeffe191a89de7b6cfe2
Task-id: QT3DS-1249
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
UI panel incorrectly showed absolute paths even if user selected relative
path as reference type. Also, fixed references being reset from
"Unknown" to action owner object after pasting an action, opening the
object reference selector and closing it without making a selection. Fixed
actionview not updating reference type when changed from object selector.
Note that UIP file might still save path references in notation "#name"
if the object name is unambiguous, regardless of what is shown in the
object selector dialog.
Change-Id: I68a79d2f52cc6b1ed04f2b5b60f10a057dc52360
Task-id: QT3DS-153
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1107
Change-Id: I8396036986ff6d3622260fba6ecb9d72c3975abf
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Data input connection always used the handle and instance values that
were used when the connection was established. Also changed it so that
callback from selection dialog only comes when user changes the
selection instead of getting one during dialog setup.
Task-number: QT3DS-1056
Change-Id: Ic4d6bf78ebba5859f55c69f946bc10d7b8154a06
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
|
| |
Task-number: QT3DS-1047
Change-Id: I1976f8b91fc1d48dafbae0f1d01367590cab6e92
Reviewed-by: Janne Kangas <janne.kangas@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|
|
|
|
|
|
| |
Task-number: QT3DS-976
Change-Id: I439a8789fe0421772ae395ee58d14ad8b771e937
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
|
| |
Inspector palette had a different look to its data input chooser than
the other two. Also updated the look of the dialog, and now it is shown
next to the data input icon, instead of in the middle of the screen.
Task-number: QT3DS-950
Change-Id: I48e16c3b26066e06dba16c106e93f986e1523558
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
|
|
|
|
|
|
|
|
|
| |
Also make tooltip appear in inspector panel when mouse is hovered over
DataInput button.
Change-Id: If23e967ef3d865b4ade4be23a47a51f09d2a7140
Task-id: QT3DS-881
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
|