Commit graph

1670 commits

Author SHA1 Message Date
Filip Sykala
4acdd76fff Merge branch 'master' into fs_emboss 2022-03-30 09:29:06 +02:00
enricoturri1966
26d1b2a5cd Small refactorings related to GLCanvas3D::_mouse_to_3d() 2022-03-29 11:11:03 +02:00
Filip Sykala
583babb3b4 Merge branch 'master' into fs_emboss 2022-03-24 11:48:09 +01:00
enricoturri1966
94b98e349b Tech ENABLE_NEW_RECTANGLE_SELECTION - Fixed SHIFT + left mouse selection/deselection 2022-03-24 10:10:17 +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
Lukas Matena
dc14ae07a6 Fixed incorrect handling of 3rd party 3MFs in SLA mode (#6100 and others) 2022-03-23 17:16:17 +01:00
enricoturri1966
24bcbd9c0c Optimization in GLCanvas3D::_render_camera_target() 2022-03-23 15:18:24 +01:00
Filip Sykala
a7d3195ec0 Merge branch 'master' into fs_emboss 2022-03-22 15:48:51 +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
Filip Sykala
fec171d14e Merge branch 'master' into fs_emboss
# Conflicts:
#	src/libslic3r/Technologies.hpp
2022-03-21 21:40:37 +01:00
enricoturri1966
76d1d4949b Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 2022-03-21 13:10:47 +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
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
3dddfa919a Debug tech ENABLE_GLMODEL_STATISTICS - Shows an imgui dialog with GLModel statistics data 2022-03-10 15:55:15 +01:00
enricoturri1966
9d2314557d Tech ENABLE_GL_SHADERS_ATTRIBUTES - Removed remaining pairs glPushMatrix()/glPopMatrix() 2022-03-10 13:40:37 +01:00
enricoturri1966
05b65c3a43 Fixed conflicts after merge with branch et_world_coordinates 2022-03-10 13:22:20 +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
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
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
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
c17c4d2e9a Follow-up of 005fef7bf6 - Fixed imgui dialogs associated to gizmo bar and toolbar items 2022-03-08 09:24:42 +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
enricoturri1966
568f42660a Follow-up of 005fef7bf6 - Fixed Toolbars 2022-03-07 12:02:19 +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
31013fb6df Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Refactoring of flat vertex shader
2022-03-04 08:54:23 +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
278ec6fe93 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: flat - Layers editing
2022-03-02 10:12:44 +01:00
enricoturri1966
f4cf9494d0 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Some refactoring 2022-03-01 12:00:29 +01:00
enricoturri1966
78a93acb5b Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: flat - SLA caps
2022-02-28 12:50:43 +01:00
enricoturri1966
d0511b332b Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: flat - Camera target
2022-02-28 12:39:00 +01:00
enricoturri1966
5b1c9a34d6 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: flat - Volumes picking pass
2022-02-28 12:05:08 +01:00
enricoturri1966
507dda6641 Tech ENABLE_GLBEGIN_GLEND_SHADERS_ATTRIBUTES - Use vertex attributes and matrices in shaders.
Shader: flat - Model sequential print clearance
2022-02-28 11:23:46 +01:00
Filip Sykala
8022c64209 Fix Retina coordinate for stored popup menu position 2022-02-25 11:58:15 +01:00
enricoturri1966
1e9951dec5 Follow-up of 5b5fdfba01 - Removed member variable Selection::m_dragging
It was used only in ObjectManipulation::update_if_dirty() to avoid the update the sidebar reset and mirror button, which results in a slow down of the GUI, while dragging objects/gizmos in the 3D scene

A call to GLCanvas3D::is_dragging() is used instead
2022-02-25 11:42:42 +01:00
enricoturri1966
cd32254190 Fixed conflicts after merge with master 2022-02-24 13:17:30 +01:00
Filip Sykala
0d48cf5ab9 Merge branch 'master' into fs_mouse 2022-02-23 14:43:42 +01:00
enricoturri1966
148ed7fee4 Follow-up of 1eac357739 - Fixed warning 2022-02-23 14:27:10 +01:00
enricoturri1966
3bdc6e49c1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2022-02-23 13:39:59 +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
6c397e291c Removed debug code committed by mistake 2022-02-16 10:18:47 +01:00
enricoturri1966
3633112148 Follow-up of 7150e0adda - Fix in clamping max bounding box to avoid z-fighting in gcode preview 2022-02-16 10:17:57 +01:00
enricoturri1966
0835e117d5 Refactoring in GLCanvas3D::LayersEditing::render_volumes() 2022-02-11 12:06:48 +01:00
enricoturri1966
5089d1460d Removed obsolete member variable GLCanvas3D::m_color_by 2022-02-11 11:47:29 +01:00
enricoturri1966
c9ff260d13 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - SLA caps rendered using GLModel 2022-02-11 09:15:56 +01:00