154 Commits

Author SHA1 Message Date
Filip Sykala
3772b3d0b5 Remove unnecessary ctors of data types,
no more need to use unique ptr to data
2022-03-22 17:49:45 +01:00
Filip Sykala
ffab47dac7 Update volume identified by ObjectID
(NOT VolumePtr which could invalidate by deleting volume)
2022-03-22 16:58:29 +01:00
Filip Sykala
ee78a17ab9 Fix Unix directory delimiters 2022-03-21 13:47:50 +01:00
Filip Sykala
2621d66cb0 Const improve 2022-03-21 12:50:46 +01:00
Vojtech Bubnik
c11948a084 FontItem improvmement: Use default constructors to let the compiler
generate move constructor and move assignement.
Also used some move operators to reduce unnecessary memory allocations.

Cherry picked commit: 120a85d4c4b90ffafced442ee5e63e5f794f6945
2022-03-17 12:37:21 +01:00
enricoturri1966
05b65c3a43 Fixed conflicts after merge with branch et_world_coordinates 2022-03-10 13:22:20 +01:00
Filip Sykala
c8e3836177 Fix merge 2022-03-09 12:59:20 +01:00
Filip Sykala
e8cfe35f78 Do not use RaycastManager inside job
Separate Jobs for Creation of volume from creation of Object
2022-03-08 19:15:56 +01:00
Filip Sykala
a6834a1a82 WxUtils are using imap
Remove unused map utils
2022-03-08 09:22:56 +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
133ce45aeb Fix not rendered style image. e.g. can't load font 2022-03-03 16:26:50 +01:00
Filip Sykala
ad1510a30c Start using string_view in truncate text 2022-03-03 08:13:00 +01:00
Filip Sykala
a0dde4651b Add default value to optional input
Remove unnecessary addiction to canvas3d in imgui wrapper
2022-03-02 14:34:25 +01:00
Filip Sykala
99d3e102c8 Add focus on selected font when open combobox 2022-03-02 11:59:22 +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
284fd8ec8b Remove reference in lambda call 2022-02-22 13:39:28 +01:00
Filip Sykala
212544d532 Fix rotation with object 2022-02-22 13:32:01 +01:00
Filip Sykala
f3f2dddcd1 Fix order of filling stored items 2022-02-22 13:13:21 +01:00
Filip Sykala
8f9887acdb Reduce amount of Undo/Redo snapshots 2022-02-22 12:43:29 +01:00
Filip Sykala
6181b166a4 Add warning on to large and to small font which are not used in emboss text input 2022-02-22 09:56:47 +01:00
Filip Sykala
32573178c3 Do not allow undo for not stored style 2022-02-21 21:37:08 +01:00
Filip Sykala
56b5e5edfb Fix detection of changed angle 2022-02-21 16:18:26 +01:00
Filip Sykala
5ffa19b529 Unify place of transformation 2022-02-21 16:12:38 +01:00
Filip Sykala
233ea5e0d8 Store activ font style 2022-02-21 09:00:03 +01:00
Filip Sykala
a8ef5c35d2 Undo changes for input 2022-02-18 12:33:39 +01:00
Filip Sykala
bed5232a22 Using unit per em instead of ascent 2022-02-16 14:57:57 +01:00
Filip Sykala
7208fc571e Add warning line gap is not shown in text box
Imgui not support add line gap to FONT yet
2022-02-16 09:04:13 +01:00
Filip Sykala
84cd85e243 Fix advanced alliment + translation for calc offsets 2022-02-16 08:41:56 +01:00
Filip Sykala
6dd5e21f59 Fix font size
Fix swap style
2022-02-15 09:14:16 +01:00
Filip Sykala
faa33901f2 Fix height 2022-02-11 16:34:26 +01:00
Filip Sykala
05e795bd9e Connect rotation by gizmo with angle inside of property 2022-02-11 15:15:23 +01:00
Filip Sykala
6a62462c7e Translate above/under surface and rotate by Z axis in ImGui 2022-02-11 09:42:38 +01:00
Filip Sykala
faa63f3182 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Format/3mf.cpp
2022-02-10 14:04:02 +01:00
Filip Sykala
6165583b46 fix 2022-02-09 10:23:51 +01:00
Filip Sykala
92a6067dee Try to move with volume 2022-02-09 10:08:56 +01:00
Filip Sykala
8ea46e422d Fixes:
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1040:11: warning: add explicit braces to avoid dangling else [-Wdangling-else]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1309:19: warning: unused variable 'min_win_size_prev' [-Wunused-variable]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:1308:12: warning: unused variable 'window_size' [-Wunused-variable]
../src/slic3r/Utils/WxFontUtils.cpp:22:12: error: cannot initialize return object of type 'void *' with an rvalue of type 'const wxNativeFontInfo *'
../src/slic3r/Utils/WxFontUtils.cpp:41:42: error: member access into incomplete type 'const wxNativeFontInfo'
2022-02-03 08:33:00 +01:00
Filip Sykala
a50d93cd66 Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Geometry.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoBase.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoMove.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoRotate.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.cpp
#	src/slic3r/GUI/Gizmos/GLGizmoScale.hpp
#	src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
#	src/slic3r/GUI/ImGuiWrapper.cpp
#	src/slic3r/GUI/ImGuiWrapper.hpp
#	src/slic3r/GUI/Selection.cpp
#	tests/slic3rutils/slic3r_jobs_tests.cpp
2022-02-02 15:27:25 +01:00
Filip Sykala
057abce935 update font after bold click 2022-02-02 14:07:52 +01:00
Filip Sykala
1078fe55ec Create text on second Part(volume) of object 2022-02-01 18:31:27 +01:00
Filip Sykala
936ba6c28c Default font inside of gizmo 2022-02-01 08:21:11 +01:00
Filip Sykala
af69a4f2de create emboss text mesh on same place as update
fix:
Un Itelic redraw
../src/slic3r/Utils/WxFontUtils.hpp:49:77: error: non-const lvalue reference to type 'shared_ptr<...>' cannot bind to a temporary of type 'shared_ptr<...>'
../src/slic3r/Utils/WxFontUtils.hpp:55:75: error: non-const lvalue reference to type 'shared_ptr<...>' cannot bind to a temporary of type 'shared_ptr<...>'
2022-01-31 13:17:24 +01:00
Filip Sykala
d10fd37b2f Creation by jobs 2022-01-28 19:33:57 +01:00
Filip Sykala
53ee0092b0 Create emboss object on cursor position 2022-01-28 18:00:10 +01:00
Filip Sykala
ed818f9177 Transformation of text is now allowed only inside object instance 2022-01-27 13:38:52 +01:00
Filip Sykala
137399ef1a Style select with rendered name
Fix negative volume color when dragging
2022-01-27 10:47:05 +01:00
Filip Sykala
d55f09d75b add Enumerate fonts. not Finished 2022-01-21 20:19:06 +01:00
Filip Sykala
770a5c5501 Redesign GUI of emboss 2022-01-20 16:09:48 +01:00
Filip Sykala
83372764ad Fix font index for store to AppConfig 2022-01-14 09:37:11 +01:00
Filip Sykala
4d31128837 Separate font manager to be able manage imgui font for all fonts
Separate FontListSerializable
Rename Emboss::Font to Emboss::FontFile
2022-01-13 22:00:53 +01:00
Filip Sykala
2c3477d3d7 Dynamic skew not only for linux 2022-01-12 09:48:53 +01:00