76 Commits

Author SHA1 Message Date
Filip Sykala - NTB T15p
4bfcbdb019 Put together final_shape and flag final shape is healed.
+ Regenerate final shape on reload from disk
2023-11-02 09:05:15 +01:00
Filip Sykala - NTB T15p
fa09f03c6a Unify behavior of union for import and add volume
Add cache for final ExPolygons
2023-10-27 08:55:47 +02:00
Filip Sykala - NTB T15p
82182ac8b8 Propagate warnings about unhealed shape to UI. 2023-10-16 11:44:08 +02:00
Filip Sykala - NTB T15p
4724d6791a Refactor of Intersection of lines to use AABB Tree and retur also inces of intersected lines
Refactor Emboss to remove priv namespace
heal_polygons function got parameter for count of heal iteration of final ExPolygons
heal_polygons return whether heal was successfull or not
2023-10-12 14:40:38 +02:00
Filip Sykala - NTB T15p
70460ae790 Fix Healing of SVG shape for overlapped contour points in thin "bay".
SVG from @LukasMatena
2023-10-11 15:01:29 +02:00
Filip Sykala - NTB T15p
3421a9298a Remove depricated variable
+ read old staff in separate 3mf function
2023-09-13 11:56:37 +02:00
Filip Sykala - NTB T15p
ca71305c75 Merge branch 'master' into fs_svg
# Conflicts:
#	src/slic3r/Utils/EmbossStylesSerializable.cpp
#	src/slic3r/Utils/EmbossStylesSerializable.hpp
2023-09-04 13:33:22 +02:00
ps_copyright
f32859c302 final copyright headers 2023-09-01 14:49:07 +02:00
Filip Sykala - NTB T15p
96618d684f Emboss Stroke(contour of paths from svg)
Do not support yet:
 - Markers(start sybol, end symbol, middle symbols)
 - Dashes
