iGoX/OrcaSlicer-bambulab
1
0
Fork 0
mirror of https://github.com/FULU-Foundation/OrcaSlicer-bambulab.git synced 2026-09-14 14:48:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,118 Commits 4 Branches 1 Tag
4987e5a7d567d7cc1bbee3ade2bc9651e5f2886f
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Enrico Turri 4987e5a7d5 Render selected objects first 2019-04-11 08:36:00 +02:00
Enrico Turri b98659a749 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 15:55:52 +02:00
Enrico Turri 8b9568797a Copy and paste -> prototype of copy and paste for objects 2019-04-10 15:55:32 +02:00
Enrico Turri 1b6bf30e76 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 14:03:57 +02:00
Enrico Turri 7a1fab09d4 Copy and paste -> Clipboard refactored to accept more than one object 2019-04-10 14:03:40 +02:00
Enrico Turri 2dc88ab0be Fixed crash when typing on keyboard during the app start-up 2019-04-10 13:52:18 +02:00
Enrico Turri a80978f84a Do not show as hovered the entire instance when hovering on modifiers 2019-04-10 12:20:07 +02:00
Enrico Turri 43b51c338e Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 12:17:13 +02:00
Enrico Turri bce98984a1 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-10 12:16:33 +02:00
Enrico Turri 356637a627 Do not activate Delete command when the wipe tower is selected 2019-04-10 12:16:17 +02:00
Enrico Turri 6043dbd07d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 11:20:28 +02:00
Enrico Turri e61be7d260 Render picking pass renders volumes in the same order as the regular render pass 2019-04-10 11:20:09 +02:00
Enrico Turri ffde525100 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 09:52:59 +02:00
Enrico Turri 4866642c5c Fixed icon layers.svg (again) 2019-04-10 09:52:21 +02:00
Enrico Turri 50fc406fe2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 09:46:24 +02:00
Enrico Turri 6f6b78d661 Copy and paste -> Copy a volume from an object and paste to another 2019-04-10 09:27:42 +02:00
Enrico Turri 6cbf9d2523 1st installment of copy and paste -> prototype for volumes copy and paste 2019-04-10 08:40:58 +02:00
Enrico Turri 7aa6c1854f Follow-up to af05e5fc2c -> added missing #else 2019-04-09 15:43:16 +02:00
Enrico Turri 0889877e26 Tweaks to selection from 3D scene 2019-04-09 15:42:00 +02:00
Enrico Turri 24b8c1fde3 Forced one frame render after selecting single volume in objects list 2019-04-09 11:38:56 +02:00
Enrico Turri a13b2b1de3 Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) 2019-04-09 11:18:40 +02:00
Enrico Turri ea3d30bff1 Fix of #2082 -> Added lines M73 P100 and M73 Q100 to gcode to signal that print is finished 2019-04-08 11:54:58 +02:00
Enrico Turri 86cb5bb00d Fixed icon layers.svg 2019-04-08 10:38:48 +02:00
Enrico Turri 09c7eb1d28 Follow-up of a7318dbe19 -> Do not disable other instances when an instance is selected 2019-04-08 09:49:21 +02:00
Enrico Turri a688493d91 Merge branch 'et_canvas_gui_refactoring' of https://github.com/prusa3d/Slic3r 2019-04-08 09:09:12 +02:00
Enrico Turri 8cdc461d34 CTRL-click replace SHIFT-click for addind/removing objects to the current selection from the 3D scene 2019-04-08 08:30:28 +02:00
Enrico Turri 6ca49c05df Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-05 11:55:56 +02:00
Enrico Turri 233eda2813 Export to stl of instances 2019-04-05 11:30:49 +02:00
Enrico Turri a9223aeb5f Follow-up of 763a91e2ca -> take in account of ModelObject::origin_translation when saving parts and modifiers to stl 2019-04-05 10:08:34 +02:00
Enrico Turri 763a91e2ca Export to stl of parts and modifiers 2019-04-04 15:13:43 +02:00
Enrico Turri 24128e01ed Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 14:00:48 +02:00
Enrico Turri 6197f48321 Use current selection to determine proposed filename when exporting to stl files 2019-04-04 14:00:31 +02:00
Enrico Turri 369cdd8b3b Ask user to switch to expert mode when loading a 3mf or an amf file containing instances or modifiers from simple mode 2019-04-04 12:02:13 +02:00
Enrico Turri c7d6691658 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-04 11:31:44 +02:00
Enrico Turri 30f44880d7 Removed 'Export print config' checkbox from save dialog for 3mf and amf files 2019-04-04 11:31:26 +02:00
Enrico Turri 936f7a3b84 Select newly added parts/volumes from current selected instance when adding from 3D scene's context menu 2019-04-04 09:35:13 +02:00
Enrico Turri d79b090f7c Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-04 09:19:07 +02:00
Enrico Turri c29f7bc147 Fix of #2044 
Added sorting by z of the preview data used to generate the gcode preview because there can be shuffling in case of sequential printing
 2019-04-04 09:16:03 +02:00
