Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri dbc0996be1 3Dconnexion devices -> Disabled handling of device buttons / Added camera target to debug dialog / Added extra debug output 2019-11-11 13:04:02 +01:00
Enrico Turri 932b5be196 Fixed build on Linux 2019-11-08 15:54:44 +01:00
Enrico Turri 08861250bf 3Dconnexion devices -> Added extra debug output 2019-11-08 14:43:15 +01:00
Enrico Turri a87d83aeb1 3Dconnexion devices -> Another change in logic to select device 2019-11-08 13:31:34 +01:00
Enrico Turri b10d128ffd 3Dconnexion devices -> Modified logic to select device on Linux 2019-11-08 11:51:56 +01:00
Enrico Turri 4320b8f711 3Dconnexion devices -> Fix into Mouse3DController::handle_packet_button 2019-11-08 09:18:59 +01:00
Enrico Turri 68d6a45815 3D connexion devides -> Added handling of 3 bytes long button packets 2019-11-08 08:47:57 +01:00
Enrico Turri 55a4b99e44 Fixed bug into Camera::set_target() 2019-11-07 11:48:59 +01:00
Enrico Turri a624590b36 Fixed conflicts after merge with master 2019-11-07 09:55:44 +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 d4f190a0c1 Fixed build on Linux and Mac 2019-10-21 15:20:36 +02:00
Enrico Turri 3ce3f33c9c Mouse3DController::connect_device() -> Modified logic to detect and select plugged device 2019-10-21 14:21:51 +02:00
Enrico Turri c47ca5a2c0 Mouse3DController -> Added debug output of device serial number 2019-10-21 11:30:29 +02:00
Enrico Turri 76a2f72e97 Follow-up of a065c92302 -> proper enabling of debug output 2019-10-21 11:12:56 +02:00
Enrico Turri a065c92302 Mouse3DController -> Enabled debug output to check device connection on Linux and Max 2019-10-21 11:06:18 +02:00
Enrico Turri e773f667b1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-21 10:24:52 +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 93ae170113 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-17 08:09:23 +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 e6403a74ef ENABLE_3DCONNEXION_DEVICES tech set as default 2019-10-11 15:51:36 +02:00
Enrico Turri 1c05d88c00 ENABLE_3DCONNEXION_DEVICES -> Added support for 3Dconnexion universal receiver and battery level report 2019-10-11 15:29:57 +02:00
Enrico Turri a7972bcc77 ENABLE_3DCONNEXION_DEVICES -> Debug output of device features 2019-10-11 09:16:20 +02:00
Enrico Turri 8998a8e756 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-11 08:19:24 +02:00
Enrico Turri 9ea501cab2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 16:01:24 +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 4d1cfda14a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 15:44:52 +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 7caa596b95 ENABLE_3DCONNEXION_DEVICES -> Refactoring and code cleanup 2019-10-10 11:55:17 +02:00
Enrico Turri 068b7e86a9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-10 10:50:06 +02:00
Enrico Turri f4654e376e ENABLE_3DCONNEXION_DEVICES -> Slightly increased camera target movement limits 2019-10-10 10:49:47 +02:00
Enrico Turri a65b8f462d #3008 - Reduced max size of bed texture 2019-10-10 09:35:21 +02:00
Enrico Turri ded6d44389 Fixed build on OsX 2019-10-10 09:29:55 +02:00
Enrico Turri aae1250921 ENABLE_3DCONNEXION_DEVICES -> Experimental input queues with max size 2019-10-10 09:04:44 +02:00
Enrico Turri 3a5823bc2e ENABLE_3DCONNEXION_DEVICES -> Added temporary debug output to measure input queue sizes 2019-10-09 15:23:30 +02:00
Enrico Turri 5888477473 ENABLE_3DCONNEXION_DEVICES -> Reworked deadzone check 2019-10-09 14:39:28 +02:00
Enrico Turri a735ec1b48 ENABLE_3DCONNEXION_DEVICES -> Added tech ENABLE_3DCONNEXION_DEVICES_DEBUG_OUTPUT for debug output 2019-10-09 14:18:43 +02:00
Enrico Turri b41a0656b9 ENABLE_3DCONNEXION_DEVICES -> Reworked parsing of data coming from device 2019-10-09 14:01:13 +02:00
Enrico Turri 589e003de0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 13:41:09 +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 9fc1cc6f84 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 12:16:44 +02:00
Enrico Turri 835ee148e5 Fixed conflicts after merging with master 2019-10-09 11:17:48 +02:00
Enrico Turri e6ce74957f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-09 09:58:39 +02:00
Enrico Turri 4ec6199ef1 ENABLE_3DCONNEXION_DEVICES -> Added translation and rotation customizable parameter deadzone 2019-10-08 14:32:05 +02:00
Enrico Turri b7db5a9558 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-08 13:38:27 +02:00
Enrico Turri 9447d3e1b5 ENABLE_3DCONNEXION_DEVICES -> Mouse3DController reworked to handle reports of length 7 bytes and 13 bytes 2019-10-08 13:38:08 +02:00
Enrico Turri 8fcd4e4407 ENABLE_3DCONNEXION_DEVICES -> added debug code to get 3Cconnexion device product id 2019-10-08 09:52:56 +02:00
Enrico Turri 8aa33a9e05 ENABLE_3DCONNEXION_DEVICES -> Hack for filtering out mouse wheel events coming from 3Dconnexion driver 2019-10-08 08:44:50 +02:00
Enrico Turri 6f85b0885a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_3dconnexion 2019-10-07 09:31:43 +02:00