Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 727a5fd997 Better fix for out of print volume detection 2018-08-24 10:03:34 +02:00
Enrico Turri 16259e6f26 Fixed out of print volume detection 2018-08-24 08:56:53 +02:00
Enrico Turri 7e228e6698 Fixed compile on Linux 2018-08-24 08:38:28 +02:00
Enrico Turri 66ce638439 Fixed conflicts after merging with branch eigenize 2018-08-23 15:37:38 +02:00
Enrico Turri a5fcdeec23 Merge branch 'gizmos_3d' of https://github.com/prusa3d/Slic3r into dev 2018-08-23 09:45:04 +02:00
Enrico Turri 0924bedd28 Enhanced behaviour of scale 3D gizmo 2018-08-22 11:22:07 +02:00
Enrico Turri 889d0f1434 3D gizmo grabbers 2018-08-21 14:27:36 +02:00
Enrico Turri edf03e00dd 3D rotate gizmo colored by axis in preview mode 2018-08-21 09:03:38 +02:00
Enrico Turri 743eee8b6e 1st installment of gizmo scale 3D 2018-08-21 08:50:35 +02:00
Enrico Turri 53914e05c6 1st installment of gizmo rotate 3D 2018-08-20 10:23:17 +02:00
Enrico Turri fc0651702d Merge branch 'master' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-20 08:33:42 +02:00
Enrico Turri 296c53e336 Merge branch 'convex_hull' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-17 10:36:42 +02:00
Enrico Turri 048f3a03fe Fixed scale to size of objects with multiple instances 2018-08-17 10:12:43 +02:00
Enrico Turri b6e0458201 Fixed lost selection of imported objects 2018-08-17 09:16:34 +02:00
Enrico Turri 115744b38d Merge branch 'convex_hull' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-16 13:54:56 +02:00
Enrico Turri 1fff2252bc Detection of out of print volume disabled for wipe tower of unknown size 2018-08-16 13:42:35 +02:00
Enrico Turri d38816bd9c GLVolume use a pointer to ModelVolume's convex hull instead of a copy of it 2018-08-16 13:35:56 +02:00
Enrico Turri 2c9b41623a Fixed wipe tower loosing selection after displacement 2018-08-16 13:22:02 +02:00
Enrico Turri da42b42a6c Merge branch 'opengl_to_cpp' of https://github.com/prusa3d/Slic3r into gizmos_3d 2018-08-15 14:39:40 +02:00
Enrico Turri 6b4d8ac934 Removed plater's toolbar 2018-08-15 13:19:58 +02:00
Enrico Turri 4d98d32199 Use of bounding box of rotated 3D convex hull for out of print volume detection 2018-08-15 12:50:06 +02:00
Enrico Turri 168d38df2b Fixed object sinking into print bed after parts import 2018-08-14 09:33:58 +02:00
Enrico Turri 6742735596 Better fix for minimum z of object to lay on the bed after rotations 2018-08-13 16:16:37 +02:00
Enrico Turri bb07100a4f Code cleanup 2018-08-13 09:23:10 +02:00
Enrico Turri b6f6200bd5 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-08-13 08:51:58 +02:00
Enrico Turri c9d23d0ac0 Font for warning texture set to bold 2018-07-31 15:32:16 +02:00
Enrico Turri e7cc3c5f4a Code cleanup 2018-07-31 15:31:24 +02:00
Enrico Turri a03d5178eb Legend texture use square power of two image 2018-07-31 14:32:59 +02:00
Enrico Turri e234973ab4 Warning texture use square power of two image and bigger font size 2018-07-31 14:20:16 +02:00
Enrico Turri 1c0fa19824 3D scene toolbar uses a single texture 2018-07-31 12:25:00 +02:00
Enrico Turri 55e7a1af46 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-31 08:34:34 +02:00
Enrico Turri 2f7876b852 Fixed camera jump after object rotate 2018-07-30 13:57:05 +02:00
Enrico Turri 09de343e65 Fixed slice info after re-export of gcode. Fixes #1081 2018-07-30 13:54:54 +02:00
Enrico Turri 8e433c32bf Time estimator: added placeholder to process gcode lines T 2018-07-30 12:08:26 +02:00
Enrico Turri df201d65f4 Minimum z of object to lay on the bed after rotations. Fixes #1093 2018-07-30 11:38:36 +02:00
Enrico Turri 3f6d3b903d Fixed rotation of 3D view camera after change of bed data 2018-07-30 10:35:08 +02:00
Enrico Turri 11b0325c66 Fixed calculation of bed origin in bed shape dialog 2018-07-30 10:03:17 +02:00
Enrico Turri 1882cd41a4 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-30 09:10:15 +02:00
Enrico Turri bf4871d7f8 Improved remove hovering on objects when mouse leaves 3D scene 2018-07-30 09:09:14 +02:00
Enrico Turri 22f02acc3d Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-30 08:33:28 +02:00
Enrico Turri e1a13e9f08 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-27 15:19:42 +02:00
Enrico Turri 39c326ebae Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-27 14:41:05 +02:00
Enrico Turri c64cba8ec2 A few fixes on 3D scene toolbar 2018-07-27 14:38:19 +02:00
Enrico Turri 590773d77b Fixed conflict after merge with master 2018-07-27 12:15:35 +02:00
Enrico Turri ddda5062c2 3D scene toolbar actions 2018-07-27 12:08:33 +02:00
Enrico Turri a3cdc7e408 Placeholder icons for hover-pressed toolbar items state 2018-07-27 11:36:31 +02:00
Enrico Turri 3a1ec8285e Reddish background when detected out of print volume toolpaths 2018-07-27 09:38:39 +02:00
Enrico Turri c2ab8c2ae3 Out of print volume detection for extrusion toolpaths only 2018-07-27 08:49:58 +02:00
Enrico Turri b5b7894a6f Fixed color of all toolpaths when detected as out of print bed volume 2018-07-26 13:12:09 +02:00
Enrico Turri dd014136b0 Remove hovering on objects when mouse leaves 3D scene 2018-07-26 12:51:31 +02:00
Enrico Turri 828d3ddabc Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-26 12:46:59 +02:00
Enrico Turri efbc1cce25 Fixed rotate gizmo update with multimaterial objects 2018-07-25 11:49:38 +02:00
Enrico Turri 93a05c4946 Use wxWidgets tooltip for 3D scene toolbar 2018-07-25 10:01:17 +02:00
Enrico Turri 4243c7d84a Removed 2D panel 2018-07-25 09:42:03 +02:00
Enrico Turri dd724e9dab M73 lines emitted to gcode only for Marlin firmare. Fixes #1071 2018-07-25 09:19:20 +02:00
Enrico Turri 2107ea7702 Fixed selection of multimaterial objects 2018-07-25 08:40:34 +02:00
Enrico Turri 23e51cd941 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-25 08:35:13 +02:00
Enrico Turri 496a83bb28 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-25 08:35:05 +02:00
Enrico Turri d8f5daf345 Fixed selection of object modified by gizmo 2018-07-24 15:32:44 +02:00
Enrico Turri d4adcd4077 Out of print volume detection for toolpaths 2018-07-24 13:39:17 +02:00
Enrico Turri 4db75d08a9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 12:29:43 +02:00
Enrico Turri 8bf3e63f75 Merge branch 'master' of https://github.com/prusa3d/Slic3r into opengl_to_cpp 2018-07-24 11:20:02 +02:00
Enrico Turri 2df6e08eed Reduced size of MK3 bed textures for compatibility with OpenGL 1.1 2018-07-24 10:33:14 +02:00
Enrico Turri bbe5586c15 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-24 10:03:45 +02:00
Enrico Turri cac4b29153 Fixed crash when generating gcode of multimaterial objects with some object out of the bed 2018-07-23 15:58:08 +02:00
Enrico Turri 1c6d3c9c69 Added xml escape characters detection when exporting object and volumes names to 3mf files 2018-07-23 14:39:50 +02:00
Enrico Turri de085fdb6c Power of two squared bed textures to try to fix #1067 2018-07-23 14:21:14 +02:00
Enrico Turri 4294510ed7 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-23 13:56:26 +02:00
Enrico Turri 0bd8affab9 Attempt to fix #1067 2018-07-23 13:54:43 +02:00
Enrico Turri c68bcb9e60 1st installment of 3D scene toolbar 2018-07-23 13:49:48 +02:00
Enrico Turri f261c83653 Placeholder icons for 3D scene toolbar 2018-07-23 13:22:24 +02:00
Enrico Turri 33175a02f3 Added xml escape characters detection when exporting object and columes names to amf files 2018-07-23 10:58:39 +02:00
Enrico Turri df36de0d35 Fixed status of Slice now and Export G-Code buttons after object import 2018-07-23 10:16:56 +02:00
Enrico Turri 86caf83721 Update objects' list after scaling using gizmo 2018-07-23 08:57:00 +02:00
Enrico Turri 95bd2bb8f9 Faster time estimate for multimaterial 2018-07-20 15:54:11 +02:00
Enrico Turri 4b8e10a05c Slightly faster time estimation 2018-07-20 12:05:08 +02:00
Enrico Turri c1d1721dae Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r 2018-07-20 10:31:53 +02:00
Enrico Turri aaa592bab9 Another fix in gizmos update 2018-07-19 16:06:46 +02:00
Enrico Turri c40258d9b2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-19 15:09:42 +02:00
Enrico Turri 1a6fdb668f Fixed print info 2018-07-19 13:58:25 +02:00
Enrico Turri feb0f76279 Better fix for gizmo update when deleting objects 2018-07-19 13:43:33 +02:00
Enrico Turri 63fe2a9fb9 Warning and legend textures moved from _3DScene class to GLCanvas3D class 2018-07-19 13:18:19 +02:00
Enrico Turri 5ff26bce50 Fixed update of gizmo when deleting all objects 2018-07-19 11:39:51 +02:00
Enrico Turri 678be2b317 Fixed update of rotate gizmo when selecting objects 2018-07-19 11:24:04 +02:00
Enrico Turri 7b551171e8 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-19 08:31:59 +02:00
Enrico Turri 7f267987cb Code cleanup 2018-07-18 15:52:20 +02:00
Enrico Turri be7b786fee Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:11:23 +02:00
Enrico Turri 13ced87089 Fixed depth test when rendering the picking texture 2018-07-18 15:09:26 +02:00
Enrico Turri 4579b71a66 Merge branch 'scene_manipulators' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 15:07:56 +02:00
Enrico Turri 3fac0d92cd Unified opengl textures 2018-07-18 15:07:52 +02:00
Enrico Turri c1dc46bb8e Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 14:49:19 +02:00
Enrico Turri b69e23ce73 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 14:49:09 +02:00
Enrico Turri 6f18e58d13 Fixed compile on Linux and Mac 2018-07-18 14:38:02 +02:00
Enrico Turri d805c8ac3b Disable slicing when one object crosses the print volume boundary 2018-07-18 14:26:42 +02:00
Enrico Turri d672a69554 Slice only objects contained into the print volume 2018-07-18 09:37:25 +02:00
Enrico Turri eb95e29be6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-18 08:29:11 +02:00
Enrico Turri 08529189c9 Changed time estimator default values 2018-07-17 10:50:15 +02:00
Enrico Turri c9827bb4cf Merge branch 'master' of https://github.com/prusa3d/Slic3r into time_estimate 2018-07-17 10:46:34 +02:00
Enrico Turri 5c90746914 Merge with master + resolved conflicts 2018-07-17 10:44:23 +02:00
Enrico Turri ba8c8e5a1f Merge branch 'master' of https://github.com/prusa3d/Slic3r into scene_manipulators 2018-07-17 10:39:42 +02:00