Commit Graph

21 Commits

Author SHA1 Message Date
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