2023-08-31 16:41:21 +02:00
Filip Sykala - NTB T15p
b699e6da9b Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg
# Conflicts:
#	src/libslic3r/Emboss.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
#	src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp
#	src/slic3r/GUI/TextLines.cpp
2023-08-08 17:13:15 +02:00
Filip Sykala - NTB T15p
36d5353c67 Vertical alignemnt center is now in 1/3 of the font ascent
Default vertical alignement is center (for closer result to previous unaligneg version)
2023-08-07 15:59:55 +02:00
Filip Sykala - NTB T15p
b71cb25163 Run able fix after merge(still issue with scale for per glyph transformation) 2023-06-07 11:19:28 +02:00
Filip Sykala - NTB T15p
e831255018 Merge branch 'fs_dir_per_glyph_SPE-1597' into fs_svg
# Conflicts:
#	src/libslic3r/Emboss.cpp
#	src/libslic3r/Format/3mf.cpp
#	src/libslic3r/TextConfiguration.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoEmboss.hpp
#	src/slic3r/GUI/Jobs/EmbossJob.cpp
#	src/slic3r/GUI/Jobs/EmbossJob.hpp
2023-06-07 11:18:26 +02:00
Filip Sykala - NTB T15p
331bfaa556 Fix position of base line for per glyph position to be on the half of ascent in all vertical alignment 2023-05-26 19:44:32 +02:00
Filip Sykala - NTB T15p
4be73de02f Partialy fix align:
whitechar in center
enters at begining
enters at end
Align
2023-05-19 14:11:15 +02:00
Filip Sykala - NTB T15p
50f09a751b Use surface when emboss per letter. 2023-05-10 16:08:49 +02:00
Filip Sykala - NTB T15p
43294950bd Per letter emboss with align 2023-05-09 13:00:49 +02:00
Filip Sykala - NTB T15p
28b526167a Add text alignement 2023-05-04 19:13:13 +02:00
Filip Sykala - NTB T15p
af0ef21ce3 Emboss text along base line(object cut)
- need alignment of text(center, left, right)
- (NOTE) edit text change its position
+ add polygon point
2023-05-04 11:57:33 +02:00
Filip Sykala - NTB T15p
7fa1e39fec One GLModel for all lines 2023-05-02 12:26:58 +02:00
Filip Sykala - NTB T15p
b7549ae414 Add TextLines to add per glyph transformation 2023-04-28 15:42:55 +02:00
Filip Sykala - NTB T15p
2e2138b067 Fix for surface drag - distance object from surface 2023-04-18 18:46:33 +02:00
Filip Sykala - NTB T15p
c2f348ee19 ReWork DataBase for embossing to prepare for SVG.
Remove dependency on Emboss inside of Object list
Hide variable SHAPE_SCALE to one .cpp file only
2023-03-10 15:22:29 +01:00
Filip Sykala - NTB T15p
191f670dbd Volume do not store angle of text any more.
(it is stored inside of volume transformation and si calculated on the fly)
2023-03-02 14:25:06 +01:00
Filip Sykala - NTB T15p
ae75599af0 clean up 2023-02-21 12:32:53 +01:00
Filip Sykala - NTB T15p
ead192b43b calculate angle when set volume 2023-02-20 14:50:17 +01:00
Filip Sykala - NTB T15p
b82f1fe818 Move over surface with relative transformation 2023-02-17 08:16:54 +01:00
Filip Sykala - NTB T15p
f2803c4ae1 Move unused implementation behinde macro 2023-01-26 12:00:36 +01:00
Filip Sykala - NTB T15p
badbe9ddba Remove spikes from glyph shape 2023-01-26 08:04:44 +01:00
Filip Sykala - NTB T15p
8f09c3ac82 WIP: Create another approach to heal shape BUT it is not working 2023-01-20 17:33:53 +01:00
Filip Sykala - NTB T15p
58592593af Add new volume as cut surface by definition in style 2022-11-21 10:15:20 +01:00
Filip Sykala - NTB T15p
9fef0cd091 Fix for whistle model. Issue 51.3
Sort patches by distance to expolygon projection depth center and add patches until expolygon is filled
2022-10-19 19:15:59 +02:00
Filip Sykala - NTB T15p
8343e81053 Fix test
+ Comment debug output
+ Add was_canceled in cut surface
2022-10-12 19:26:45 +02:00
Filip Sykala - NTB T15p
3fa3ea0bb4 Projection text for cut surface is made with double preccission 2022-10-12 16:17:38 +02:00
Filip Sykala - NTB T15p
8511b280bf Heal shape with points close to line
(after conversion to floating point it is on the other side of line)
ExPolygons indexing (fixed)
2022-10-11 13:35:52 +02:00
Filip Sykala - NTB T15p
072c1752b1 Cancelation in the middle of getting text shape 2022-09-23 14:07:17 +02:00
Filip Sykala - NTB T15p
27e640180f Add unprojecting of SurfacePatch contours 2022-08-31 08:35:43 +02:00
Filip Sykala - NTB T15p
63121cee2e Better healing for Glyph shape - remove duplicit points + self intersections
Add search of intersecting points (compared with CGAL)
Triangulation can [optionaly] accept multi points
2022-08-25 13:28:10 +02:00
Filip Sykala - NTB T15p
003c7fc54f Rename FontItem to EmbossStyle 2022-08-03 10:29:05 +02:00
Filip Sykala
eea0ce9569 Calculation of projection distances 2022-06-09 15:07:44 +02:00
Filip Sykala
864d1e5830 Cut surface in backend job
Store flag about use surface(into 3mf and style)
GUI: Add checkbox to start using model surface
2022-05-04 19:42:39 +02:00
Filip Sykala
a1d7040902 WIP: cut surface of model
update emboss icons to not be soo huge - pixel preccisse
2022-04-26 17:43:38 +02:00
Filip Sykala
331d4d4557 Show user warning about unknown symbols by font inside of input text
Fix correct selection of collection ascent, descent, ...
Remove boost log from emboss --> not work properly on thread
2022-04-07 16:34:14 +02:00
Filip Sykala
501f6f021f Initialize font style images in job 2022-03-22 21:38:07 +01:00
Filip Sykala
2621d66cb0 Const improve 2022-03-21 12:50:46 +01:00
Filip Sykala
87f22765ba Separate functionality 2022-03-15 19:53:43 +01:00
Filip Sykala
6fdaee3cfe Fix data type of collection
Fix warnings
../src/libslic3r/Emboss.cpp:135:24: warning: comparison of integer expressions of different signedness: 'int' and 'const unsigned int' [-Wsign-compare]
../src/libslic3r/Emboss.cpp:653:20: warning: comparison of integer expressions of different signedness: 'int' and 'unsigned int' [-Wsign-compare]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2057:12: warning: unused variable 'count_icons' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:2058:12: warning: unused variable 'count_states' [-Wunused-variable]
2022-03-07 12:16:24 +01:00
Filip Sykala
18d269506a add index of font inside of collection to FontProp(font property) + serialization/deserialization (3mf + appConfig)
separate glyph cache from FontFile
2022-02-28 18:32:50 +01:00
Filip Sykala
5ffa19b529 Unify place of transformation 2022-02-21 16:12:38 +01:00
Filip Sykala
bed5232a22 Using unit per em instead of ascent 2022-02-16 14:57:57 +01:00