Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 621b8426d3 #3175 - Fixed compatibility with boost v 1.71 2019-11-11 11:21:08 +01:00
Enrico Turri 1e8aa54559 ENABLE_THUMBNAIL_GENERATOR -> Added ENABLE_THUMBNAIL_GENERATOR_DEBUG (disabled) 2019-11-07 09:01:28 +01:00
Enrico Turri a481102fd4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-07 08:10:43 +01:00
Enrico Turri 41dadfdfcf ENABLE_THUMBNAIL_GENERATOR -> Generate thumbnails using GLEW_EXT_framebuffer_object on graphic cards supporting it 2019-11-05 14:50:58 +01:00
Enrico Turri d8dca69d60 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-05 13:58:13 +01:00
Enrico Turri 76377ee0fe ENABLE_THUMBNAIL_GENERATOR -> Export thumbnails to gcode as png data in lines with max 80 characters length 2019-11-04 15:38:15 +01:00
Enrico Turri 065cdd878e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-04 14:29:03 +01:00
Enrico Turri f5bef3707f Added missing include 2019-11-04 14:28:18 +01:00
Enrico Turri 8b8b6c1821 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-04 14:00:36 +01:00
Enrico Turri 64d5ac0d20 ENABLE_THUMBNAIL_GENERATOR -> Export thumbnails to gcode: max length of gcode lines set to 80 characters 2019-11-04 14:00:26 +01:00
Enrico Turri 3d450df680 ENABLE_THUMBNAIL_GENERATOR -> Transparent background for thumbnails saved into .3mf 2019-11-04 11:59:23 +01:00
Enrico Turri c34232214d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-04 11:13:19 +01:00
Enrico Turri 6663fc7018 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-11-01 12:26:43 +01:00
Enrico Turri f94f75d481 ENABLE_THUMBNAIL_GENERATOR -> Render thumbnails using shader 2019-11-01 12:19:27 +01:00
Enrico Turri bf8fcabb29 ENABLE_THUMBNAIL_GENERATOR -> Use orthographic camera when rendering thumbnails 2019-10-31 17:03:33 +01:00
Enrico Turri 418634a677 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-31 16:41:03 +01:00
Enrico Turri 636e446da1 ENABLE_THUMBNAIL_GENERATOR -> Changes to zoom factor and centering algorithm when rendering thumbnails 2019-10-31 16:40:38 +01:00
Enrico Turri 8f180a0cc1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-30 11:47:21 +01:00
Enrico Turri 2cb1edeba7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-30 10:10:10 +01:00
Enrico Turri f6453aab1b ENABLE_THUMBNAIL_GENERATOR -> Fixed potential race condition when generating thumbnails 2019-10-30 10:09:58 +01:00
Enrico Turri b3f53c96c7 Fixed update of 3D preview layout after changing printer after slicing 2019-10-30 08:28:40 +01:00
Enrico Turri 47dfe60f0e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-29 14:47:59 +01:00
Enrico Turri a7b4b232e9 ENABLE_THUMBNAIL_GENERATOR -> Use multisampling when generating thumbnail using off-screen framebuffer 2019-10-29 14:45:15 +01:00
Enrico Turri 3ff3eed2b1 ENABLE_THUMBNAIL_GENERATOR -> Use off-screen framebuffer to render the thumbnail on graphic cards supporting it 2019-10-29 10:27:51 +01:00
Enrico Turri f36dd833d2 ENABLE_THUMBNAIL_GENERATOR -> Reduce thumbnail size if exceeding 3D scene canvas size 2019-10-29 07:32:15 +01:00
Enrico Turri 2896e12a46 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-29 07:09:07 +01:00
Enrico Turri 24aed8eb71 ENABLE_THUMBNAIL_GENERATOR -> Added missing include 2019-10-25 14:32:31 +02:00
Enrico Turri bab4f51bc8 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-25 13:59:27 +02:00
Enrico Turri 2d5c28d6d1 ENABLE_THUMBNAIL_GENERATOR -> Allow for multiple thumbnails into gcode and sl1 files 2019-10-25 13:59:13 +02:00
Enrico Turri de60b40347 ENABLE_THUMBNAIL_GENERATOR -> Thumbnail data saved into gcode using base64 encoding + debug code to extract thumbnails from gcode 2019-10-25 12:18:10 +02:00
Enrico Turri 843251c91f ENABLE_THUMBNAIL_GENERATOR -> Do not render wipe tower into thumbnail 2019-10-25 09:04:58 +02:00
Enrico Turri 982ed95a35 ENABLE_THUMBNAIL_GENERATOR -> Save thumbnail size into gcode 2019-10-25 08:57:13 +02:00
Enrico Turri f7d3cf063b ENABLE_THUMBNAIL_GENERATOR -> Added a comment 2019-10-25 08:19:02 +02:00
Enrico Turri bddde78c9b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-25 08:09:26 +02:00
Enrico Turri 296d79abf7 ENABLE_THUMBNAIL_GENERATOR -> Fixed thumbnail generation for SLA and 3mf 2019-10-24 15:56:10 +02:00
Enrico Turri 1baa333663 ENABLE_THUMBNAIL_GENERATOR -> Fixed flickering of 3D view when generating thumbnail 2019-10-24 12:30:19 +02:00
Enrico Turri d01532f4c6 ENABLE_THUMBNAIL_GENERATOR -> Removed obsolete files 2019-10-24 12:11:24 +02:00
Enrico Turri 29fd0ef7c6 ENABLE_THUMBNAIL_GENERATOR -> Refactoring to simplify code 2019-10-24 12:09:09 +02:00
Enrico Turri a417da8fea ENABLE_THUMBNAIL_GENERATOR -> Fixed volumes visibility test to render them into thumbnail 2019-10-24 11:08:39 +02:00
Enrico Turri a1f2ecb285 ENABLE_THUMBNAIL_GENERATOR -> Fixed color of non printable volumes into thumbnail 2019-10-24 10:38:30 +02:00
Enrico Turri 6d5572ae47 ENABLE_THUMBNAIL_GENERATOR -> Code cleanup 2019-10-24 10:25:40 +02:00
Enrico Turri 5609f53797 ENABLE_THUMBNAIL_GENERATOR -> Add thumbnail data into gcode output 2019-10-24 10:06:31 +02:00
Enrico Turri 4517fcd997 ENABLE_THUMBNAIL_GENERATOR -> Add file Metadata/thumbnail.png into 3mf output 2019-10-24 09:20:33 +02:00
Enrico Turri 540253f676 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-24 08:46:58 +02:00
Enrico Turri ad0a9cf439 ENABLE_THUMBNAIL_GENERATOR -> Add file thumbnail/thumbnail.png into sla output 2019-10-24 08:46:39 +02:00
Enrico Turri 16fd2820db ENABLE_THUMBNAIL_GENERATOR -> WIP: Added missing include and preparation for adding thumbnail to exported sla archive files 2019-10-23 16:01:23 +02:00
Enrico Turri 4d1153c866 ENABLE_THUMBNAIL_GENERATOR -> WIP: Refactoring and preparation for adding thumbnails to exported gcode and 3mf files 2019-10-23 13:31:24 +02:00
Enrico Turri 959ef9a9ec Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-23 08:08:40 +02:00
Enrico Turri 1809497c38 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_plater_thumbnail 2019-10-22 16:03:27 +02:00
Enrico Turri 32a42f2808 Added tech ENABLE_THUMBNAIL_GENERATOR -> 1st installment of generation of thumbnail from plater (WIP) 2019-10-22 16:02:31 +02:00
Enrico Turri 2d610f9b84 #3082 - Workaround to fix incorrect object position after applying gcode line G92 into custom gcode 2019-10-21 10:12:42 +02:00
Enrico Turri 28a6bd7c30 #3075 - Fixed Reload from disk command for .amf files 2019-10-21 08:48:38 +02:00
Enrico Turri 0285e8db2d Merge branch 'et_git_3010' of https://github.com/prusa3d/PrusaSlicer 2019-10-18 12:48:06 +02:00
Enrico Turri 658b1e219e ENABLE_GIT_3010_FIX set as default 2019-10-14 10:03:27 +02:00
Enrico Turri 76c9ddfd3e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_git_3010 2019-10-14 08:49:19 +02:00
Enrico Turri 8b4799d734 Do not show context menu when the user deletes sla support points by right clicking on them and the mouse pointer is hovering the selected object 2019-10-10 16:00:32 +02:00
Enrico Turri cc34860ddd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-10-10 14:45:09 +02:00
Enrico Turri e51d970b2e Fixed crash in Plater::priv::can_reload_from_disk() 2019-10-10 14:44:52 +02:00
Enrico Turri a65b8f462d #3008 - Reduced max size of bed texture 2019-10-10 09:35:21 +02:00
Enrico Turri a6a7303e25 Fixed context menu showing up when user right clicks on 3D scene and release the mouse button after dragging over the objects list 2019-10-09 13:39:24 +02:00
Enrico Turri 835ee148e5 Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
Enrico Turri fbe38fb2a4 #3008 - Generate all mipmaps up to size 1x1 2019-10-02 10:57:07 +02:00
Enrico Turri 6293ff8ccd Fixed crash into GCodeTimeEstimator::post_process() while processing custom end g-code 2019-10-02 09:38:19 +02:00
Enrico Turri c5a5e6a61d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_git_3010 2019-10-02 08:13:11 +02:00
Enrico Turri 8d53c5e978 #3010 - Added tech ENABLE_GIT_3010_FIX - GCodeAnalyzer and GCodeTimeEstimator modified to properly process gcode lines G92 2019-10-01 09:48:42 +02:00
Enrico Turri 6f8a9bc1ff Fixed visual hints in 3D scene not disappearing when tabbing out of size z field in object manipulators sidebar 2019-09-25 13:05:18 +02:00
Enrico Turri fdbe339622 Fixed gizmo scale for objects added to scene using the new context menu 2019-09-25 11:25:14 +02:00
Enrico Turri 2fd5044460 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-24 14:13:22 +02:00
Enrico Turri 7c1706f7ee Follow-up of f4910cafed -> Fix extended to Mac 2019-09-24 14:13:03 +02:00
Enrico Turri a68a72a660 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-09-24 09:11:43 +02:00
Enrico Turri e6604afd05 #2972 - Fixed selection after adding an instance with autocenter active 2019-09-24 09:11:27 +02:00
Enrico Turri 2dc9949a4c ENABLE_ENHANCED_RELOAD_FROM_DISK set as default 2019-09-23 15:35:49 +02:00
Enrico Turri 82a52e8b21 #2922 - Port of commit: https://github.com/prusa3d/PrusaSlicer/pull/2922/commits/f42edd35ce9e438de2c5fcacb69bfa66d6a28bbc by jschuh 2019-09-23 14:56:27 +02:00
Enrico Turri 1115e77b38 ENABLE_ENHANCED_RELOAD_FROM_DISK -> Fixed export/import to/from .amf to keep compatibility with 3rd part software. 2019-09-23 13:54:49 +02:00
Enrico Turri 4a45c1aa41 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-23 12:34:18 +02:00
Enrico Turri 5eb4692442 ENABLE_ENHANCED_RELOAD_FROM_DISK -> Fixed export/import to/from .3mf to keep compatibility with 3rd part software. 2019-09-23 12:33:21 +02:00
Enrico Turri c0576a8770 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-23 08:27:01 +02:00
Enrico Turri ac305a77b3 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-20 11:19:24 +02:00
Enrico Turri d66bf7e1e1 Follow-up of 8aaff08355 -> Do not show the new context menu when the user pans the scene + cleanup 2019-09-20 11:19:06 +02:00
Enrico Turri 9e09c52ab0 #2948 - Max zoom takes in account custom bed model size 2019-09-20 09:53:35 +02:00
Enrico Turri 0de8245432 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-19 14:03:05 +02:00
Enrico Turri 355a7d6a8c Fixed empty filename when trying to export a plate where no object is selected and no object is printable 2019-09-19 14:01:17 +02:00
Enrico Turri 74747226f7 ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Modified .zip.amf import/export to save/load volume matrices and source data

