PavelMikus
53e9bb3ebf
integration of enforcers and blockers
2022-04-25 12:42:51 +02:00
PavelMikus
38a6e231f2
minor changes, more transparent parameters settings
2022-04-25 12:42:51 +02:00
PavelMikus
45b49ad545
initial demo
...
fixed KD tree neighbour search, finished refactoring of raycasts,
substantially improved performance of seam placement - seams
are now precomputed and their indexes stored such that place_seam does almost nothing.
2022-04-25 12:42:51 +02:00
PavelMikus
55e0f2dd83
refactoring raycaster, gathering only hitpoints and their normals.
2022-04-25 12:42:51 +02:00
PavelMikus
fea247f261
Fixed bug - the rays had opposite directions, so all of them flown away from the object; also fixed compilation bug - missing import of timer.h
2022-04-25 12:42:51 +02:00
PavelMikus
fdfe19ef49
init version of occlusion estimation, raycasting implemented but for some reason only parts of model are estimated
2022-04-25 12:42:51 +02:00
Lukas Matena
142b924366
Fixed MSVC debug assert in lightning infill (invalidated iterator)
2022-04-25 11:06:00 +02:00
Vojtech Bubnik
408e56f039
Fix of Boost 1.79 deprecated boost::filesystem::ofstream #8238
...
Replacing boost::filesystem::fstream with boost::nowide::fstream
variants with the unfortunate cost of string path conversion on Windows
from 16 bits to UTF8 and back to 16 bits.
Unfortunately we cannot use std::filesystem yet as it is missing
on older MACs and because the interface is crooked minefield on Windows
see https://github.com/microsoft/STL/issues/909
2022-04-25 08:33:48 +02:00
Filip Sykala
7ec422d12f
Merge branch 'et_world_coordinates' into fs_emboss
...
# Conflicts:
# src/libslic3r/Model.hpp
# src/libslic3r/Technologies.hpp
# src/slic3r/GUI/Gizmos/GLGizmoBase.hpp
2022-04-20 12:13:17 +02:00
enricoturri1966
8a36c12f13
Fixed conflicts after merge with master
2022-04-20 11:53:51 +02:00
Filip Sykala
c58a8302b6
Merge branch 'et_world_coordinates' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-04-20 10:41:11 +02:00
tamasmeszaros
516f459edc
Use tight compression for SLA archives with svg
2022-04-19 13:53:50 +02:00
Filip Sykala
628c97e8c4
Fix wheel dragging
2022-04-19 12:11:47 +02:00
tamasmeszaros
91b79bb85c
Fix crash in debug mode when split result contains ill formed parts
2022-04-19 11:46:20 +02:00
tamasmeszaros
2fd5a415c5
Fix arrange when some geometries are ill formed.
...
SPE-1216
The removed fix for issue 2209 is not needed anymore as the backend (arrange + libnest) takes care of such objects
- Offset is now done with libslic3r offset() wrapper (no expception thrown)
- Zero area objects are discarded in libnest
2022-04-19 11:45:17 +02:00
enricoturri1966
f504236734
Tech ENABLE_GIZMO_GRABBER_REFACTOR - Refactoring of GLGizmoBase::Grabber to have a single static instance of the cube and cone models to be shared by all grabbers
2022-04-14 15:15:14 +02:00
Filip Sykala
cbc138a525
Fix of assertation from sinking contour
...
assertation at:
GLModel::init_from(Slic3r::GUI::GLModel::Geometry && data) Line 407
It is called from:
GLVolume::SinkingContours::update() Line 357
polygons(defined on line 344) are empty. --> also init_data will be empty.
2022-04-14 08:58:00 +02:00
YuSanka
09512c086b
Fix for SPE-1220:
...
* Added check of the visibility for selected presets when Configuration is loaded from SLA archive or from the G-code.
* SLAImportDialog:
* MSW specific: added dark mode
* Center on parent
2022-04-13 18:15:46 +02:00
enricoturri1966
9c15952343
Fixed conflicts after merge with master
2022-04-13 15:37:12 +02:00
enricoturri1966
3ce2d3a700
#8176 - Tech ENABLE_USED_FILAMENT_POST_PROCESS - Fixes used filament data exported to gcode file not taking in account custom gcode
2022-04-13 15:27:46 +02:00
Lukas Matena
1a4ce039da
Fix of #8175 : crash with Import SL1 in some cases
...
- do not process non-existing file, report as error
- cancelling the dialog is not an error, but a check in finalize() is needed
- fixed some localization issues (serious btw: the ToStdString returned "" in one of the cases, which would in turn ignore the error and proceed as if if did not happen)
- reset err in reset(), just to be sure
2022-04-13 12:33:25 +02:00
Lukas Matena
d7c1d0767f
File menu on Win should use 'Exit' instead of 'Quit' ( #8182 )
2022-04-13 09:39:19 +02:00
tamasmeszaros
fe3a58b93e
Merge branch 'dev'
2022-04-13 08:56:44 +02:00
Lukas Matena
3b94494c4f
Fix of #8186 : incorrect count of toolchanges reported:
...
broken for o long time, probably since 58a811a
2022-04-12 13:39:14 +02:00
Lukas Matena
6288ec4bf0
Fix of #8171 : Two Chinese characters added into the range to load for ImGui
2022-04-11 12:10:16 +02:00
YuSanka
ed71887e35
Fix for #8122 - When you change setting with a blank project and go to exit it will ask you to save blank project, if you don't "save", prusa slicer wont' shut down
...
and #8076 - PrusaSlicer-2.4.1 does not close with no 3D-Model loaded and unsafed
2022-04-11 12:09:30 +02:00
YuSanka
a248490507
Fix for #7905 - Segfault when changing printer after loading 3mf with a different printer set
...
Update searcher only before open one of next dialogs : SearchDialog, UnsavedChangesDialog or DiffPresetDialog.
But only Search dialog respects to the mode of PrusaSlicer
2022-04-11 12:09:30 +02:00
enricoturri1966
bea50dce7c
Fixed rendering of printbed while the camera is below it
2022-04-11 08:38:09 +02:00
Filip Sykala
7c1cf6fa7e
Offseted move with text volume over surface
...
+ use fix of .3mf transformation
2022-04-08 15:16:05 +02:00
Vojtech Bubnik
aef0c5a83c
Follow-up to 68b6672907
...
Fixed detection of config data at the end of gcode files
G-code as config file was not imported correctly because end of windows
stile end of lines (CRLF) were not processed correctly.
See the file at #8172
2022-04-08 14:28:12 +02:00
enricoturri1966
68b6672907
Fixed detection of config data at the end of gcode files
2022-04-08 09:41:26 +02:00
Filip Sykala
630b1bb956
say user that Text can’t be empty
2022-04-07 17:06:26 +02:00
Filip Sykala
40817f537b
Merge branch 'master' into fs_emboss
2022-04-07 16:34:28 +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
Vojtech Bubnik
6a67a6e21b
Fix of #8170 : Seemingly the OSX finder calls the "open files" callback
...
on PrusaSlicer too early now on some newest platforms, where the
application is not yet fully initialized. This fix postpones loading of
files in that case.
2022-04-07 15:52:33 +02:00
enricoturri1966
a4435d214f
Shader mm_contour - Customizable offset to calculate the correction to avoid z-fighting (MESA driver needs bigger one)
2022-04-07 12:59:11 +02:00
enricoturri1966
0995cfc658
Shader mm_contour - Correction to avoid z-fighting moved from fragment shader to vertex shader
2022-04-07 10:40:33 +02:00
enricoturri1966
b265e91df2
Fixed rendering of GLGizmoPainterBase sphere cursor when tech ENABLE_LEGACY_OPENGL_REMOVAL is disabled
2022-04-07 08:50:20 +02:00
enricoturri1966
5e0590a93e
Removed assignment to gl_FragDepth into gouraud.fs shader. Replaced with small offset of triangles along their normal.
2022-04-07 08:22:33 +02:00
enricoturri1966
2de1b863bb
Fixed build when tech ENABLE_GL_SHADERS_ATTRIBUTES is disabled
2022-04-07 08:18:06 +02:00
Filip Sykala
5004897c2d
Merge branch 'master' into dev
2022-04-06 12:42:00 +02:00
Filip Sykala
68c34210d2
Fix
...
../src/slic3r/GUI/GLSelectionRectangle.cpp:48:26: warning: comparison of integer expressions of different signedness: 'int' and 'std::vector<Eigen::Matrix<double, 3, 1, 2> >::size_type' {aka 'long unsigned int'} [-Wsign-compare]
2022-04-05 17:16:21 +02:00
Filip Sykala
b7f662c311
Fix unused warning:
...
../src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp:99:86: warning: lambda capture 'h' is not used [-Wunused-lambda-capture]
2022-04-05 16:47:29 +02:00
Filip Sykala
ab10209942
Fix for using of value from optional
...
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:367:85: error: 'value' is unavailable: introduced in macOS 10.14
2022-04-05 16:21:22 +02:00
Filip Sykala
8d2487c721
Create base struct separately and move to data
...
Fix for:
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:163:33: warning: suggest braces around initialization of subobject [-Wmissing-braces]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:692:33: warning: suggest braces around initialization of subobject [-Wmissing-braces]
../src/slic3r/GUI/Gizmos/GLGizmoEmboss.cpp:788:27: warning: suggest braces around initialization of subobject [-Wmissing-braces]
2022-04-05 16:20:47 +02:00
Filip Sykala
fe697d381a
Try to fix rotation gizmo in emboss
2022-04-05 15:56:20 +02:00
Filip Sykala
8719ec8977
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Model.hpp
2022-04-05 15:55:24 +02:00
Filip Sykala
d5f2595a25
fix signed/ unsigned comparison
2022-04-05 13:10:33 +02:00
Filip Sykala
a5ae6394a5
Fix warnings
2022-04-05 13:08:01 +02:00
Filip Sykala
c88d9452c0
Fix transformation of embossed text after load volume from .3mf
2022-04-05 12:23:05 +02:00
enricoturri1966
6b6fb9f692
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Removed redundand #if/#endif into GLModel.cpp
2022-04-05 10:04:36 +02:00
tamasmeszaros
43bd71c49a
Add comment to previous change
2022-04-04 15:52:03 +02:00
tamasmeszaros
97652f3e71
Avoid error on osx for tbb parallel for
2022-04-04 15:44:59 +02:00
tamasmeszaros
1070d71da6
Use upstream Qhull, remove duplication in deps and src
...
REALfloat is not defined to 0 on all platforms.
2022-04-04 12:43:25 +02:00
tamasmeszaros
41397f90a4
Use upstream GLEW, remove duplication in deps and src
...
Also update glew to 2.2 where NOGDI is properly unset before windows.h is included. This was a patch in our copy of GLEW 1.13
2022-04-04 12:43:25 +02:00
tamasmeszaros
e50a408e2e
Use upstream expat, remove duplication in deps and src
...
Fix clash of builtin findEXPAT with config scripts
2022-04-04 12:43:25 +02:00
enricoturri1966
0967974479
Fixed GLModel::reserve_indices()
2022-04-04 12:23:01 +02:00
YuSanka
8a8d2d15b0
Fix for #8156 - Automatic color change for logo crashes PrusaSlicer with second object of 0.2mm height
2022-04-04 11:42:10 +02:00
Filip Sykala
447e58254d
Fix 3mf trmat - wrong reload
2022-04-04 09:57:19 +02:00
Lukas Matena
6a5443dad2
Yet another fixup of previous commit
2022-04-01 11:30:03 +02:00
Lukas Matena
037a866f22
Fixup of previous commit:
...
the previous fix only works for objects that have equal height
2022-04-01 09:54:49 +02:00
YuSanka
05e94eb0ab
Fixed hard crash on "Convert from/to units" when several objects are selected
...
This crash was caused by commit https://github.com/prusa3d/PrusaSlicer/commit/38b877635
2022-04-01 09:48:38 +02:00
enricoturri1966
5307114969
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2022-04-01 08:35:19 +02:00
enricoturri1966
a821668dc7
Fixed comparison operators of ColorRGB and ColorRGBA
2022-04-01 08:35:10 +02:00
enricoturri1966
9b5d17dfbd
Follow-up of e01d32d01a
- Fixed typo
2022-04-01 08:28:58 +02:00
Filip Sykala
5632c21dec
after discussion with @LukasHejl it will be better to not call FcFini
2022-03-31 16:58:00 +02:00
Lukas Matena
aa2a8178f8
Fixed some compiler warnings
2022-03-31 16:42:15 +02:00
Lukas Matena
e01d32d01a
Fixed several std::moves that had no effect, moved GCode data to heap
2022-03-31 16:42:15 +02:00
Lukas Matena
96a6c8538f
Some refactoring and fixes based on static source code analysis
2022-03-31 16:33:52 +02:00
YuSanka
807f380d3f
Fix for #8091 - Design bug: Yes/No response to save dialogue
2022-03-31 14:34:53 +02:00
enricoturri1966
0763a48ce5
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed OpenGL clipping planes while rendering picking pass
2022-03-31 13:23:04 +02:00
Lukas Matena
2ecfdea070
Fix of #7711 , #7903 , #8044 (wipe tower refusing to slice when layer height modifier is used):
...
Same settings of the layer height modifier does not guarantee to always produce profiles
exactly equal numerically. This is broken since 71ba15b
.
2022-03-31 10:47:19 +02:00
Filip Sykala
c96f642b0a
Merge branch 'master' into fs_emboss
2022-03-30 19:52:38 +02:00
Filip Sykala
7f46594635
Fix of baked transformation into volume during store to 3mf
2022-03-30 19:52:19 +02:00
Filip Sykala
f4029eaca7
Remove unneccessary constructors
2022-03-30 19:51:09 +02:00
Filip Sykala
0bf90ae0af
Move static variable for finalize font config to be global scope
2022-03-30 16:11:27 +02:00
Lukas Matena
8004e19879
Fix of #8126 : crash on startup with wx3.0:
...
this appeared after 1f362af
. The wxEXEC_SYNC is the default, but not using
wxEXEC_NOEVENTS caused a crash in wxWidgets3.0 (see #8126 )
2022-03-30 15:28:44 +02:00
Filip Sykala
6610bf2eb1
Fix of long long long new style name
2022-03-30 13:07:28 +02:00
Filip Sykala
6cdba760c9
Say about not loadable font face when select it
2022-03-30 12:56:17 +02:00
Filip Sykala
4acdd76fff
Merge branch 'master' into fs_emboss
2022-03-30 09:29:06 +02:00
Filip Sykala
5de670c1b8
Try to reduce includes in 3mf.cpp on boost
2022-03-30 09:27:55 +02:00
Lukas Matena
3934b1dbed
Remove repeated spaces from the wipe tower gcode ( #7503 )
2022-03-30 09:25:36 +02:00
Lukas Matena
684733af52
Enforce first layer on experimental wipe tower ( #7090 )
2022-03-30 09:25:31 +02:00
Filip Sykala
394a59d44f
Cancel only text update job
2022-03-29 17:05:24 +02:00
enricoturri1966
55aef05fbf
Fix into GCodeViewer::refresh_render_paths()
2022-03-29 13:18:04 +02:00
Vojtech Bubnik
60d7564942
FFF background slicing for a single object only:
...
Generalized the "enabled milestone" from SLA
to both SLA and FFF.
Merged the "milestone enabled" flag into the milestone status.
Fixed some potential threading issues in SLAPrint::finalize()
when resetting the "milestone enabled" flags.
2022-03-29 11:19:50 +02:00
enricoturri1966
26d1b2a5cd
Small refactorings related to GLCanvas3D::_mouse_to_3d()
2022-03-29 11:11:03 +02:00
Filip Sykala
feb9eda0c8
Try to solve case of no reachable font style
2022-03-28 17:38:39 +02:00
enricoturri1966
2b8f8a2842
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
2022-03-28 14:14:12 +02:00
Filip Sykala
ae4d8af2c1
Fix case when appear bad loading of icons
2022-03-28 11:53:11 +02:00
Filip Sykala
a4b0a9d0f3
Vojta wants back compatibility
2022-03-28 10:18:59 +02:00
Filip Sykala
50d52404d8
Try fix of OsX build by change order of include
2022-03-25 15:49:57 +01:00
Filip Sykala
0a20b04bc8
Merge branch 'master' into fs_emboss
2022-03-25 15:09:31 +01:00
Vojtech Bubnik
5c8ff73fb1
Follow-up to bdb8c3729f
...
Fixing ExtrusionEntityCollection append move operator
(fixing double destruction of ExtrusionEntityCollections)
2022-03-25 14:40:51 +01:00
enricoturri1966
888f45c0d3
Tech ENABLE_PROCESS_G2_G3_LINES - Fixed update of horizontal slider in gcode preview
2022-03-25 14:03:44 +01:00
Filip Sykala
08c6e4faec
Add emboss text test
...
(created mainly to profile conversion)
2022-03-25 11:06:58 +01:00
Filip Sykala
1633f2c796
Fix of typp
2022-03-25 11:05:27 +01:00
Filip Sykala
e50e999b8e
Merge branch 'master' into fs_emboss
2022-03-25 09:16:01 +01:00
Filip Sykala
87fc2c4298
emboss do not twice copy glyph when acess to cache
2022-03-25 09:15:41 +01:00
Filip Sykala
f68d03eb87
Speed up insertation point into triangulation function by
...
Multi point insertation in CGAL(Constrained_Delaunay_triangulation_2::insert(begin, end))
and example on spatial sort index: https://doc.cgal.org/latest/Spatial_sorting/index.html#secsort_any_type_2
2022-03-25 09:14:32 +01:00
Filip Sykala
bdb8c3729f
Change way to move into vector to faster one
...
Regarding to BenchMark
https://quick-bench.com/q/RVoDNywC4ybLpW8KkHLDj5WDIMg
2022-03-25 08:49:43 +01:00
David Kocik
9ece7c0ad4
Rendering of regular text after hypertext in regular notifications.
...
(Using code from Hint notification)
2022-03-24 12:37:55 +01:00
David Kocik
8202862809
object info notifiction not show on copy obj
2022-03-24 12:37:55 +01:00
Filip Sykala
0487113f8b
fix bad shared name
2022-03-24 12:07:50 +01:00
Filip Sykala
da15e63a46
fix link problem
2022-03-24 12:07:36 +01:00
Filip Sykala
583babb3b4
Merge branch 'master' into fs_emboss
2022-03-24 11:48:09 +01:00
Filip Sykala
4e4ba09cbf
Merge branch 'et_world_coordinates' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-24 11:47:59 +01:00
Filip Sykala
5ec3700cc0
Revert deps changes made by @Tamas in branch tm_deps_update_v2.5
2022-03-24 11:45:11 +01:00
Filip Sykala
2143489658
Fix for: ../src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp: In lambda function: ../src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp:104:29: warning: comparison of integer expressions of different signedness: 'int' and 'size_t' {aka 'long unsigned int'} [-Wsign-compare] 104 | for (int x=0; x < width; ++x) | ~~^~~~~~~ ../src/slic3r/GUI/Jobs/CreateFontStyleImagesJob.cpp:105:35: warning: comparison of integer expressions of different signedness: 'int' and 'size_t' {aka 'long unsigned int'} [-Wsign-compare] 105 | for (int y = 0; y < height; ++y) { | ~~^~~~~~~~
2022-03-24 11:45:10 +01:00
Filip Sykala
0d77aaaa8d
Fix memory leaks
2022-03-24 11:45:10 +01:00
Lukáš Hejl
7d2e89286f
Added a possibility into thick_polyline_to_extrusion_paths() to separately set tolerance for merging two following lines based on a difference between lines width.
2022-03-24 11:31:03 +01:00
enricoturri1966
94b98e349b
Tech ENABLE_NEW_RECTANGLE_SELECTION - Fixed SHIFT + left mouse selection/deselection
2022-03-24 10:10:17 +01:00
enricoturri1966
9b34389f00
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2022-03-24 09:51:51 +01:00
enricoturri1966
11f0dc4589
Tech ENABLE_NEW_CAMERA_MOVEMENTS - Reverted middle mouse dragging to pan the view
2022-03-24 09:51:42 +01:00
Lukáš Hejl
eae3932550
Added missing includes (GCC11.1 without PCH).
2022-03-24 09:33:26 +01:00
enricoturri1966
b0b65a1f89
SPE-1208 - Fix for 3mf from another SW is loaded as a project and not as geometry
2022-03-23 17:20:54 +01:00
enricoturri1966
f970741dd4
Do not show ProjectDropDialog when drag and dropping a 3mf file produced by other softwares and the plater is not empty
2022-03-23 17:20:50 +01:00
enricoturri1966
fab6619641
#8032 - GCodeProcessor - Fixed parsing of LAYER_CHANGE tag for spiral vase mode
2022-03-23 17:17:23 +01:00
Lukas Matena
dc14ae07a6
Fixed incorrect handling of 3rd party 3MFs in SLA mode ( #6100 and others)
2022-03-23 17:16:17 +01:00
Lukas Matena
92a40d32ff
Fix of #8078 : double free on wxProgressDialog on Linux
2022-03-23 17:12:42 +01:00
enricoturri1966
24bcbd9c0c
Optimization in GLCanvas3D::_render_camera_target()
2022-03-23 15:18:24 +01:00
Vojtech Bubnik
fe71e7c597
Merge branch 'master' into et_world_coordinates
2022-03-23 14:05:33 +01:00
enricoturri1966
4b4ed423ef
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fix into GLModel::send_to_gpu()
2022-03-23 13:16:51 +01:00
enricoturri1966
3cecd07011
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Refactoring of Camera::apply_viewport()
2022-03-23 11:11:13 +01:00
David Kocik
6853f8a3c6
MacOS build fixes
2022-03-23 09:34:12 +01:00
David Kocik
1f362afb24
Fixes after CR
...
Most important:
Change Download dialog to select path there.
Every user query triggers new download of version file, possibly stops former download (with dialog).
Some functions refactored.
2022-03-23 09:34:12 +01:00
Lukas Matena
5a6824273c
Comments from lm regarding previous commit
2022-03-23 09:34:12 +01:00
Lukas Matena
0e9a8f24c3
Added some missing includes (GCC 9.3, without PCH)
2022-03-23 09:34:12 +01:00
David Kocik
43124979e5
app updater feature
...
checks online version file
offers download of new version of slicer
download with notification
opens instalator or target folder
2022-03-23 09:34:12 +01:00
Filip Sykala
610c290548
Merge branch 'master' into fs_emboss
2022-03-23 09:00:06 +01:00
Filip Sykala
05b6d3578d
Clean process of initialization of style images, do not use manager pointer(could be released)
2022-03-23 08:58:46 +01:00
enricoturri1966
1d2339fbce
Follow-up of a0630420d9
- Fixed warning
2022-03-23 08:18:23 +01:00
Filip Sykala
501f6f021f
Initialize font style images in job
2022-03-22 21:38:07 +01:00
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
ef420c9b72
@david suggestion on Notification not steel focus
2022-03-22 17:04:28 +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
d9249024ba
fix:
...
../src/libslic3r/CutSurface.cpp:368:110: error: cannot bind non-const lvalue reference of type 'CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Edge_index, priv::IntersectingElement>&' to an rvalue of type 'CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Edge_index, priv::IntersectingElement>'
../src/libslic3r/CutSurface.cpp:369:110: error: cannot bind non-const lvalue reference of type 'CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Face_index, priv::IntersectingElement>&' to an rvalue of type 'CGAL::Surface_mesh<CGAL::Point_3<CGAL::Epick> >::Property_map<CGAL::SM_Face_index, priv::IntersectingElement>'
../src/libslic3r/CutSurface.cpp:482:41: warning: comparison of integer expressions of different signedness: 'int32_t' {aka 'int'} and 'std::vector<CGAL::SM_Vertex_index, std::allocator<CGAL::SM_Vertex_index> >::size_type' {aka 'long unsigned int'} [-Wsign-compare]
../src/libslic3r/CutSurface.cpp:522:12: warning: unused variable 'count' [-Wunused-variable]
../src/libslic3r/CutSurface.cpp:1041:15: warning: unused variable 'color' [-Wunused-variable]
2022-03-22 15:59:58 +01:00
Filip Sykala
a7d3195ec0
Merge branch 'master' into fs_emboss
2022-03-22 15:48:51 +01:00
Filip Sykala
e6838f7e18
add new cgal as technology
2022-03-22 15:47:34 +01:00
enricoturri1966
86641a481e
Fixed typo
2022-03-22 15:35:02 +01:00
enricoturri1966
a0630420d9
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Calculation of camera projection matrix
2022-03-22 15:20:51 +01:00
Filip Sykala
65909c74c4
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-22 12:52:16 +01:00
enricoturri1966
9076bcc268
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-22 08:23:10 +01:00
enricoturri1966
2defd32260
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_lines_g2_g3
2022-03-22 08:20:06 +01:00
enricoturri1966
ea55f16ce4
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-22 08:18:51 +01:00
enricoturri1966
9be3d926c5
Tech ENABLE_LEGACY_OPENGL_REMOVAL - A few refactorings and fixes
2022-03-22 08:18:39 +01:00
Filip Sykala
9c56e43f1d
Merge branch 'master' into fs_emboss
2022-03-21 21:40:50 +01:00
Filip Sykala
fec171d14e
Merge branch 'master' into fs_emboss
...
# Conflicts:
# src/libslic3r/Technologies.hpp
2022-03-21 21:40:37 +01:00
tamasmeszaros
c1e54675f5
Prevent hard crash in rare circumstances
2022-03-21 17:16:25 +01:00
Filip Sykala
60fcd11ef8
vojta wants
2022-03-21 14:58:03 +01:00
Filip Sykala
ee78a17ab9
Fix Unix directory delimiters
2022-03-21 13:47:50 +01:00
enricoturri1966
a2a9281ec8
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-21 13:10:57 +01:00
enricoturri1966
76d1d4949b
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140
2022-03-21 13:10:47 +01:00
Filip Sykala
2621d66cb0
Const improve
2022-03-21 12:50:46 +01:00
enricoturri1966
4964d6ecd5
ENABLE_GL_IMGUI_SHADERS - Fixes in ImGuiWrapper::render_draw_data()
2022-03-21 11:31:32 +01:00
enricoturri1966
6ee4457b31
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_lines_g2_g3
2022-03-21 08:54:04 +01:00
enricoturri1966
93d703518d
Tech ENABLE_PROCESS_G2_G3_LINES - Improved detection of layer zs for gcode produced by other slicers
2022-03-21 08:53:55 +01:00
Filip Sykala
350d062495
Better fix of heap buffer overflow, suggested in https://github.com/nothings/stb/issues/1296
2022-03-21 06:37:34 +01:00
enricoturri1966
0bd3112b7a
Reworked custom gcode toolpaths generation
2022-03-18 15:45:42 +01:00
enricoturri1966
82fe599cae
Fixed warnings and build on MAC OS
2022-03-18 14:12:29 +01:00
enricoturri1966
21e6dccc12
Fixed conflicts after merge with master
2022-03-18 13:36:32 +01:00
enricoturri1966
8c8e908325
Tech ENABLE_PROCESS_G2_G3_LINES - Processing of gcode G2 and G3 lines
2022-03-18 13:34:53 +01:00
Lukas Matena
f3d92bdeff
Fixup of 5de93c8
(incorrectly solved merge conflict)
2022-03-18 10:25:00 +01:00
enricoturri1966
a7d466dc7c
Tech ENABLE_Z_OFFSET_CORRECTION set as default
2022-03-18 08:32:35 +01:00
enricoturri1966
45e4d90504
GCodeViewer - Hide bottom toolbar when loading a new gcode file
2022-03-17 15:44:03 +01:00
enricoturri1966
493050a279
Removed redundant line of code
2022-03-17 15:29:18 +01:00
enricoturri1966
fb22612d0d
Tech ENABLE_SPIRAL_VASE_LAYERS set as default
2022-03-17 15:12:03 +01:00
enricoturri1966
8d5dd759ad
SPE-1208 - Fix for 3mf from another SW is loaded as a project and not as geometry
2022-03-17 14:31:14 +01:00
Filip Sykala
bec8d5b31d
Cut now respect reduction of triangles
2022-03-17 14:24:35 +01:00
enricoturri1966
99861f1b6e
SPE-1207 - Extensions in Open/Save/Export dialogs - alternative implementation for file_wildcards()
2022-03-17 14:20:35 +01:00
Vojtech Bubnik
59e14cb752
Reworked constrained Delanay triangulation of polygons / expolygons
...
using CGAL CDT implementation:
Removed all the sets / maps, replaced with vectors and CDT vertex
intrusive indices.
Reworked the outside / inside classification using just the CDT
"constrained edge" attributes and a single queue.
Cherry pick commit 1648ae853d6c69a1118efbc694dadeb9965154ee
2022-03-17 13:09:10 +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
Filip Sykala
96c5744684
Merge branch 'fs_emboss' of https://github.com/prusa3d/PrusaSlicer into fs_emboss
2022-03-17 12:27:13 +01:00
Filip Sykala
83e62bbd28
Use property map instead of std::map
2022-03-17 12:25:46 +01:00
Filip Sykala
3685c59e3e
Add reduction map
2022-03-17 11:44:43 +01:00
Lukas Matena
ff2b8da8dc
Fixed crash when pressing 'Reset rotation' button while editing SLA support points (mentioned in #7359 )
2022-03-17 11:39:58 +01:00
Lukas Matena
5de93c8784
Fixed incorrect handling of 3rd party 3MFs in SLA mode ( #6100 and others)
2022-03-17 11:13:20 +01:00
Lukáš Hejl
0c4df47bd0
Fixed various issues in the ported Lightning infill.
...
Added export to SVG for TreeNode.
Also was finalized integration of Lightning infill and Lightning infill was enabled.
2022-03-16 23:37:05 +01:00
Filip Sykala
84bde2163d
Partialy prepare surface cut
2022-03-16 16:58:36 +01:00
Filip Sykala
87f22765ba
Separate functionality
2022-03-15 19:53:43 +01:00
enricoturri1966
9701d3b01d
Follow-up of 033bee6431
- Fixed warnings
2022-03-15 10:31:30 +01:00
enricoturri1966
4e17c02505
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_new_camera_movements
2022-03-15 09:18:04 +01:00
enricoturri1966
568bd39c5a
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of default bed in thumbnails
2022-03-15 09:16:06 +01:00
enricoturri1966
58701b237d
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of bed texture in thumbnails
2022-03-15 09:05:16 +01:00
enricoturri1966
887ce89558
Limit width of GCodeViewer::SequentialView::GCodeWindow
2022-03-15 08:50:00 +01:00
enricoturri1966
0a2001ed1c
#8032 - GCodeProcessor - Fixed parsing of LAYER_CHANGE tag for spiral vase mode
2022-03-14 15:21:00 +01:00
enricoturri1966
033bee6431
Removed obsolete code from GCodeViewer
2022-03-14 14:55:25 +01:00
enricoturri1966
9174fc4872
Removed obsolete tech ENABLE_FIXED_SCREEN_SIZE_POINT_MARKERS
2022-03-14 14:25:09 +01:00
enricoturri1966
2ab8469cb6
Refactoring in ImGuiWrapper::render_draw_data()
2022-03-14 13:34:08 +01:00
enricoturri1966
f0bad14748
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Small refactoring into GCodeViewer::render_toolpaths()
2022-03-14 09:59:38 +01:00
enricoturri1966
4eee0d05f3
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Use shader's vertex attributes and matrices in GLMmSegmentationGizmo3DScene
2022-03-14 09:50:42 +01:00
enricoturri1966
5586fd92f2
Follow-up of d0d89a4d5b
- 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
enricoturri1966
ac0ec5fa43
Tech ENABLE_NEW_CAMERA_MOVEMENTS_CTRL_ROTATE renamed as ENABLE_NEW_CAMERA_MOVEMENTS
...
Tech ENABLE_NEW_CAMERA_MOVEMENTS_MIDMOUSE_ROTATE merged into ENABLE_NEW_CAMERA_MOVEMENTS
Tech ENABLE_NEW_CAMERA_MOVEMENTS_SHIFT_SELECTION renamed as ENABLE_NEW_RECTANGLE_SELECTION
2022-03-11 12:36:09 +01:00
enricoturri1966
2342002151
Tech ENABLE_NEW_CAMERA_MOVEMENTS_CTRL_ROTATE - Fixed volumes moving after releasing CTRL key
...
Tech ENABLE_NEW_CAMERA_MOVEMENTS_SHIFT_SELECTION - Selection rectangle not started while hovering on a volume
2022-03-11 11:28:08 +01:00
enricoturri1966
4a5ad304ad
Fixed conflicts after merge with master
2022-03-11 09:35:02 +01:00
enricoturri1966
2c80ecca41
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of gizmo rotate
2022-03-11 08:43:07 +01:00
enricoturri1966
3dddfa919a
Debug tech ENABLE_GLMODEL_STATISTICS - Shows an imgui dialog with GLModel statistics data
2022-03-10 15:55:15 +01:00
enricoturri1966
56e597aef8
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of sidebar hints reference system
2022-03-10 14:42:05 +01:00
enricoturri1966
6ef5da5a73
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of selection bounding box
2022-03-10 14:03:50 +01:00
enricoturri1966
f1160e2562
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Fixed rendering of bed axes
2022-03-10 13:56:33 +01:00
enricoturri1966
0fa4e51c8f
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
2022-03-10 13:40:51 +01:00
enricoturri1966
9d2314557d
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Removed remaining pairs glPushMatrix()/glPopMatrix()
2022-03-10 13:40:37 +01:00
enricoturri1966
321f94afd0
Merge remote-tracking branch 'origin/et_world_coordinates' into fs_emboss
2022-03-10 13:22:36 +01:00
enricoturri1966
05b65c3a43
Fixed conflicts after merge with branch et_world_coordinates
2022-03-10 13:22:20 +01:00
enricoturri1966
43db64be05
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_world_coordinates
2022-03-10 12:49:10 +01:00
enricoturri1966
27861fa0bd
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer
2022-03-10 12:48:40 +01:00
enricoturri1966
f0a4fd1123
Fixed GLVolumes color when tech ENABLE_LEGACY_OPENGL_REMOVAL is disabled
2022-03-10 12:48:31 +01:00
Lukas Matena
68ca42abbf
Merge branch 'stable'
2022-03-10 12:29:17 +01:00
enricoturri1966
fb38d80458
Fixed conflicts after merge with master
2022-03-10 11:33:59 +01:00
enricoturri1966
a9465ddedc
A few small refactorings
2022-03-10 11:27:05 +01:00
enricoturri1966
b9b8406ad8
Fixed conflicts after merge with master
2022-03-10 10:32:00 +01:00
Filip Sykala
c8e3836177
Fix merge
2022-03-09 12:59:20 +01:00
enricoturri1966
57ffa4d9ee
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-09 12:06:09 +01:00
enricoturri1966
f8ce187262
Tech ENABLE_LEGACY_OPENGL_REMOVAL - Refactoring of GLModel to automatically detect the data type to use into the index buffer in dependence of vertices count
2022-03-09 11:51:02 +01:00
Filip Sykala
5ffab4069a
Merge branch 'tm_deps_update_v2.5' into fs_emboss_with_CGAL_5_4
...
# Conflicts:
# deps/CGAL/CGAL.cmake
2022-03-09 11:09:34 +01:00
Filip Sykala
f75f326f8e
Merge branch 'master' into fs_emboss_with_CGAL_5_4
...
# Conflicts:
# src/slic3r/GUI/Gizmos/GLGizmoRotate.cpp
2022-03-09 11:08:39 +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
enricoturri1966
46283cfde3
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES renamed as ENABLE_GL_SHADERS_ATTRIBUTES
2022-03-09 08:22:07 +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
enricoturri1966
5ffe010a9d
Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL merged into ENABLE_LEGACY_OPENGL_REMOVAL
2022-03-08 14:50:32 +01:00
enricoturri1966
05efb88e3f
Tech ENABLE_GLBEGIN_GLEND_REMOVAL renamed as ENABLE_LEGACY_OPENGL_REMOVAL
2022-03-08 14:08:11 +01:00
enricoturri1966
80717bbdec
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Some code cleanup
2022-03-08 13:27:51 +01:00
enricoturri1966
65b5af9561
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: variable_layer_height
2022-03-08 12:48:21 +01:00
enricoturri1966
dbdc272c4e
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: mm_gouraud
2022-03-08 11:17:34 +01:00
enricoturri1966
66fa2b1e26
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: mm_contour
2022-03-08 10:57:43 +01:00
Filip Sykala
3b55de7e0b
change std:err to BOOST_LOG_TRIVIAL(error)
2022-03-08 09:50:43 +01:00
Filip Sykala
f4fc23ce0d
fix init of string
2022-03-08 09:30:50 +01:00
enricoturri1966
c17c4d2e9a
Follow-up of 005fef7bf6
- Fixed imgui dialogs associated to gizmo bar and toolbar items
2022-03-08 09:24:42 +01:00
Filip Sykala
a6834a1a82
WxUtils are using imap
...
Remove unused map utils
2022-03-08 09:22:56 +01:00
Filip Sykala
41a506688a
Change 2 map to bimap in TextConfigurationSerialization
2022-03-08 08:35:26 +01:00
Lukas Matena
62cc48188d
Fix background color in InfoDialog on older macOSes ( #3775 , #7603 )
2022-03-07 16:43:21 +01:00
enricoturri1966
9fb350e3dd
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud
2022-03-07 15:31:23 +01:00
enricoturri1966
f4726f738c
Follow-up of 005fef7bf6
- Fixed highlight arrows for gizmos bar and toolbars
2022-03-07 15:06:45 +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
enricoturri1966
568f42660a
Follow-up of 005fef7bf6
- Fixed Toolbars
2022-03-07 12:02:19 +01:00
Lukáš Hejl
6c51e5148c
Fix of #7994 (Travel very close to the inner holes, could cross external perimeter when the avoid crossing perimeters was enabled.)
2022-03-07 10:48:17 +01:00
enricoturri1966
005fef7bf6
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat_texture
2022-03-07 09:45:29 +01:00
Filip Sykala
29156fd52c
Add check for ttf extension for OsX
2022-03-04 15:22:45 +01:00
enricoturri1966
545056bf7c
Fixed warnings
2022-03-04 14:17:55 +01:00
enricoturri1966
93610ebb02
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: printbed
2022-03-04 14:10:41 +01:00
enricoturri1966
4323b602f5
Code cleanup
2022-03-04 13:57:11 +01:00
enricoturri1966
44a00be329
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: toolpaths_cog
2022-03-04 13:50:31 +01:00
enricoturri1966
b84b6af32a
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: background
2022-03-04 13:30:21 +01:00
enricoturri1966
191222c3a8
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: flat - Travel moves in gcode preview
2022-03-04 13:14:03 +01:00
enricoturri1966
cdf3cb83b6
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light_instanced_attr - Instanced options in gcode preview
2022-03-04 12:46:01 +01:00
enricoturri1966
bca966039e
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light - Toolpaths and batched options in gcode preview
2022-03-04 12:07:08 +01:00
enricoturri1966
c344a633ee
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-04 10:52:45 +01:00
enricoturri1966
d6b0a9858b
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light - Selection sidebar hints
2022-03-04 10:52:30 +01:00
Filip Sykala
111d993849
Fix texture size to be in pixels
2022-03-04 09:53:14 +01:00