Commit graph

10180 commits

Author SHA1 Message Date
HellAholic
ae0fb7045f add temp shortcuts
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-08-27 15:21:16 +02:00
Remco Burema
85c7c75878 Emsmallen brush-size until we've properly optimized painting.
It's OK for the alpha.

part of CURA-12634
2025-08-27 13:30:50 +02:00
Remco Burema
c7d25242ed Fix square paint-brush/cursor being 45 degrees rotated.
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
done as part of CURA-12634
2025-08-27 11:30:01 +02:00
Remco Burema
a4c240dcff Deactivate paint-tool on preview mode activation.
Otherwise the paint-tool view will override the preview -- which is not ok.

done as part of CURA-12634
2025-08-27 10:50:29 +02:00
Remco Burema
af7e083745 Fix moving (paint) cursor also emitted scene-change.
This prevented slices from happening if the mouse-cursor came (even near) the model.

done as part of CURA-12634
2025-08-27 10:32:15 +02:00
Remco Burema
116be5e2bc Merge branch 'CURA-12663_paintbrush_preview' into CURA-12634_panda_painting_alpha 2025-08-26 17:19:28 +02:00
Remco Burema
14b4b34bfc Merge remote-tracking branch 'origin/CURA-12662_paint_splatter_issue' into CURA-12634_panda_painting_alpha 2025-08-26 16:59:39 +02:00
Remco Burema
ed6aa61931 Merge remote-tracking branch 'origin/CURA-12449_handling-painted-models-map' into CURA-12634_panda_painting_alpha 2025-08-26 16:30:24 +02:00
HellAholic
88b4b0729c
Merge branch 'main' into CURA-12661_make-more-global-paint-undo 2025-08-26 13:05:43 +02:00
HellAholic
a55cca73f4 Apply Review
clear_mask -> clear_texture_bit_mask
2025-08-26 13:05:56 +02:00
Remco Burema
10897e2b71 Painting: Show brush-preview when moving the mouse over.
CURA-12663
2025-08-23 22:42:47 +02:00
HellAholic
627e7f3c99
Merge pull request #20840 from Ultimaker/CURA-12660_painting-UI-improvements
Cura 12660 painting UI improvements
2025-08-21 09:58:53 +02:00
Remco Burema
fec24bfb19 Make sure the paint-strokes are as solid as before.
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
For fixing the paint-splatter issue Iswitched to a new way of drawing the polygon, which could result in missed strokes of pixels at the edge of (UV) polygons. This change should catch most of the remaining X% where that happened.

done as part of CURA-12662
2025-08-20 16:38:02 +02:00
Remco Burema
8bab847594 Remap-barycentric was slowing things down; optimize.
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
It was using the old (well, relatively speaking ... from the start of development of the current paint-epic) getIntersectRatioViaPt (three times no less), which was massive overkill for what we're trying to accomplish here.

done as part of CURA-12662
2025-08-20 15:13:03 +02:00
Remco Burema
1f60829959 Cleaning, small optimizations.
part of CURA-12662
2025-08-20 09:21:04 +02:00
Remco Burema
9bc1294ce1 Remove useless parameters (use already cached values instead).
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
part of CURA-12662
2025-08-19 09:08:09 +02:00
Remco Burema
28dc0cd32a PaintTool: Optimization refactors.
Don't have so many function-calls in performant code and cache camera-related variables until the camera moves again.

part of CURA-12662
2025-08-19 08:55:55 +02:00
Remco Burema
d339e092e7 Painting: Make fill-polygon miss less gaps.
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
... but one of the problems is that it doesn't give an outline.

part of CURA-12662
2025-08-18 22:35:18 +02:00
Remco Burema
6da4ca66a8 Painting: Have a sensible coordinate system.
Using the camera is more standard, and while it has some downsides ('smearing'/large skews on surfaces angled away from the camera) it seems to have the least quirks (or at least ones that users are used to already). -- Also the what was here previously was just wrong, I'm just saying it could in theory have been solved the way I originally wanted to, but that'd take a long time to get completely right and efficient.