Enrico Turri 6d9180ba92 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-04 09:03:25 +02:00
Enrico Turri a7318dbe19 Keeps non selected instances as disabled for any combination of current instance's volumes selection 2019-04-04 09:01:47 +02:00
Enrico Turri 305b07978c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-03 15:28:27 +02:00
Enrico Turri 28ec3415eb Keep instance mode selection when at least one instance is already selected 2019-04-03 15:28:09 +02:00
Enrico Turri 7d488e3424 Added call to schedule_background_process() when deleting modifier attribute 2019-04-03 12:45:06 +02:00
Enrico Turri eff8dd1ae5 Fixed negative values for size shown in the sidebar matrix fields when mirroring is applied 2019-04-03 09:05:52 +02:00
Enrico Turri 48da4d4756 Fixed conflicts after merge with master 2019-04-03 08:38:32 +02:00
Enrico Turri 89a0c84c83 Fixed conflicts after merge with master 2019-04-02 15:13:26 +02:00
Enrico Turri ba4f0445c3 Fixed rendering of sla cap slices after deleting object 2019-04-02 14:43:38 +02:00
Enrico Turri f147da1e5d Fixed conflicts after cherry-picking 5c89135 2019-04-02 14:32:12 +02:00
Enrico Turri f3a214e391 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-04-02 10:55:54 +02:00
Enrico Turri adf9c4bd40 Follow-up of d4b22cfb87 -> Fixed dragging of sla instances after slicing 2019-04-02 10:55:36 +02:00
Enrico Turri 83aaa471cf Fixed conflicts after merge with master 2019-04-01 14:21:55 +02:00
Enrico Turri d4b22cfb87 Fix dragging of mixed instances plus volumes selections 2019-04-01 13:53:48 +02:00
Enrico Turri 7cfcf8fb9a Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 11:40:08 +02:00
Enrico Turri 2ae5f386ae Added missing include 2019-04-01 10:28:04 +02:00
Enrico Turri d87b478d60 Camera refactoring 
1) All camera related OpenGL calls moved into class

2) The Camera class now stores the view matrix, the projection matrix and the viewport

3) The Camera class now exposes methods to get the camera orientation vectors, the camera position, the view matrix, the projection matrix and the viewport

4) All the code operating on the camera or requiring camera data has been modified to use the new methods
 2019-04-01 10:00:10 +02:00
