feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
84,490 Commits 108 Branches 368 Tags
3930deff2914c0440768bc81a109131e9a34f880
Commit Graph

28 Commits

Author SHA1 Message Date
Miikka Heikkinen
fc456a74d4 EffectMaker: Fix crash after opening saved effect when nodes exist 
Clear and removeAllNodes functions were consolidated into one clear()
function, which now properly resets the entire model. This makes UI
properly synced to actual model state when composition is opened, so
the phantom nodes will no longer appear.

Fixes: QDS-11347
Change-Id: I204760cca6af669daa43a18bfb199dfbf14b73cb
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
 2023-11-21 13:59:04 +00:00
Miikka Heikkinen
77678c7bce EffectMaker: Add clear all nodes button 
Fixes: QDS-11335
Change-Id: I5d0e0e11baabe780c19234410814a9f6eb45130d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-11-21 11:36:23 +00:00
Miikka Heikkinen
af656a3b53 EffectMaker: Fix copying asset files during export 
Fixes: QDS-11290
Change-Id: I54d7f618bcf1bed44d105ceb4e48fd6820d6b6ea
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-11-20 14:52:04 +00:00
Amr Essam
901b356ea5 EffectMaker: Fix incorrect QML parsed values 
Task-number: QDS-11296
Change-Id: I97d725271e61d4e14db23382ff7398353ced845d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2023-11-17 10:45:25 +00:00
Miikka Heikkinen
458d44fdc5 EffectMaker: Fix image path in generated effect qml 
Fixes: QDS-11293
Change-Id: I687e3038aa9a92c61955eda4532c2b672c2d6c4d
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-11-16 13:20:55 +00:00
Amr Essam
306ce4ab35 EffectMaker: Open saved compositions 
- Also fixing issues related to image paths
- Composition name is shown in save dialog when re-save
- Clear current composition for reset or open a new one

Task-number: QDS-11192
Change-Id: I97aad4b5216e6b116343bb274db0f9abd1275fec
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-11-15 14:29:52 +00:00
Miikka Heikkinen
6276658e52 EffectMaker: Update QSB tool parameters 
With updated parameters, same shader versions will be generated as
with the standalone effect maker tool.

Task-number: QDS-11194
Change-Id: Id7c0b36e7526a8e285d02b9102a65aac954b3d98
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-11-14 10:52:27 +00:00
Miikka Heikkinen
d0a7b9b359 EffectMaker: Fix qsb tool version parameter 
Change-Id: I4a1ceafba63d466d9cec555b332d6894b1016ba4
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-11-10 13:38:45 +00:00
Amr Essam
c946a30f36 QmlDesigner: Save effect resources 
Also effects are now can be dragged in the form editor

Task-number: QDS-10500
Change-Id: I5a701b8077231bcbb299c0c4f1cbf2f5173a14dd
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-11-09 23:05:34 +00:00
Amr Essam
0cbda147a8 QmlDesigner: Export effect maker composition qep project into assets 
Meanwhile, composition resources are not yet exported

Task-number: QDS-10500
Change-Id: I3687d1d62a64472c7ec84716c584dced5fbb6a85
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
 2023-11-09 10:02:19 +00:00
Amr Essam
0461af4b90 QmlDesigner: Fix texture not updating effect 
Task-number: QDS-11064
Change-Id: I39f9baa306af1ccd951f6ab3a4cc5c1b2a5e29f2
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
 2023-11-06 10:05:07 +00:00
Mahmoud Badri
eabebac670 EffectMaker: Enable the enable node feature 
Also corrected an include

Change-Id: I2c1c2385f30edbd6e5f53e81fc4794a0cc3e56d9
Reviewed-by: Amr Elsayed <amr.elsayed@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2023-11-02 10:51:43 +00:00
Amr Essam
3789277328 QmlDesigner: Sync compilation with add/remove composition nodes 
Now when there are no effects, default state is restored
Also some cleanups

Task-number: QDS-11064
Change-Id: Iad25adf2c0f855cb709c494d9f3eb47ef6207d36
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
 2023-11-02 10:42:54 +00:00