part of CURA-12662
2025-08-18 21:05:09 +02:00
Remco Burema
b091cc23a1 Have the projection of the paint-stroke involve the camera after all.
This fixes the issue that it wouldn't flood over the 'rim' whenever the endpoints of a stroke was wholly within one plane, but the stroke itself would overlapp another. Plus also handle click on single point and use transformed mesh consistantly.

part of CURA-12662
2025-08-14 14:30:12 +02:00
Remco Burema
392e614887 Get PaintTool in a working state again after rewrite of projection.
Various fixes applied; method of drawing changed a bit (use qpath, otherwise we can't fill, right-size the brush in various ways (w/h of UV-canvas taken into account, fix that 'stroke-coords' are _yet another_ coord system instead of the same as one of the existing) also, with the stroke; fix that it should have been a convex hull of the union, not a convex hull of the intersection -- also take the scale of the model into account (which we need to) (but this has a side-effect in that the brush is now always the same size, regardless of which size the object is -- makes sense, but not 100pct sure if wanted) -- various other things cleaned up etc.

part of CURA-12662
2025-08-13 11:09:57 +02:00
Remco Burema
4f465bc30f Merge remote-tracking branch 'origin/CURA-12660_painting-UI-improvements' into CURA-12662_paint_splatter_issue 2025-08-12 20:31:50 +02:00
Remco Burema
a746a60afb Intersection each polygon with the stroke; paint that instead of dumping it to UV directly.
This prevents 'paint splatter', that is, previously, we had just a begin and an end point (actually we had a temp stopgap that iterated per triangle, but similar problems persisted), which we then mapped directly to UV and drew the stroke in that space. This causes the stroke to overlap parts of the UV-map that it didn't touch in 3D at all.

Now, we instead gather each triangle, map that to the estimated stroke plane, intersect the result with the stroke-shape, then map the resulting polygon back to UV-space.

At the moment this code isn't fully working yet -- but I solved all of the obvious things that can be wrong, and it could partially be that I based this branch off of a moment in time the other branch wasn't functionally properly.

part of CURA-12262
2025-08-12 19:29:43 +02:00
HellAholic
966ca502d9
Merge pull request #20797 from Ultimaker/CURA-11810_fix-mac-dialogs
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
Scorecard supply-chain security / Scorecard analysis (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
CURA-11810 fix mac dialogs
2025-08-11 14:24:27 +02:00
Erwan MATHIEU
175a72e12b Fix direct import
CURA-12584
2025-08-08 08:32:09 +02:00
Erwan MATHIEU
88ab3c1732 Fix crash when trying to clear material painting
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12585
2025-08-07 11:19:14 +02:00
Erwan MATHIEU
3927b5e379 Merge branch 'CURA-12661_make-more-global-paint-undo' into CURA-12449_handling-painted-models-map 2025-08-07 11:15:49 +02:00
Erwan MATHIEU
243b7c56a6 Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12661_make-more-global-paint-undo
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-08-07 11:08:49 +02:00
Erwan MATHIEU
db514f0be7 Properly prepare the model for painting
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12660
The UV-unwrapping is now done in a background job, and the UI displays a waiting state. This fixes the issue where the user would start painting but the model was not ready yet, and the first stroke would be missing.
2025-08-07 11:03:51 +02:00
Erwan MATHIEU
8a59faceb1 Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12661_make-more-global-paint-undo
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
2025-08-06 16:39:49 +02:00
Erwan MATHIEU
08a9bbe52c Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12449_handling-painted-models-map
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
2025-08-06 16:34:41 +02:00
Erwan MATHIEU
e69a436942 Fix sometimes wrongly displayed view
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12660
This required a refactoring of the management of the active view. The previous behavior was that anyone could set the active view, depending on certain conditions. But now we also have a view that is set by a tool, so sometimes the actually set view would be incorrect. Now each Stage requests an active view, and each tool CAN also request an active view. Then the Controller decides which view should actually be active depending on the active stage and tool.
2025-08-06 16:15:05 +02:00
Erwan MATHIEU
2e8cc4da82 Fix display not updating when changing tool
Some checks failed
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
conan-package-resources / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
CURA-12660
Previous fix caused issues when moving to preview
2025-08-05 16:10:57 +02:00
Erwan MATHIEU
310128d87e Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12449_handling-painted-models-map 2025-08-05 15:57:57 +02:00
Erwan MATHIEU
cf24ed91e9 Improve fix for opacity issues
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12660
Previous fix caused issues when moving to preview
2025-08-05 15:55:23 +02:00
Erwan MATHIEU
c75c668604 Allow user to display and select material color painting
CURA-12584
2025-08-05 15:34:57 +02:00
Erwan MATHIEU
9e186af74b Merge branch 'CURA-12660_painting-UI-improvements' into CURA-12449_handling-painted-models-map 2025-08-05 14:08:45 +02:00
Erwan MATHIEU
9d97eb7d59 Fix sometimes wrong painting color display
CURA-12660
2025-08-05 14:07:44 +02:00
Erwan MATHIEU
3670c46b9e Merge remote-tracking branch 'origin/main' into CURA-12449_handling-painted-models-map 2025-08-04 16:19:03 +02:00
Erwan MATHIEU
b5e2ce6168 Restore disabled support painting
CURA-12661
2025-08-04 16:07:49 +02:00
Erwan MATHIEU
8f9a17d49e Simplify QML code
CURA-12661
2025-08-04 16:03:09 +02:00
Erwan MATHIEU
586c2939a6 Enable undo/redo buttons when appropriate
CURA-12661
2025-08-04 15:46:51 +02:00
Erwan MATHIEU
53ef6fbdf3 Merge remote-tracking branch 'origin/CURA-12660_painting-UI-improvements' into CURA-12661_make-more-global-paint-undo 2025-08-04 15:29:15 +02:00
Erwan MATHIEU
9685764721 Implement undo-redo by full stroke
CURA-12661
2025-08-04 15:19:04 +02:00
Erwan MATHIEU
63843b59c4 Merge remote-tracking branch 'origin/main' into CURA-12660_painting-UI-improvements
Some checks failed
conan-package-resources / conan-package (push) Has been cancelled
conan-package / conan-package (push) Has been cancelled
printer-linter-format / Printer linter auto format (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
conan-package-resources / signal-curator (push) Has been cancelled
2025-08-04 11:55:26 +02:00
Erwan MATHIEU
44d6c0a969 Call SolidView dynamically instead of by inheritance
CURA-12660
The previous method actually doesn't work when Cura is packaged because the plugins paths change. This method is much safer, and uses the actual SolidView instance.
2025-08-04 11:28:31 +02:00
Erwan MATHIEU
e742ca81f3 Fixed more possible crashes
CURA-12528
2025-08-04 10:24:29 +02:00
Erwan MATHIEU
6547eb6ff3
Merge branch 'main' into CURA-12660_painting-UI-improvements 2025-08-04 08:46:04 +02:00
Erwan MATHIEU
78daa94ebf Save and restore painting tool settings
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12660
2025-08-01 17:08:53 +02:00
Erwan MATHIEU
ab58dec5d1 Fix unability to paint with visible message box
CURA-12660
When a message box is displayed, some offscreen rendering passes (face selection) render an unpredictable result and we are unable to start painting.
This went through a refactoring of the rendering passes. Since doing the offscreen rendering outside the Qt rendering loop caused some troubles, we now use the rendering passes only inside the Qt rendering loop, so that they work properly. Tools also have the ability to indicate which extra passes they require, so that we don't run all the passes when they are not required.
Since this issue also concerns the support blockers placement and rotation by face selection, they have been updated so that they now also always work.
The face selection mechanism using the Selection class was partially working and used only by the rotation, so now it has been deprecated in favor of the new mechanism.
2025-08-01 13:10:03 +02:00