Filip Sykala
65909c74c4
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-22 12:52:16 +01:00
enricoturri1966
9be3d926c5
Tech ENABLE_LEGACY_OPENGL_REMOVAL - A few refactorings and fixes
2022-03-22 08:18:39 +01:00
Filip Sykala
fec171d14e
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-21 21:40:37 +01:00
enricoturri1966
4964d6ecd5
ENABLE_GL_IMGUI_SHADERS - Fixes in ImGuiWrapper::render_draw_data()
2022-03-21 11:31:32 +01:00
enricoturri1966
2ab8469cb6
Refactoring in ImGuiWrapper::render_draw_data()
2022-03-14 13:34:08 +01:00
enricoturri1966
5586fd92f2
Follow-up of d0d89a4d5bc02a87f417a2f2c73f5f91db0da5d6 - Fixed warnings
2022-03-14 09:50:25 +01:00
enricoturri1966
d0d89a4d5b
Tech ENABLE_GL_IMGUI_SHADERS - Render imgui using shaders
2022-03-14 09:04:44 +01:00
Filip Sykala
70b94d592b
Merge branch 'et_world_coordinates' into fs_emboss_with_CGAL_5_4
...
# Conflicts:
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
# src/slic3r/GUI/Gizmos/GLGizmosManager.cpp
2022-03-09 11:06:58 +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
enricoturri1966
1eac357739
Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel: GLVolume geometry + removed class GLIndexedVertexArray from codebase
2022-02-23 13:39:54 +01:00
Filip Sykala
a8ef5c35d2
Undo changes for input
2022-02-18 12:33:39 +01:00
Filip Sykala
84cd85e243
Fix advanced alliment + translation for calc offsets
2022-02-16 08:41:56 +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
enricoturri1966
92aa6540f5
Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity
2022-02-08 12:57:56 +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
53ee0092b0
Create emboss object on cursor position
2022-01-28 18:00:10 +01:00
YuSanka
94b8c4f096
Merge remote-tracking branch 'origin/master' into dev
2022-01-20 15:22:24 +01:00
David Kocik
86c49163f8
latin-2 for Hungarian in imgui
...
#5479
2022-01-20 14:17:02 +01:00
enricoturri1966
b9b702d550
Fixed conflicts after merge with branch dev
2022-01-14 09:55:13 +01:00
Filip Sykala
5c481a6da5
Fix imgui truncation
2022-01-14 09:36:42 +01:00
enricoturri1966
6201dad245
Tech ENABLE_COLOR_CLASSES set as default
2022-01-14 08:19:00 +01:00
enricoturri1966
a2dc1cd446
Fixed conflicts after merge with dev branch
2022-01-12 15:54:48 +01:00
enricoturri1966
243f5c38ee
Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT set as default
2022-01-12 13:36:31 +01:00
Filip Sykala
3e0bc4a529
Only unique name of font item
...
Add FontListSerializable for store/load font list from AppConfig
2022-01-10 10:59:10 +01:00
Filip Sykala
82ee1c5e4a
Add boldness and skew(italic) for embossed text
...
Change line_gap and char_gap to optional value
2022-01-05 16:56:20 +01:00
enricoturri1966
cd4094743e
Tech ENABLE_COLOR_CLASSES - 1st installment -> Introduction of classes ColorRGB and ColorRGBA to unify color data definition and manipulation
2021-12-22 10:45:35 +01:00
Filip Sykala
1259b878fb
add NSVG utils into cmakelists
...
Move trunc to ImGuiWrapper
2021-12-20 21:58:21 +01:00
Filip Sykala
88523bceb6
Merge branch 'master' into fs_emboss
2021-12-13 10:52:04 +01:00
enricoturri1966
f958c14db8
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_preview_layout
2021-12-09 09:03:20 +01:00
Lukas Matena
06fd732b57
Fixed behaviour of float sliders in SLA gizmos,
...
which was broken after the 'Edit' button was added.
This is a bit hacky fix, it might be worth improving later.
2021-12-08 16:19:08 +01:00
Filip Sykala
d698df2c31
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/slic3r/GUI/GUI_App.cpp
# tests/libslic3r/test_indexed_triangle_set.cpp
2021-12-01 14:35:42 +01:00
enricoturri1966
5218570348
Follow-up of 8bc442cd328ae41641d93a03244d4d2c84aac4d7 - Commented out unused code and fixed build when tech ENABLE_LEGEND_TOOLBAR_ICONS is disabled
2021-11-29 12:46:27 +01:00
enricoturri1966
353a9e61f5
Fixed conflicts after merge with master
2021-11-29 11:53:45 +01:00
enricoturri1966
8bc442cd32
Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - 2nd click on edit button exits editing state in slider
2021-11-29 11:46:28 +01:00
Filip Sykala
2c6f57cc5c
Linux missing include
2021-11-25 16:25:34 +01:00
Filip Sykala
7b9129787e
actualize name in list
2021-11-25 16:21:17 +01:00
Filip Sykala
b6d2e98091
close window position to polygon
2021-11-23 11:25:55 +01:00
enricoturri1966
3cb6305d3e
#3385 - Fixed broken 3Dconnexion settings imgui dialog layout
2021-11-23 09:43:03 +01:00
Filip Sykala
eba68f9a9e
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/slic3r/GUI/GUI_ObjectList.cpp
# src/slic3r/GUI/Gizmos/GLGizmoSimplify.cpp
# src/slic3r/GUI/ImGuiWrapper.hpp
2021-11-23 09:09:09 +01:00
enricoturri1966
c242f31353
Fixed conflicts after merge with master
2021-11-23 08:48:11 +01:00
YuSanka
21c8f373ff
Code refactoring for 69731b1d => nsvgParseFromFileWithReplace() is extracted from nanosvg.h to BitmapCache
2021-11-19 17:00:38 +01:00
Lukáš Hejl
8a4323c5b9
Fixed the layout of the painting gizmos after the edit icon for sliders was added.
2021-11-17 11:44:38 +01:00
David Kocik
059e4f8cf1
Commented code for different icon for UpdatedItemsInfo Notification.
2021-11-15 13:54:02 +01:00
enricoturri1966
a326c5b320
Tech ENABLE_LEGEND_TOOLBAR_ICONS - Toolbar items in legend using svn icons
2021-11-12 14:04:37 +01:00
enricoturri1966
dd484e42fc
Fixed conflicts after merge with master
2021-11-12 08:08:54 +01:00
enricoturri1966
b3992ab35d
Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Fixed imgui slider label
2021-11-12 07:56:47 +01:00
enricoturri1966
954538fdf0
Imgui now recognizes numpad enter key presses
2021-11-10 15:42:25 +01:00
YuSanka
e8be7b2ecd
Implemented possibility to show resin colors from the Plater (Bottles with resin are colored now in preset combobox)
...
+ Added nsvgParseFromFileWithReplace() to replace some colors before parsing from SVG file
+ Thumbnails are saved with selected resin color in SL1 or SL1S files
+ "white" folder is deleted from "icons" now. THere is no needed anymore.
2021-11-09 17:01:50 +01:00
enricoturri1966
869276aedb
Tech ENABLE_ENHANCED_IMGUI_SLIDER_FLOAT - Changed background color of additional button and its icon
2021-11-08 13:43:53 +01:00