Enrico Turri ba89f04429 Fix of visual hints for rotation of full single instance selection 2019-04-01 09:11:23 +02:00
Enrico Turri 1ce3bb690c Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-01 08:28:38 +02:00
Enrico Turri aca78cfba2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-29 12:58:41 +01:00
Enrico Turri 49fe8a9f08 Volumes selected from the sidebar table taken from the currently selected instance 2019-03-29 10:48:20 +01:00
Enrico Turri 0acee468a3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 11:56:35 +01:00
Enrico Turri af3a32b8a0 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 09:30:23 +01:00
Enrico Turri 9b3f1a8942 Small refactoring -> GLGizmosManager gets model from selection and not from canvas 2019-03-28 09:30:01 +01:00
Enrico Turri 98a848d239 Layers editing initialized only for 3D view and not for g-code preview 2019-03-28 09:12:32 +01:00
Enrico Turri a4f404a6a4 Selection enabled only for 3D view and not for g-code preview 2019-03-28 08:44:46 +01:00
Enrico Turri 702186eec3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-28 08:24:25 +01:00
Enrico Turri 46eafca0eb Follow-up of https://github.com/prusa3d/Slic3r/commit/8ea8eb67e46b019febcbf5c77f5f4e9786aab57e, utf-8 path conversion moved into nanosvg library 2019-03-27 15:42:01 +01:00
Enrico Turri d0046283fa Added #define glcheck() for the case HAS_GLSAFE not defined 2019-03-27 15:14:40 +01:00
Enrico Turri 8459410e3c Fixed conflicts after merge with master 2019-03-27 14:57:05 +01:00
Enrico Turri d795f07e7b Added glsafe() around OpenGL calls where missing 2019-03-27 14:42:09 +01:00
Enrico Turri 30c4e4fed6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 12:51:59 +01:00
Enrico Turri c44b6a30f9 Fixed conflicts after merge with master 2019-03-27 12:51:40 +01:00
Enrico Turri 8ea8eb67e4 Fixed loading of SVG textures from utf-8 paths 2019-03-27 12:02:50 +01:00
Enrico Turri 3cd6db2278 Fixed selection lost when Place on Face gizmo is active and user click on another object 2019-03-27 09:06:53 +01:00
Enrico Turri 000542f48d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-27 08:33:48 +01:00
Enrico Turri fee0a6b6b5 void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas) 2019-03-26 15:55:47 +01:00
Enrico Turri 1fbdf7bdaa Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides 2019-03-26 14:53:32 +01:00
Enrico Turri 47c39f51e5 Handling of gizmos related key events moved into new method GLGizmosManager::on_key() 2019-03-26 14:38:30 +01:00
Enrico Turri 52f11a6f0d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 14:08:46 +01:00
Enrico Turri d18208458b Handling of gizmos related char events moved into new method GLGizmosManager::on_char() 2019-03-26 14:08:02 +01:00
Enrico Turri c1d74d2943 Code cleanup 2019-03-26 12:39:40 +01:00
Enrico Turri eafdcb04ba Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse() 2019-03-26 12:30:17 +01:00
Enrico Turri a09197879d Code cleanup 2019-03-26 09:10:35 +01:00
Enrico Turri 9512ed605e Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-26 09:01:53 +01:00
Enrico Turri 3818bfa19a 1st installment of gizmos refactoring 
1) GLCanvas3D::Gizmos moved into a standalone class GLGizmosManager

2) GLGizmosManager handles mouse events by calling its on_mouse method (wip)
 2019-03-26 09:01:04 +01:00
Enrico Turri 3e0ec8098b Code cleanup 2019-03-25 14:13:20 +01:00
Enrico Turri ead45c4fb2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-03-25 14:12:40 +01:00
Enrico Turri 149551946c Fix of #1998 2019-03-25 12:07:43 +01:00
Enrico Turri dd3ac4017a Yet another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-25 08:48:41 +01:00
Enrico Turri 03aeb0d386 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_multivolume_models 2019-03-25 08:32:05 +01:00
Enrico Turri 6bf0cf9466 Another tweak to the logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-22 14:35:26 +01:00
Enrico Turri db21c67f18 Changed logic for releasing mouse capture into GLToolbar::on_mouse() 2019-03-22 13:03:34 +01:00
Enrico Turri bbb2a6d714 Fixed non-uniform scale of single volumes selection when made using the sidebar matrix fields 2019-03-22 11:51:10 +01:00
Enrico Turri a5fd9a34e8 Do not consider modifiers when centering an object after 3mf and amf import 2019-03-22 09:47:40 +01:00
Enrico Turri a8cf701520 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-21 11:05:19 +01:00
Enrico Turri 024efd963a Renamed private methods of Selection 2019-03-21 11:02:10 +01:00
Enrico Turri 3a923b7121 Fixed conflicts after merge with master 2019-03-20 16:09:14 +01:00
Enrico Turri 42c5d624cb Fix into GLToolbar::on_mouse() 2019-03-20 15:30:03 +01:00
Enrico Turri 83b24eee5b Added missing include 2019-03-20 14:36:36 +01:00
Enrico Turri 9a2d7c881b Fixed typo 2019-03-20 14:14:21 +01:00
Enrico Turri d23824af97 GLCanvas3D::Gizmos as a standalone class (GLGizmosManager) 2019-03-20 13:51:25 +01:00