2) Incremented .zip.amf version to 3
2019-09-19 12:39:59 +02:00
Enrico Turri 3a40565d03 Added tech ENABLE_ENHANCED_RELOAD_FROM_DISK
1) Reworked void Plater::priv::reload_from_disk() to be more general

2) Added source data to class ModelVolume

3) Modified .3mf import/export to save/load volume matrices and source data

4) Incremented .3mf version to 2
2019-09-19 09:09:11 +02:00
Enrico Turri a37ad3b552 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-19 08:33:59 +02:00
Enrico Turri d2e8026a80 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 15:50:06 +02:00
Enrico Turri cd7895065a Fixed typo 2019-09-17 15:48:39 +02:00
Enrico Turri 73f0b32abe Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 15:40:28 +02:00
Enrico Turri f4910cafed Fixed selection after adding a modifier by loading it from file 2019-09-17 15:30:54 +02:00
Enrico Turri b8cf0db209 Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 12:54:46 +02:00
Enrico Turri a93e63e296 Fixed object shifted after saving to/reloading from .3mf and .zip.amf a multivolume object with printable parts moved by user 2019-09-17 12:50:54 +02:00
Enrico Turri 5ae2a39e2f Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 08:19:57 +02:00
Enrico Turri 1624b634dd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-17 08:18:20 +02:00
Enrico Turri ffe62d543d Merge branch 'dev' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-16 08:26:06 +02:00
Enrico Turri e1774f9085 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_reload_from_disk 2019-09-16 08:25:57 +02:00
Enrico Turri 7fe691f14e Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-12 10:46:32 +02:00
Enrico Turri 724cc19ae5 Fixed object position after reload from disk 2019-09-12 10:44:38 +02:00
Enrico Turri 22ab022088 Merge branch 'et_reload_from_disk' of https://github.com/prusa3d/PrusaSlicer into dev 2019-09-11 15:36:23 +02:00
Enrico Turri c55a463c93 Do not show intermediate states in objects list while reloading from disk 2019-09-11 15:31:30 +02:00
Enrico Turri 26f3af4b16 Fixed modifiers after reload from disk 2019-09-11 15:02:57 +02:00