3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2026-02-27 14:55:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
37210 commits 362 branches 338 tags 732 MiB
Commit graph

118 commits

Author SHA1 Message Date
Erwan MATHIEU
508886cac7 Merge remote-tracking branch 'origin/5.11' into CURA-12740_multi-material-with-ex2 2025-10-03 12:22:03 +02:00
Erwan MATHIEU
465831ce28 Remove leftover code 
CURA-12740
 2025-10-03 12:09:51 +02:00
Erwan MATHIEU
6ccd0b3b2b Properly display model extruder when it has no paint data 
CURA-12740
 2025-10-03 12:00:54 +02:00
HellAholic
230c323709
Merge branch '5.11' into CURA-12740_multi-material-with-ex2
Some checks are pending
conan-package / conan-package (push) Waiting to run
Details
unit-test / Run unit tests (push) Waiting to run
Details
2025-10-02 14:01:22 +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
Details
unit-test / Run unit tests (push) Has been cancelled
Details
2025-10-02 13:21:27 +02:00
Erwan MATHIEU
495a367539 Optimize painting operations 
CURA-12743
 2025-10-02 12:05:39 +02:00
Erwan MATHIEU
05b3aeb2bd Pre-cache faces connectivity during prepare job 
CURA-12743
This avoids a huge slowdown when starting to paint
 2025-10-01 16:38:50 +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
HellAholic
0c0d9e591c
Merge branch '5.11' into CURA-12749_replace-the-placeholder-paint-tool-icon-with-a-brush
Some checks failed
conan-package / conan-package (push) Has been cancelled
Details
unit-test / Run unit tests (push) Has been cancelled
Details
2025-10-01 10:27:21 +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
9bf79cf762 Set brush icon for painting feature 
CURA-12749
 2025-09-30 11:10:03 +02:00
HellAholic
635ae45b5e
Merge branch '5.11' into CURA-12732_fix_slice_paint_hover 2025-09-30 10:50:22 +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
Details
unit-test / Run unit tests (push) Has been cancelled
Details 
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
Erwan MATHIEU
a59481f913 Simplify objects undo stacks management 
CURA-12740
 2025-09-29 10:23:48 +02:00
Erwan MATHIEU
9fa9a7395b Handle material painting i.r.t to affected object extruder 
CURA-12740
 2025-09-29 10:06:39 +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
b5f510face Fix painting when switching between printers with different number of extruders 
CURA-12730
We now always allocate a data range for all possible extruders (16) instead of only the ones the actual printer can support.
 2025-09-24 16:25:23 +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
2eaa4fb820 Make sure paint commands only change their feature
Some checks are pending
conan-package-resources / conan-package (push) Waiting to run
Details
conan-package-resources / signal-curator (push) Blocked by required conditions
Details
conan-package / conan-package (push) Waiting to run
Details
unit-test / Run unit tests (push) Waiting to run
Details 
CURA-12731
 2025-09-22 14:34:39 +02:00
Erwan MATHIEU
a2db7b3004 Fix clear painting with optimized painting mechanisms 
CURA-12731
 2025-09-22 11:40:56 +02:00
Erwan MATHIEU
4c92ce6644 Fix crash after loading a second model for painting 
CURA-12731
 2025-09-19 16:16:47 +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
0a133ff92c Fix shader compatibility
Some checks failed
conan-package / conan-package (push) Has been cancelled
Details
unit-test / Run unit tests (push) Has been cancelled
Details 
CURA-12662
 2025-09-19 10:28:20 +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
Details
unit-test / Run unit tests (push) Waiting to run
Details
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
Details
unit-test / Run unit tests (push) Has been cancelled
Details 
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
Details
unit-test / Run unit tests (push) Has been cancelled
Details 
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
Details
unit-test / Run unit tests (push) Has been cancelled
Details 
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
Details
unit-test / Run unit tests (push) Waiting to run
Details
conan-package-resources / conan-package (push) Has been cancelled
Details
printer-linter-format / Printer linter auto format (push) Has been cancelled
Details
conan-package-resources / signal-curator (push) Has been cancelled
Details 
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
Details
conan-package / conan-package (push) Has been cancelled
Details
printer-linter-format / Printer linter auto format (push) Has been cancelled
Details
unit-test / Run unit tests (push) Has been cancelled
Details
conan-package-resources / signal-curator (push) Has been cancelled
Details 
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
Erwan MATHIEU
e2b19731ab
Merge branch 'main' into CURA-12449_handling-painted-models-map
Some checks are pending
conan-package-resources / conan-package (push) Waiting to run
Details
conan-package-resources / signal-curator (push) Blocked by required conditions
Details
conan-package / conan-package (push) Waiting to run
Details
printer-linter-format / Printer linter auto format (push) Waiting to run
Details
unit-test / Run unit tests (push) Waiting to run
Details
2025-09-11 09:00:07 +02:00
HellAholic
02dbc7e6e1 add temp shortcuts
Some checks failed
conan-package / conan-package (push) Has been cancelled
Details
unit-test / Run unit tests (push) Has been cancelled
Details
2025-08-27 15:02:22 +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
Remco Burema
fec24bfb19 Make sure the paint-strokes are as solid as before.
Some checks failed
conan-package / conan-package (push) Has been cancelled
Details
unit-test / Run unit tests (push) Has been cancelled
Details 
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
Details
unit-test / Run unit tests (push) Waiting to run
Details 
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
Details
unit-test / Run unit tests (push) Waiting to run
Details 
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
Details
unit-test / Run unit tests (push) Waiting to run
Details 
... 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