Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 0966707d40 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-10 12:37:12 +01:00
Enrico Turri 0f5f2bc519 Reintroduce rotation limits for camera for FDM printers 2020-02-10 12:36:52 +01:00
Enrico Turri a1c0a29af2 ENABLE_BACKWARD_COMPATIBLE_RELOAD_FROM_DISK - Fixed inconsistencies for splitted and cutted objects 2020-02-07 09:49:48 +01:00
Enrico Turri ef32cd6059 Fixed conflicts after merge with master 2020-02-06 15:28:50 +01:00
Enrico Turri c6ca180142 Use frontend data to update labels 2020-02-06 15:19:53 +01:00
Enrico Turri 3981e25f75 Fixed labels auto-sizing 2020-02-06 12:06:39 +01:00
Enrico Turri bfea105c2e Fixed mmissing #if ENABLE_SHOW_SCENE_LABELS 2020-02-06 10:39:42 +01:00
Enrico Turri a430ff546e Merge remote-tracking branch 'origin/et_labels' 2020-02-06 09:58:44 +01:00
Enrico Turri a72be256f8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-06 09:57:48 +01:00
Enrico Turri f37a31596c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-06 09:15:15 +01:00
Enrico Turri 5c4b481e35 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-05 15:27:20 +01:00
Enrico Turri a04c72b0c9 Fixed unneded auto-extra frame render 2020-02-05 15:27:11 +01:00
Enrico Turri fce9f77472 Translations with arrow keys with modifiers:
Shift -> slower translations

Ctrl -> translations in camera space
2020-02-05 13:14:50 +01:00
Enrico Turri 3ec4b77dcd Added item menu 'Edit/Show labels' and removed labels activation from preferences dialog 2020-02-04 14:42:26 +01:00
Enrico Turri 9f536291b0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-04 14:41:50 +01:00
Enrico Turri dc393e2f0a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-04 12:28:06 +01:00
Enrico Turri 87daba9288 Movements and rotations by keyboard indipendent from gizmos:
Left arrow = Decrease X by 1mm

Right arrow = Increase X by 1mm

Up arrow = Decrease Y by 1mm

Down arrow = Increase Y by 1mm

PgUp = Rotate 45 degrees CCW

PgDown = Rotate 45 degrees CW
2020-02-04 11:42:58 +01:00
Enrico Turri 648060f4ec Smoother movements/rotations when using arrow keys 2020-02-04 10:31:50 +01:00
Enrico Turri 3371fa42da Follow-up of e042cab8fa -> Avoid polluting undo/redo stack 2020-02-04 09:32:09 +01:00
Enrico Turri c6310e49b3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-03 16:05:41 +01:00
Enrico Turri e042cab8fa Follow-up of 8453c88482, c09091c407 and 9d55121695 -> Use key down event in place of key up event 2020-02-03 16:05:13 +01:00
Enrico Turri f09bed32b6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-02-03 15:48:56 +01:00
Enrico Turri 03680bb014 Follow-up of 3a99b23ec7 -> F5 accelerator added also to objects list 2020-02-03 15:47:09 +01:00
Enrico Turri 8453c88482 Cut Gizmo -> added movements using arrow keys:
Up arrow = increase Z by 1mm

Down arrow = decrease Z by 1mm
2020-02-03 15:00:49 +01:00
Enrico Turri c09091c407 Rotate Gizmo -> added rotations using arrow keys:
Left arrow = 90 degrees around Z axis CCW

Right arrow = 90 degrees around Z axis CW

Up arrow = 45 degrees around Z axis CCW

Down arrow = 45 degrees around Z axis CW
2020-02-03 14:51:25 +01:00
Enrico Turri 9d55121695 Move Gizmo -> added movements using arrow keys:
Left arrow = decrease X by 1mm

Right arrow = increase X by 1mm

Up arrow = increase Y by 1mm

