Lukas Matena
d662bf2a18
Fixing conflicts part 3:
...
Some files have whitespace changes that make resolving conflicts difficult.
Take the version from master first, next commit will apply changes from master_250
2022-06-29 16:43:29 +02:00
Lukas Matena
b61714bb3e
Merge branch 'master_250' (NO CONFLICTS FIXED):
...
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.idx
CONFLICT (content): Merge conflict in resources/profiles/PrusaResearch.ini
CONFLICT (content): Merge conflict in src/libslic3r/CMakeLists.txt
CONFLICT (content): Merge conflict in src/libslic3r/Fill/Fill.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/GCodeProcessor.hpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.cpp
CONFLICT (content): Merge conflict in src/libslic3r/GCode/SeamPlacer.hpp
CONFLICT (add/add): Merge conflict in src/libslic3r/Geometry/Curves.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PerimeterGenerator.cpp
CONFLICT (content): Merge conflict in src/libslic3r/Point.hpp
CONFLICT (content): Merge conflict in src/libslic3r/PrintConfig.hpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/ConfigWizard.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GCodeViewer.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GLCanvas3D.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/GUI_App.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoHollow.cpp
CONFLICT (content): Merge conflict in src/slic3r/GUI/Gizmos/GLGizmoSlaSupports.cpp
CONFLICT (content): Merge conflict in src/slic3r/Utils/FixModelByWin10.cpp
CONFLICT (modify/delete): t/perimeters.t deleted in HEAD and modified in master_250. Version master_250 of t/perimeters.t left in tree.
CONFLICT (content): Merge conflict in tests/fff_print/CMakeLists.txt
CONFLICT (content): Merge conflict in tests/fff_print/test_fill.cpp
CONFLICT (content): Merge conflict in version.inc
CONFLICT (modify/delete): xs/xsp/PerimeterGenerator.xsp deleted in HEAD and modified in master_250. Version master_250 of xs/xsp/PerimeterGenerator.xsp left in tree.
2022-06-29 14:37:14 +02:00
Lukas Matena
75a6f54f0b
Fixed compiler warnings
2022-06-03 12:45:06 +02:00
Lukas Matena
c450592222
Fixed out of bounds when showing color prints in gcode preview legend:
...
backport of a2a85af4ddde1351f6a54a0f468fed13540e85f5 onto 2.4.2
Fixes flickering of color square in legend in G-Code Viewer
2022-06-02 09:28:09 +02:00
enricoturri1966
b00c550463
Do not show legend and bottom slider when loading an invalid gcode file into GCodeViewer
2022-05-27 15:55:25 +02:00
enricoturri1966
dc3cf1f7b8
#8327 - Fixed gcode window disappearing when selecting volumetric speed in preview
2022-05-16 14:29:33 +02:00
enricoturri1966
ff20ad1052
Fixed warning
2022-05-06 07:30:03 +02:00
enricoturri1966
a2a85af4dd
Fixed out of bounds when showing color prints in gcode preview legend
2022-05-03 13:54:23 +02:00
enricoturri1966
6c31b8d7a8
SPE-1223 - Removed from legend the option to show shells in GCode Viewer
2022-04-28 09:39:58 +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
enricoturri1966
55aef05fbf
Fix into GCodeViewer::refresh_render_paths()
2022-03-29 13:18:04 +02: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
76d1d4949b
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140
2022-03-21 13:10:47 +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
enricoturri1966
fb22612d0d
Tech ENABLE_SPIRAL_VASE_LAYERS set as default
2022-03-17 15:12:03 +01:00
enricoturri1966
9701d3b01d
Follow-up of 033bee64311d7645a581020dde77b028aac9dbc2 - Fixed warnings
2022-03-15 10:31:30 +01:00
enricoturri1966
887ce89558
Limit width of GCodeViewer::SequentialView::GCodeWindow
2022-03-15 08:50: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
f0bad14748
Tech ENABLE_GL_SHADERS_ATTRIBUTES - Small refactoring into GCodeViewer::render_toolpaths()
2022-03-14 09:59:38 +01:00
enricoturri1966
a9465ddedc
A few small refactorings
2022-03-10 11:27:05 +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
enricoturri1966
46283cfde3
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES renamed as ENABLE_GL_SHADERS_ATTRIBUTES
2022-03-09 08:22:07 +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
545056bf7c
Fixed warnings
2022-03-04 14:17:55 +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
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
14c23a6526
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light - GLGizmoBase grabbers
2022-03-03 13:04:00 +01:00
enricoturri1966
14f4345389
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light - Thumbnails render
2022-03-03 12:36:44 +01:00
enricoturri1966
3003db411f
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light - GCodeViewer shells
2022-03-03 09:56:13 +01:00
enricoturri1966
8d43a854c6
Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
...
Shader: gouraud_light - Sequential view marker
2022-03-03 09:46:04 +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
enricoturri1966
5089d1460d
Removed obsolete member variable GLCanvas3D::m_color_by
2022-02-11 11:47:29 +01:00
enricoturri1966
cca1454c38
Tech ENABLE_VOLUMETRIC_RATE_TOOLPATHS_RECALC - Recalculate toolpaths when switching to/from volumetric rate visualization
2022-02-10 12:06:12 +01:00
enricoturri1966
92aa6540f5
Tech ENABLE_SHOW_TOOLPATHS_COG - Show toolpaths center of gravity
2022-02-08 12:57:56 +01:00
Lukas Matena
5c616c5931
Sync to 2.4.1-beta1
2022-02-01 14:16:13 +01:00
Lukas Matena
ebb9041041
Merge branch 'master' into stable - no conflicts fixed
2022-02-01 14:15:18 +01:00
enricoturri1966
383f6509a9
Added tech DISABLE_GCODEVIEWER_INSTANCED_MODELS to easily turn on/off instanced models to render options in gcode preview
2022-01-31 15:36:40 +01:00
enricoturri1966
8d94841fa3
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2022-01-29 09:17:30 +01:00
enricoturri1966
a690f7825c
Fixed warning
2022-01-27 12:45:03 +01:00
enricoturri1966
703aefa75c
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into dev
2022-01-27 12:04:47 +01:00
enricoturri1966
afcac6e2ea
Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Refactoring of GLModel to:
...
1) allow for custom vertex data layout
2) allow for custom index data format
3) allow for any OpenGL primitive type
2022-01-27 12:00:51 +01:00
enricoturri1966
337d7ffaf6
Follow-up of 0e173e3f825f7d7fc0fdedeae265f17c857319b0 - Further code optimization
2022-01-24 10:43:49 +01:00
YuSanka
8c4688194a
Merge remote-tracking branch 'origin/master' into dev
2022-01-24 10:40:12 +01:00
enricoturri1966
7d45da065a
Partial revert of e12cf58c913017ceab660b6f4ef9ba8c6f6dc19d
2022-01-24 09:43:29 +01:00
enricoturri1966
0e173e3f82
Refactoring of lambda extract_move_id() to improve performance of method GCodeViewer::load_toolpaths()
2022-01-24 08:51:19 +01:00
