juli/OrcaSlicer
1
1
Fork 0
mirror of https://github.com/OrcaSlicer/OrcaSlicer.git synced 2026-08-06 17:47:41 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,631 Commits 39 Branches 82 Tags
cf5c19fa24ff71070582644b22d6bda3f48023ec
Commit Graph

183 Commits

Author SHA1 Message Date
Noisyfox
cf5c19fa24 Merge remote-tracking branch 'origin/main' into dev/gizmo 2023-11-10 09:57:11 +08:00
Noisyfox
cd8f555714 Fix some gui issues (#2653) 
* Fix text gizmo input dialog caption alignment

* Fix issue that layer slider top/bottom label left edge been cut by draw region (#2603)
 2023-11-09 22:19:40 +08:00
Noisyfox
e57f68a266 Fix painter gizmos crash on macOS 2023-11-06 20:42:02 +08:00
Noisyfox
018b2744db Text: Fix text moving grabber 2023-11-04 11:41:11 +08:00
Noisyfox
3ec927a841 Cut: Use Orca color schema and dialog layout 2023-11-04 11:41:11 +08:00
enricoturri1966
18406c31c0 Cut: Initial porting of Cut Gizmo 2023-11-04 11:41:11 +08:00
Noisyfox
ce2836a7f9 Measure: Fix copy to clipboard encoding 2023-11-04 11:41:11 +08:00
Noisyfox
1bfd9f63b6 Measure: Update measure dialog layout 2023-11-04 11:41:11 +08:00
Noisyfox
4843cda535 Measure: Use Orca color schema 2023-11-04 11:41:11 +08:00
Noisyfox
2c00408d08 Measure: Update measure gizmo tooltip 2023-11-04 11:41:11 +08:00
Noisyfox
c31e1f5229 Measure: Fix measure window position 2023-11-04 11:41:10 +08:00
enricoturri1966
f72d42f920 Measure: Initial porting of Measure Gizmo 2023-11-04 11:41:10 +08:00
enricoturri1966
1561d65712 Sync most of the gizmos with latest PrusaSlicer 2023-11-04 11:41:10 +08:00
enricoturri1966
049dfd3e08 Added method const GLVolume* Selection::get_first_volume() const to simplify client code 
(cherry picked from commit prusa3d/PrusaSlicer@0e3490620e)
 2023-11-04 11:41:10 +08:00
Filip Sykala
9dbb2dfe0d Various gizmos refactoring 2023-11-04 11:41:10 +08:00
Filip Sykala
30af274d44 Separate GizmoManager on_move into gizmo itself 
(cherry picked from commit prusa3d/PrusaSlicer@c751d6327d)
 2023-11-04 11:41:10 +08:00
Noisyfox
005b83912d Do not compile sla related gizmos 2023-11-04 11:41:10 +08:00
Filip Sykala
8e2ab660c5 Add virtual function to process mouse_event 
(cherry picked from commit prusa3d/PrusaSlicer@2ab44546bd)
 2023-11-04 11:41:10 +08:00
Filip Sykala
da4a70785d remove unnecessary getting of raw pointer from unique pointer 
(cherry picked from commit prusa3d/PrusaSlicer@209eda75a0)
 2023-11-04 11:41:10 +08:00
enricoturri1966
094acdb645 Tech ENABLE_RAYCAST_PICKING - Gizmo flatten: fixed update of raycasters transformations 
(cherry picked from commit prusa3d/PrusaSlicer@2a2d442b28)
 2023-11-04 11:41:10 +08:00
enricoturri1966
d2d77456ac Tech ENABLE_RAYCAST_PICKING - Rendering for rectangle selection made only inside the rectangle, on systems supporting framebuffers 
Various other refactorings & fixes

(cherry picked from commit prusa3d/PrusaSlicer@39b1222b22)
 2023-11-04 11:41:09 +08:00
enricoturri1966
1e7a91e2d5 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of Gizmo Flatten 
(cherry picked from commit prusa3d/PrusaSlicer@f5e68a6ac6)
 2023-11-04 11:41:09 +08:00
enricoturri1966
ab090bf20d Tech ENABLE_RAYCAST_PICKING - Refactoring to allow for easier update of raycasters transform 
(cherry picked from commit prusa3d/PrusaSlicer@9ac5ab857b)
 2023-11-04 11:41:09 +08:00
enricoturri1966
29be4cc9a3 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of Move, Rotate and Scale Gizmo 2023-11-04 11:41:09 +08:00
enricoturri1966
1cd421c4b1 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of gizmos - Move Gizmo 
(cherry picked from commit prusa3d/PrusaSlicer@df47ba7122)
 2023-11-04 11:41:09 +08:00
enricoturri1966
3577a259d5 Tech ENABLE_RAYCAST_PICKING - Raytraced picking of volumes 2023-11-04 11:41:06 +08:00
enricoturri1966
02f83f29c7 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 
(cherry picked from commit prusa3d/PrusaSlicer@f504236734)
 2023-11-04 11:41:06 +08:00
Noisyfox
467223b8b0 Fix move gizmo grabber rendering 2023-11-04 11:41:06 +08:00
enricoturri1966
19ad0ca4d9 Tech ENABLE_LEGACY_OPENGL_REMOVAL - Fixed calculation of normal matrices sent to shaders 
(cherry picked from commit prusa3d/PrusaSlicer@c468dcbed7)
 2023-11-04 11:41:06 +08:00
Noisyfox
5ce3ec716e Fix draw cut line 2023-11-04 11:41:06 +08:00
enricoturri1966
fe78e40cb4 Various fixes 2023-11-04 11:41:06 +08:00
enricoturri1966
1e4f16bd39 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Added shaders for glsl version 140 
(cherry picked from commit prusa3d/PrusaSlicer@76d1d4949b)
 2023-11-04 11:41:05 +08:00
enricoturri1966
63272a9df8 Tech ENABLE_GL_SHADERS_ATTRIBUTES - Use shader's vertex attributes and matrices in GLMmSegmentationGizmo3DScene 
(cherry picked from commit prusa3d/PrusaSlicer@4eee0d05f3)
 2023-11-04 11:41:05 +08:00
enricoturri1966
8dc82e7a8d Few small fixes 2023-11-04 11:41:05 +08:00
Noisyfox
03daf61862 Fix outline rendering 2023-11-04 11:41:04 +08:00
enricoturri1966
71fd4084c2 Tech ENABLE_LEGACY_OPENGL_REMOVAL - porting remaining changes 
(cherry picked from commit prusa3d/PrusaSlicer@2f572d3cf0 )
 2023-11-04 11:41:04 +08:00
enricoturri1966
5fc056edfb Some refactoring into GLGizmoSlaSupports::render_points() 
(cherry picked from commit prusa3d/PrusaSlicer@5621f00ee6)
 2023-11-04 11:41:04 +08:00
enricoturri1966
d8551d7a7d Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Use 2D vertices to render GLGizmoPainterBase circle 
(cherry picked from commit prusa3d/PrusaSlicer@5193a15852)
 2023-11-04 11:41:04 +08:00
enricoturri1966
61ed6143e6 Removed unneeded pairs glPushMatrix()/glPopMatrix() 
(cherry picked from commit prusa3d/PrusaSlicer@5f9aeb1e38)
 2023-11-04 11:41:04 +08:00
Noisyfox
c5b209270c Fix a few issues in cut gizmo 2023-11-04 11:41:04 +08:00
enricoturri1966
1fedcb61b7 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Fix in GLGizmoRotate::render_angle_arc(): 
Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Fix in GLModel::render()

(cherry picked from commit prusa3d/PrusaSlicer@2379588196)
 2023-11-04 11:41:04 +08:00
enricoturri1966
d09dc36ff1 Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel: GLVolume geometry + removed class GLIndexedVertexArray from codebase 
(cherry picked from commit prusa3d/PrusaSlicer@1eac357739)
 2023-11-04 11:41:04 +08:00
enricoturri1966
d85bbcba50 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Fixed bug in rendering gizmo rotate 
(cherry picked from commit prusa3d/PrusaSlicer@5fcb618f96)
 2023-11-04 11:41:04 +08:00
enricoturri1966
dd51ce3b90 Follow-up of fdf8b11d4cfa793d1e45d82560d4bd97d0466d40 - Fixed GLGizmoSlaSupports::render_points() 
(cherry picked from commit prusa3d/PrusaSlicer@0c74081f7d)
 2023-11-04 11:41:03 +08:00
enricoturri1966
12dbbf2d1c Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Another refactoring to simplify client code of GLModel::Geometry 
(cherry picked from commit prusa3d/PrusaSlicer@fa1ff1c357)
 2023-11-04 11:41:03 +08:00
enricoturri1966
8107057e17 Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel: MeshClipper::m_vertex_array 
(cherry picked from commit prusa3d/PrusaSlicer@be6922795d)
 2023-11-04 11:41:03 +08:00
enricoturri1966
fc1c8c2565 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Removed Slic3r::GUI::GLPaintContour from GLGizmoPainterBase.hpp/.cpp and replaced with GLModel 
(cherry picked from commit prusa3d/PrusaSlicer@df3d670357)
 2023-11-04 11:41:03 +08:00
enricoturri1966
baa575b5aa Tech ENABLE_GLINDEXEDVERTEXARRAY_REMOVAL - Replace GLIndexedVertexArray with GLModel: 
TriangleSelectorGUI::m_iva_enforcers

TriangleSelectorGUI::m_iva_blockers

TriangleSelectorGUI::m_iva_seed_fills

TriangleSelectorGUI::m_varrays

GLGizmoPainterBase::s_sphere

(cherry picked from commit prusa3d/PrusaSlicer@8916a00821)
 2023-11-04 11:41:03 +08:00
enricoturri1966
b7989e3b2f Gizmos refactoring - Removed GLModels defined into GLGizmoBase, and mostly unused, to avoid wasting GPU memory. Use a shared GLModel for Gizmos inheriting from GLGizmoPainterBase. Initialization of GLModels moved from constructor to render methods 
(cherry picked from commit prusa3d/PrusaSlicer@e3d5cd445c)
 2023-11-04 11:41:03 +08:00
enricoturri1966
874f39aac1 Tech ENABLE_GLBEGIN_GLEND_REMOVAL - Adapt GLModel::Geometry index format in dependence of data size, where possible 
(cherry picked from commit prusa3d/PrusaSlicer@4d2d77e99c)
 2023-11-04 11:41:03 +08:00