Down arrow = decrease Y by 1mm
2020-02-03 14:39:16 +01:00
Enrico Turri 1ee2f16a71 3D scene labels transparent to mouse click 2020-02-03 13:24:11 +01:00
Enrico Turri 6fa49f5931 Added sequential print order id to 3D scene labels 2020-02-03 11:44:26 +01:00
Enrico Turri 0937c576ac Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 11:43:37 +01:00
Enrico Turri 251a7d1329 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-02-03 08:23:55 +01:00
Enrico Turri 61e9cb0f72 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-31 12:15:14 +01:00
Enrico Turri 3a99b23ec7 #3580 - Added menu item 'Edit/Reload from disk' and F5 key acceleration to reload the entire plater 2020-01-31 12:15:04 +01:00
Enrico Turri 0407634824 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 15:46:48 +01:00
Enrico Turri e679bcced6 Follow-up of 17a6b696e7 -> Fixed missing imgui window size initialization 2020-01-29 15:40:56 +01:00
Enrico Turri 16fa68df0c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 14:46:09 +01:00
Enrico Turri da3cb30b7c Follow-up of 17a6b696e7 -> Fixed build when tech ENABLE_6DOF_CAMERA is disabled 2020-01-29 14:44:03 +01:00
Enrico Turri 504413cc91 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_labels 2020-01-29 12:31:50 +01:00
Enrico Turri f7f1e2ce42 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-29 12:09:34 +01:00
Enrico Turri 17a6b696e7 Workaround to fix SPE-1082 + refactoring of 6 dof camera 2020-01-29 12:08:38 +01:00
Enrico Turri 9032dadff3 Added extra frame renders to let labels grow to their final size 2020-01-28 15:57:02 +01:00
Enrico Turri d5b258c267 1st installment of object/instance labels in 3D scene 2020-01-28 13:15:21 +01:00
Enrico Turri 69549af9ac Invalidate object bounding box after arrange 2020-01-28 11:11:45 +01:00
Enrico Turri 15cb8ec653 Another refactoring into class Camera 2020-01-28 09:13:54 +01:00
Enrico Turri 83e8cfa206 Small refactoring into class Camera 2020-01-27 13:39:44 +01:00
Enrico Turri 71ebb0f2c6 Removed duplicate definition in Preset::sla_printer_options() 2020-01-24 12:59:26 +01:00
Enrico Turri 2b93900ac0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-21 14:07:22 +01:00
Enrico Turri dd09077bba Reload from disk command enhanced to work with 3mf/amf files saved with PrusaSlicer 2.1.0 and earlier 2020-01-21 14:07:13 +01:00
Enrico Turri c87e951da5 #3536 - Fixed PrusaSlicer not closing the file when trying to open an invalid 3mf (actually any zip) file 2020-01-20 13:29:59 +01:00
Enrico Turri cbe5132832 #3540 - Fixed toolpaths preview for empty ranges 2020-01-20 10:38:01 +01:00
Enrico Turri 8840cb0905 Merge remote-tracking branch 'origin/et_6dof_camera' 2020-01-17 15:01:24 +01:00
Enrico Turri b368f8ff24 Fixed conflicts after merge with master 2020-01-17 14:58:19 +01:00
Enrico Turri acb825cf1e Merge remote-tracking branch 'origin/et_system_printers' 2020-01-17 14:20:10 +01:00
Enrico Turri e8d52cfba1 Fixed conflicts after merge with master 2020-01-17 14:16:12 +01:00
Enrico Turri cc19e9c48f ENABLE_KEEP_LOADED_VOLUME_TRANSFORM_AS_STAND_ALONE set as default 2020-01-17 12:12:38 +01:00
Enrico Turri 94a3d38afd ENABLE_3DCONNEXION_DEVICES_CLOSE_SETTING_DIALOG set as default 2020-01-17 11:45:52 +01:00
Enrico Turri 4eee702984 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE set as default 2020-01-17 11:26:26 +01:00
Enrico Turri ccb126a5f4 ENABLE_RELOAD_FROM_DISK_MISSING_SELECTION set as default 2020-01-17 11:07:10 +01:00
Enrico Turri b6ab6378d7 ENABLE_VIEW_TOOLBAR_BACKGROUND_FIX set as default 2020-01-17 10:50:25 +01:00
Enrico Turri dad09c737c ENABLE_GIZMO_ICONS_NON_ACTIVABLE_STATE set as default 2020-01-17 10:34:32 +01:00
Enrico Turri 02aa629449 3DConnexion devices -> Tweak of sensitivity parameters and dependency of translation from zoom factor 2020-01-17 09:36:34 +01:00
Enrico Turri 34aac7e292 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_6dof_camera 2020-01-17 08:13:58 +01:00
Enrico Turri 67655743b9 Follow-up of merge of pull request #3293 -> Fixed missing include (for MAC build) 2020-01-16 16:18:35 +01:00
Enrico Turri 46819224ee Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-16 16:03:14 +01:00
Enrico Turri 75c2b44d23 Follow-up of merge of pull request #3293 -> Fixed link error and toolpaths role colors 2020-01-16 16:02:40 +01:00
Enrico Turri 6be4b3865b Merge remote-tracking branch 'foxox/feature/ScaleSpeedLegendToVisible2' 2020-01-16 13:55:59 +01:00
Enrico Turri a9529fbcdc Added method void Camera::rotate_local_around_pivot(const Vec3d& rotation_rad, const Vec3d& pivot) to rotate the camera around a generic point 2020-01-16 12:00:54 +01:00
Enrico Turri 89166accbe Modified layout of preferences dialog 2020-01-16 11:08:19 +01:00
Enrico Turri 3f2ccf08d2 3Dconnexion devices translation linearly dependent on zoom 2020-01-16 10:17:07 +01:00
Enrico Turri 9f7feedc8b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_6dof_camera 2020-01-16 09:18:21 +01:00
Enrico Turri 9df7eb4e08 Customizable use of 6 dof camera 2020-01-16 09:12:36 +01:00
Enrico Turri 62e60bcb43 Six degrees of freedom camera - 1st installment 2020-01-15 12:49:34 +01:00
Enrico Turri 91acbd01ed Fixed GCodeAnalyzer and GCodeTimeEstimator to avoid artifacts while rendering toolpaths due to numerical issues on extruder coordinate 2020-01-13 15:27:37 +01:00
Enrico Turri fdb1d2c9de Follow - up of abd432e7a8f91bba876a29c857844c93dab4b762->Set default as non fullpath export 2020-01-13 08:47:11 +01:00
Enrico Turri 63f8fda61d #3492 - Fix of export of toolpaths to obj 2020-01-09 12:23:17 +01:00
Enrico Turri 051fcd4e24 Configurable system printers bed textures and models 2020-01-09 10:27:42 +01:00
Enrico Turri 4aee673b13 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-08 12:30:52 +01:00
Enrico Turri 7a8251b626 Attempt to fix #3479 2020-01-08 12:30:42 +01:00
Enrico Turri abd432e7a8 Configurable paths export (fullpath or not) to 3mf and amf 2020-01-08 11:11:38 +01:00
Enrico Turri 5a63b9a6a0 Follow-up of 5b2e2fe7b3 -> Fixed uv mapping on gizmobar 2020-01-08 10:04:39 +01:00
Enrico Turri 8559360cf8 #3385 - Further extended min/max sensitivity for 3Dconnexion devices 2020-01-07 13:17:39 +01:00
Enrico Turri 5b2e2fe7b3 Fixed artifacts on toolbar and gizmobar icons showing up when changing screen or toolbar scale factors 2020-01-07 12:40:03 +01:00
Enrico Turri 8fd753ab27 Follow-up of c790e2ff7c -> Fixed include 2020-01-06 12:31:35 +01:00
Enrico Turri cc7b0297a0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-06 12:11:07 +01:00
Enrico Turri c790e2ff7c Added unit test for checking geometry after save+load to 3mf cycle 2020-01-06 12:10:57 +01:00
Enrico Turri 80ef0e0334 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2020-01-03 14:43:02 +01:00
Enrico Turri 83cbe1dd33 3DConnexion devices' Y axis used for zoom in/zoom out 2020-01-03 14:42:52 +01:00
Enrico Turri a4ad0a0925 Fixed unresponsive 3Dconnexion device when switching to preview 2020-01-03 11:41:29 +01:00
Enrico Turri 3fb9fd4e30 #3389 - Added logging of detected 3Dconnexion device 2020-01-03 10:01:27 +01:00
Enrico Turri 51ca7cbdfe #3385 - Increased max sensitivity for 3Dconnexion devices 2020-01-02 11:56:48 +01:00
Enrico Turri 3d5e32a876 #3435 - Added object's instances count into Slic3r_PE_model.config inside exported .3mf files 2020-01-02 11:37:50 +01:00
Enrico Turri a2ff94515f #3430 - Fixed crash when right-clicking on wipe tower 2020-01-02 09:07:33 +01:00
Enrico Turri cf0697b5f2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-20 16:03:04 +01:00
Enrico Turri ba5815c606 Fixed wrong z value after reload from disk for objects with x and y rotation 2019-12-20 16:02:56 +01:00
Enrico Turri e9bb3c2450 3mf and amf import: keep loaded volumes transformation as a member of ModelVolume without applying it to the mesh 2019-12-20 12:11:58 +01:00
Enrico Turri feaccc557d Partial revert of cc919c68b8 2019-12-19 11:38:48 +01:00
Enrico Turri 3b8d42a64f Fixed selection after cut command 2019-12-19 10:06:46 +01:00
Enrico Turri f8adf99c8d Rolled back version numbers for 3mf and amf files 2019-12-19 09:41:30 +01:00
Enrico Turri fecd89fa38 Do not allow to apply reload from disk command to objects whose mesh has been modified after non uniform scale operations 2019-12-19 09:21:57 +01:00
Enrico Turri 7013f148b5 Store new source path in ModelVolume after reload from disk 2019-12-19 09:02:50 +01:00
Enrico Turri 750ea439bb Do not allow to apply reload from disk command to objects splitted using split to objects or split to volumes commands 2019-12-19 08:05:57 +01:00