Filip Sykala
c8e3836177
Fix merge
2022-03-09 12:59:20 +01:00
enricoturri1966
2f572d3cf0
Merge remote-tracking branch 'origin/et_opengl_3'
2022-03-09 12:07:18 +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
Filip Sykala
57c75395c6
fix test
2022-03-09 10:59:22 +01:00
Filip Sykala
4a399789f4
Add vojta test
2022-03-09 09:41:03 +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
31c3952e2d
Removed obsolete shaders
2022-03-08 12:50:00 +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
3e47253725
Follow-up of 66fa2b1e26
- Cleanup
2022-03-08 10:59:12 +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
davidjuanesb
0ffba3c484
Catalan language updated to 2.4.1 RC1
2022-03-08 10:29:14 +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
rtyr
8d3f4e633e
Added Ender 3 Pro thumbnail
2022-03-07 15:06:43 +01:00
rtyr
ea88d0b0ae
added Ender 3 Pro thumbnail
2022-03-07 15:05:23 +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
Filip Sykala
0d724ad646
Fix test to be runable on other computers.
2022-03-07 11:40:23 +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
a6f84d9d74
Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_opengl_3
2022-03-07 09:45:39 +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
Lukáš Hejl
3bf704932a
Ignore CLion IDE files.
2022-03-04 19:10:50 +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
YuSanka
3505e5a290
Fix of leaking GDI resources on Win7 #8002 :
...
- Code refactoring for draw_focus_rect.
- Use one PaintDC for rendering
- DoubleSlider::Control::Ruler refactoring
- Suppress to update ruler for horizontal slider
2022-03-04 09:27:29 +01:00