Commit graph

81 commits

Author SHA1 Message Date
Erwan MATHIEU
8254c64488 Merge remote-tracking branch 'origin/5.11' into CURA-12752_multimat_paint_prime_tower
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-10-13 14:40:33 +02:00
Erwan MATHIEU
b30a2407d6 Only display paint view in Prepare stage
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
CURA-12750
2025-10-07 16:40:01 +02:00
Remco Burema
107c3503d7 Merge remote-tracking branch 'origin/5.11' into CURA-12752_multimat_paint_prime_tower 2025-10-07 11:34:01 +02:00
Erwan MATHIEU
cb2e1eddcc Invalidate slice when using undo/redo/clear paint actions
CURA-12763
2025-10-07 09:46:50 +02:00
Erwan MATHIEU
d315e0a727 Handle group selection as multi-selection w.r.t painting
CURA-12761
2025-10-06 12:31:16 +02:00
Erwan MATHIEU
02d5612b58 Merge remote-tracking branch 'origin/5.11' into CURA-12743_slow-performance-while-painting
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
2025-10-02 13:21:27 +02:00
Erwan MATHIEU
495a367539 Optimize painting operations
CURA-12743
2025-10-02 12:05:39 +02:00
Remco Burema
f910983616 Spam the signals a bit less.
done as part of CURA-12752
2025-10-01 23:12:27 +02:00
Erwan MATHIEU
7504c8be89 Remove getting the faces under the cursor area
CURA-12743
2025-10-01 16:29:45 +02:00
Erwan MATHIEU
e8152bf047 Do the cursor projection using uvula
CURA-12743
2025-10-01 11:44:14 +02:00
Saumya Jain
d86984aca7
Merge branch '5.11' into CURA-12737_model-rotation-stops-over-model-with-painting 2025-09-30 15:28:27 +02:00
Erwan MATHIEU
428faa5777 Do not block rotation while painting is active
CURA-12737
2025-09-30 09:52:19 +02:00
Remco Burema
6b6200fc94 Remove spurious method, handle the expected way.
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
This was basically already possible, no need to add an extra method.

done as part of CURA-12732
2025-09-30 09:14:02 +02:00
Remco Burema
cd2d30fd82 Fix moving (paint) cursor also emitted scene-change.
This prevented slices from happening if the mouse-cursor came (even near) the model.

originally done as part of CURA-12634 -- attempt to cherry-pick and subsequent rework later for CURA-12732
2025-09-25 12:19:15 +02:00
Erwan MATHIEU
b3ea674251 Use per-object undo-redo stacks for painting
CURA-12731
2025-09-22 15:54:32 +02:00
Erwan MATHIEU
a2db7b3004 Fix clear painting with optimized painting mechanisms
CURA-12731
2025-09-22 11:40:56 +02:00
Erwan MATHIEU
6cf1f2df2a Optimize painting display performance
CURA-12731
2025-09-19 16:01:41 +02:00
Erwan MATHIEU
8e5e655fe0 Merge remote-tracking branch 'origin/main' into CURA-12662_paint_splatter_issue 2025-09-19 13:39:15 +02:00
Erwan MATHIEU
9ee0169410 Merge remote-tracking branch 'origin/CURA-12662_paint_splatter_issue' into CURA-12663_paintbrush_preview
Some checks are pending
conan-package / conan-package (push) Waiting to run
unit-test / Run unit tests (push) Waiting to run
2025-09-18 15:57:57 +02:00
Erwan MATHIEU
889e65e11d Optimize polygons projection
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12662
Use a numpy-vectorized function to process the barycentric projection, this is much faster
2025-09-18 15:51:09 +02:00
Erwan MATHIEU
cf1486b880 Merge polygons rasterization to common function
CURA-12662
2025-09-17 13:27:27 +02:00
Erwan MATHIEU
188109c41e Optimize painting by getting the list of painted faces
CURA-12662
2025-09-17 09:18:24 +02:00
Erwan MATHIEU
8382a96f05 Optimize painting
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12662
2025-09-15 16:10:19 +02:00
Erwan MATHIEU
a6a560b93d Display exact paint cursor
Some checks failed
conan-package / conan-package (push) Has been cancelled
unit-test / Run unit tests (push) Has been cancelled
CURA-12663
2025-09-15 14:39:50 +02:00
Erwan MATHIEU
0830fd23ce Fix cursor display
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-12663
2025-09-15 09:18:58 +02:00
Erwan MATHIEU
24721fbec6 Merge branch 'CURA-12662_paint_splatter_issue' into CURA-12663_paintbrush_preview 2025-09-15 09:17:10 +02:00
Erwan MATHIEU
b88e46dd5e Fix variable and add exception log
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
CURA-12688
2025-09-12 16:32:55 +02:00
Erwan MATHIEU
08eac57c04 Merge remote-tracking branch 'origin/main' into CURA-12662_paint_splatter_issue 2025-09-12 16:15:25 +02:00
Remco Burema
10897e2b71 Painting: Show brush-preview when moving the mouse over.
CURA-12663
2025-08-23 22:42:47 +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
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
c75c668604 Allow user to display and select material color painting
CURA-12584
2025-08-05 15:34:57 +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