Commit Graph
100 Commits
Author SHA1 Message Date
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
Enrico Turri c9dcf3e865 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-18 15:33:12 +01:00
Enrico Turri b2b037eb0b Show requested filename on title of reload from disk dialog on Mac 2019-12-18 15:32:25 +01:00
Enrico Turri 43213b9548 Added [X] and [Close] buttons to close 3Dconnexion setting imgui dialog by clicking on them 2019-12-16 13:35:45 +01:00
Enrico Turri ca518c003f Added message dialog informing the user that it is not allowed to change the filename when using reload from disk command 2019-12-16 10:24:08 +01:00
Enrico Turri 1e617ee3b4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-13 17:57:17 +01:00
Enrico Turri 06c9d3ad56 Added readme.md file for hidapi 2019-12-13 17:46:35 +01:00
Enrico Turri 62e36cd2d5 Fixed filename shown in open file dialog for reload from disk 2019-12-13 12:41:46 +01:00
Enrico Turri d90fa5d749 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 13:38:26 +01:00
Enrico Turri f2b8607d11 Fixed positioning of gizmos' imgui dialogs 2019-12-12 13:38:08 +01:00
Enrico Turri 03fee19fef Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-12 11:11:20 +01:00
Enrico Turri d6f5ed9ad0 Refactoring in GLGizmosManager to simplify code 2019-12-12 11:11:11 +01:00
Enrico Turri 2744e71967 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-11 15:30:44 +01:00
Enrico Turri 57d069bd0a Some rework on layout of imgui dialogs 2019-12-11 15:30:25 +01:00
Enrico Turri b63b5125b6 Enable selection for missing files in reload from disk command 2019-12-10 14:42:28 +01:00
Enrico Turri 64fc278212 GLCanvas3D - render methods set as constant methods 2019-12-10 12:57:55 +01:00
Enrico Turri bdfed9d9ef Attempt to fix view toolbar background not showing up on Mac when using dark mode 2019-12-10 10:56:21 +01:00
Enrico Turri 68812b081f Removed obsolete (and unused) code 2019-12-09 15:40:14 +01:00
Enrico Turri a7b12f97db Gray icons for gizmos in disabled state 2019-12-09 15:21:18 +01:00
Enrico Turri d0a3e8d41d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-09 13:27:38 +01:00
Enrico Turri e7e4cc5600 Fixed crash while repairing imported model 2019-12-09 13:27:21 +01:00
Enrico Turri 61ab9e37d6 #3287 - Fixed GCodeAnalyzer and GCodeTimeEstimator when using Machinekit and Mach3/Linuxcnc gcode flavours 2019-12-09 11:40:26 +01:00
Enrico Turri f991017a3f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-05 14:43:36 +01:00
Enrico Turri 8728f192c6 Follow-up of c370bb7141 -> Do not force even size of toolbars icon textures 2019-12-05 14:43:18 +01:00
Enrico Turri 90741c993d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-12-05 12:22:42 +01:00
Enrico Turri c370bb7141 Forces even size and disable compression for toolbar icon texture to try to solve artifacts on OsX Catalina 2019-12-05 12:22:24 +01:00
Enrico Turri 8604e19384 Fix into GLShader::load_from_text() 2019-12-04 10:35:28 +01:00
Enrico Turri 8a8c71429c Fixes into ENABLE_THUMBNAIL_GENERATOR_DEBUG 2019-12-03 12:44:20 +01:00
Enrico Turri 89c42063de Merge branch 'et_adaptive_layer_height_2' of https://github.com/prusa3d/PrusaSlicer 2019-12-02 12:47:15 +01:00
Enrico Turri 45f10a3730 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Removed debug output and cleanup 2019-12-02 11:44:11 +01:00
Enrico Turri 773bcbae7a ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Further extension of debug output to investigate issues on Mac and Linux 2019-12-02 10:48:46 +01:00
Enrico Turri d3b2db27a3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_adaptive_layer_height_2 2019-11-29 14:33:45 +01:00
Enrico Turri 40498eee44 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Extended debug output to investigate issues on Mac and Linux 2019-11-29 14:24:24 +01:00
Enrico Turri 1d5db5cf7a ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added debug output to investigate issues on Mac and Linux 2019-11-29 12:45:41 +01:00
Enrico Turri 58fa4f32de Revert e3b9c755aa 2019-11-29 11:01:51 +01:00
Enrico Turri 4fc723d52e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-11-28 15:42:01 +01:00
Enrico Turri e3b9c755aa ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Attempt to fix events on Linux and Mac 2019-11-28 15:41:44 +01:00
Enrico Turri 3dd46f2e03 ENABLE_THUMBNAIL_GENERATOR -> some other refactoring 2019-11-28 15:19:42 +01:00
Enrico Turri ddd1df1552 ENABLE_THUMBNAIL_GENERATOR -> render printbed into thumbnails 2019-11-28 14:18:24 +01:00
Enrico Turri bd1ee8ee4a Small refactoring in Camera::calc_zoom_to_bounding_box_factor 2019-11-28 12:14:31 +01:00
Enrico Turri 0de3704287 ENABLE_THUMBNAIL_GENERATOR -> small refactoring 2019-11-28 12:03:19 +01:00
Enrico Turri 3537f74936 Printbed axes renderable on demand 2019-11-28 11:51:00 +01:00
Enrico Turri 1ba3f0a4f6 Transparent background for thumbnails saved into gcode and sl1 files 2019-11-27 13:37:37 +01:00
Enrico Turri 5fcf41a3aa ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Added undo/redo 2019-11-27 11:08:10 +01:00
Enrico Turri 55a163e216 Added tooltip, showing layer height at mouse cursor, to layer height profile bar 2019-11-26 14:44:14 +01:00
Enrico Turri 381d7e6c2e ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Attempt to fix sliders size, on Mac, into imgui dialog for adaptive layers 2019-11-26 12:50:57 +01:00
Enrico Turri 643b26a0f3 ENABLE_ADAPTIVE_LAYER_HEIGHT_PROFILE -> Small refactoring 2019-11-26 12:24:07 +01:00
Enrico Turri 44d7ac4474 Fixed crash when calling Reload from disk command after slicing on SLA printer 2019-11-25 14:42:36 +01:00
Enrico Turri df3e47e093 Another attempt to fix build on Linux (due to ab00f501f1) 2019-11-25 12:45:49 +01:00
Enrico Turri eee65749d9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-11-25 11:14:07 +01:00
Enrico Turri 2bbd916ccc Fixed build on Linux 2019-11-25 11:13:50 +01:00