Amr Essam
4f2a062977 QmlDesigner: Create the composition stack with multiple effects 
Task-number: QDS-11064
Change-Id: I55fab43e572a989b450d4411f1208b959c4dd9c4
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-11-01 13:49:02 +00:00
Amr Essam
cfa46fa974 QmlDesigner: Fix textures not render in effect maker 
Task-number: QDS-11064
Change-Id: If300e61e389f66928787bf02273c9356a1a76185
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-10-30 08:53:12 +00:00
Amr Essam
a8ac61328b QmlDesigner: Fix effect maker colors not update shaders 
Also some minor fixes and cleanups

Change-Id: I3db71f41a703c19e53e2b7014de053a7759a4628
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-10-27 14:15:12 +00:00
Amr Essam
2473265541 QmlDesigner: Fix issues related to uniforms 
Some types were parsed wrong for shader values

Change-Id: I4301d671dfa7bde1f23feacd64ceb5f0f9d247b9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-10-26 18:19:35 +00:00
Amr Essam
a8ee60048c QmlDesigner: Fix important issues to Effect Maker 
A first shot of fixes

Change-Id: I7c175edb601fc5880805cd6496e7c8c8a10df33d
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-10-25 18:35:50 +00:00
Amr Essam
96dfdfc0b7 QmlDesigner: Fix some parsing issues in effect maker 
Task-number: QDS-10987
Change-Id: Ifeb42f9e04ba39ddaa45a03b60eb12ce1652c61a
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2023-10-20 11:45:44 +00:00
Amr Essam
12aeed97b3 QmlDesigner: Add effect maker runtime nodes binding mechanism 
Still some issues related to UI components because it's never tested
Also quick fix for generated paths on windows (not tested)

Task-number: QDS-10987
Change-Id: Ifed4b0f687e8da78206985e031692aa6c9faf947
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-10-19 10:20:35 +00:00
Amr Essam
d8bbbd2494 QmlDesigner: Compile effect maker shaders using qsb tool 
Task-number: QDS-10811
Change-Id: I6028dea262b2658838b59156ac062657cc4ef3f0
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-10-17 08:41:16 +00:00
Mahmoud Badri
c3e4258b78 EffectMaker: Clear composition nodes on view attach 
Fixes: QDS-10513
Change-Id: I3d2b1369c4e33fb6e21311c59a92625437382602
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2023-10-13 12:36:26 +00:00
Amr Essam
5cfc9734d6 QmlDesigner: Create temp files for generated shaders 
Also some cleanups regarding usage of QShaderTools

Task-number: QDS-10811
Change-Id: I655189e53a39e8342d849d3ffff0f89de9beb5e5
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
 2023-10-10 12:40:47 +00:00
Amr Essam
93ba99f019 QmlDesigner: Prepare the process to compile shaders externally 
Also added customValue for Uniform

Task-number: QDS-10811
Change-Id: Ie47ad41d0c80da149bdab9cae542297d59abcee6
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
 2023-10-10 08:39:45 +00:00
Amr Essam
340a1c1156 QmlDesigner: Generate the effect qml code 
Task-number: QDS-10811
Change-Id: I5f0e969ee21ae49580c2632da483f5701dab9c41
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
 2023-10-04 07:11:42 +00:00
Amr Essam
84bbfec651 QmlDesginer: Add functionality effect preview 
Also some refactoring and fixes to the model

Task-number: QDS-10811
Change-Id: If27b2e8e9bac4d46200ed37bf0aec8255ee19022
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-10-03 08:14:58 +00:00
Amr Essam
02abf29fa5 QmlDesigner: Complete shaders baking for effect maker 
Also add versioning support

Task-number: QDS-10499
Change-Id: If75222e3569d361b0d7bece70867e4020132c1bd
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Qt CI Patch Build Bot <ci_patchbuild_bot@qt.io>
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-09-25 10:03:59 +00:00
Amr Essam
7b183a774c QmlDesigner: Move effect maker to an independent plugin 
Task-number: QDS-10656
Change-Id: I1c1e67d3461650bfaec46ccc10b832effce76ad9
Reviewed-by: Mahmoud Badri <mahmoud.badri@qt.io>
 2023-09-18 13:23:06 +00:00