Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 077d4aa3d7 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-12 15:36:11 +02:00
Enrico Turri de88db5918 #2616 - Added Recent projects item to File menu 2019-07-12 15:36:01 +02:00
Enrico Turri cc70c8dff9 Tech ENABLE_SVG_ICONS set as default 2019-07-12 10:13:35 +02:00
Enrico Turri 2f57f756e5 Follow-up of 4c6c608342 -> refactoring 2019-07-12 09:26:19 +02:00
Enrico Turri 4c6c608342 GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items.
Stack dialog for undo and redo items is now shown on right click only
2019-07-11 15:29:46 +02:00
Enrico Turri f964f5e99a Deactivate undo/redo toolbar items by pressing Esc key 2019-07-11 07:54:33 +02:00
Enrico Turri dbf0eacfa7 Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it 2019-07-11 07:46:40 +02:00
Enrico Turri 1b5ab100bd GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos 2019-07-10 14:08:14 +02:00
Enrico Turri 14dad5039a Imgui dialogs for undo/redo centered on their toolbar item icon 2019-07-10 13:45:25 +02:00
Enrico Turri 40a1f31e84 Disable remaining toolbar items when one of them is toggable and pressed 2019-07-10 11:59:25 +02:00
Enrico Turri 46e295407b Modified toolbar to call RenderCallback only when the item is toggable and pressed 2019-07-10 10:52:12 +02:00
Enrico Turri 1f74d7fdfc Added color number in legend texture for color prints 2019-07-09 15:47:34 +02:00
Enrico Turri 52dc8547ac Reverder order of rendering of color print time estimates 2019-07-09 15:08:34 +02:00
Enrico Turri 29dfa786ff Merge branch 'et_color_print_times' of https://github.com/prusa3d/PrusaSlicer 2019-07-09 14:24:24 +02:00
Enrico Turri d4914441f3 Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods 2019-07-09 10:18:57 +02:00
Enrico Turri 36049788ac Fixed reset of bed 3d model 2019-07-09 08:24:23 +02:00
Enrico Turri 4ba7dfb6dd Refactoring of functions thick_lines_to_indexed_vertex_array() to reduce the amount of produced vertices while reducing visual artifacts in gcode toolpaths due to averaged normals 2019-07-08 15:30:59 +02:00
Enrico Turri 9ba5568539 Fixed conflicts after merge with master 2019-07-08 09:23:37 +02:00
Enrico Turri ad5329253e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_color_print_times 2019-07-08 08:45:11 +02:00
Enrico Turri 25d916f144 Color change time estimates 2019-07-08 08:40:20 +02:00
Enrico Turri 2c0f0c85a5 Fixed bed shape dialog layout 2019-07-03 10:06:22 +02:00
Enrico Turri 7a7316fcbf Fixed compile warnings in Bed3D 2019-07-03 09:19:07 +02:00
Enrico Turri d101ed709c Button 'Load shape from STL' centered into its panel in bed shape dialog 2019-07-03 08:58:05 +02:00
Enrico Turri 90daffccf2 View dependent order of rendering for layers editing visual hints to keep the correct transparency 2019-07-02 15:49:18 +02:00
Enrico Turri 2a71665de9 Follow-up of d07b3fb08b -> Show current bed shape for custom bed in bed shape dialog 2019-07-02 15:10:59 +02:00
Enrico Turri d15698e21e GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call 2019-07-02 12:55:55 +02:00
Enrico Turri b835075fd6 Visual hints for layers editing enabled whenever a layer is selected into the objects list 2019-07-02 10:34:30 +02:00
Enrico Turri 2356fe5a13 Added member BoundingBoxf3 m_bounding_box to GLIndexedVertexArray and removed member BoundingBoxf3 bounding_box from GLVolume 2019-07-01 13:26:06 +02:00
Enrico Turri 4269c8b23c Removed GLVolume non-VBO rendering 2019-07-01 12:28:16 +02:00
Enrico Turri d7c418ef84 Modified function thick_lines_to_indexed_vertex_array() to remove visual artifacts on paths in gcode preview 2019-07-01 08:33:40 +02:00
Enrico Turri 6cfb9bec36 Removed memory leaks due to Plater::priv::config not being deleted 2019-06-27 15:23:03 +02:00
Enrico Turri 97bb4a80cc Removed memory leaks due to Sidebar::priv::object_manipulation, Sidebar::priv::object_settings and Sidebar::priv::frequently_changed_parameters not being deleted 2019-06-27 15:16:36 +02:00
Enrico Turri 26c8eed1ae Removed memory leaks due to GUI_App::app_config, GUI_App::preset_bundle and GUI_App::preset_updater not being deleted 2019-06-27 14:42:55 +02:00
Enrico Turri 1058721dba Added visual hints in 3D scene for layers editing 2019-06-27 13:42:50 +02:00
Enrico Turri 75b0f65d79 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-27 11:25:13 +02:00
Enrico Turri 90d1ac2c8f Tech ENABLE_RENDER_PICKING_PASS extended so that user can switch between picking pass texture rendering and regular rendering by pressing [T] key 2019-06-27 11:25:04 +02:00
Enrico Turri 070c9f03fe Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-26 14:25:26 +02:00
Enrico Turri a07088a8d9 #2561 - Fixed freezing of perspective camera when zooming-in 2019-06-26 14:25:05 +02:00
Enrico Turri 2f806dedc7 Fixed rendering of selection rectangle with perspective camera 2019-06-25 09:51:43 +02:00
Enrico Turri 3d755e1bbe Removed 'Use legacy OpenGL 1.1 rendering' option 2019-06-25 09:20:58 +02:00
Enrico Turri 992170c5f6 1) Perspective camera set as default camera type
2) Camera type selection added to Preferences dialog
2019-06-24 15:55:14 +02:00
Enrico Turri 53d1ff879c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-24 13:21:14 +02:00
Enrico Turri 7aaba25520 Do not allow to copy/paste volumes when using sla printer 2019-06-24 13:21:05 +02:00
Enrico Turri fab3634931 #2395 - Reworked logic of method Model::convert_multipart_object() 2019-06-24 12:43:18 +02:00
Enrico Turri 1459ad65c6 #2433 - Time Estimator: clamp accelerate/decelerate distances to avoid them to become negative 2019-06-24 12:35:20 +02:00
Enrico Turri 6b0d75127b #2428
1) Reworked logic for pasting volumes

2) Fixed paste of volumes into different objects

3) Do not apply offset when pasting into the copied object

4) Keep source transformation matrix and relative positions when copy/pasting volumes into another object
2019-06-24 12:26:11 +02:00
Enrico Turri 1c895ee6a0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-24 11:23:43 +02:00
Enrico Turri 38d5817bc9 Disabled ENABLE_CAMERA_STATISTICS 2019-06-24 11:23:25 +02:00
Enrico Turri 5766e9e915 Fixed conflicts after merge with branch et_perpsective_camera 2019-06-24 11:08:42 +02:00
Enrico Turri 00b9a3ad32 ENABLE_COMPRESSED_TEXTURES set as default 2019-06-24 09:54:58 +02:00
Enrico Turri 8b3d88bc0a Adaptive perspective camera frustrum 2019-06-24 09:38:46 +02:00
Enrico Turri 301eda7369 ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default 2019-06-24 09:27:19 +02:00
Enrico Turri 96276394d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-24 08:15:41 +02:00
Enrico Turri e5be8adadf Fixed build on MacOS 2019-06-20 11:05:05 +02:00
Enrico Turri b7f67369c9 Serialized camera type and fixed Mac build 2019-06-20 10:02:52 +02:00
Enrico Turri 6af69667a3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-20 08:51:08 +02:00
Enrico Turri 5dcc6c7f36 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 14:33:31 +02:00
Enrico Turri b91b94ad3c Key K set as camera type toggle and updated keyboard shortcuts dialog 2019-06-19 14:33:09 +02:00
Enrico Turri da8179d9c7 More camera related functionalities moved from GLCanvas3D to Camera 2019-06-19 14:18:51 +02:00
Enrico Turri a3e6412113 Enabled perspective camera 2019-06-19 13:01:18 +02:00
Enrico Turri b0b54ed0e6 Fixed flickering of 3D view when moving objects on NVIDIA graphic cards 2019-06-19 11:05:34 +02:00
Enrico Turri a15cb597ab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 10:35:27 +02:00
Enrico Turri 28dd52d88b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 08:17:58 +02:00
Enrico Turri b001eca21f #2528 - New project command automatically switches to 3D editor view 2019-06-18 14:45:10 +02:00
Enrico Turri 5ee695b629 #2506 - Fixed crash while manually editing SLA supports 2019-06-18 08:53:13 +02:00
Enrico Turri ddb4c1ff3f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-17 09:34:25 +02:00
Enrico Turri 9ffd294f07 Fixed functions declaration template<class Tf> inline constexpr coord_t scaled(Tf val) and template<class Tf> inline constexpr Tf unscaled(coord_t val) to use constexpr on versions of Visual Studio which support it 2019-06-17 09:28:41 +02:00
Enrico Turri ac8de0bcaf Follow-up of 1a91add2e6 -> Improvements to tighter camera frustrum to reduce z-fighting 2019-06-14 15:37:29 +02:00
Enrico Turri 541f58c656 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-14 10:57:29 +02:00
Enrico Turri ed4b71eb15 Layers editing overlay rendering modified to use a texture drawn on a quad lying in a plane parallel to the camera viewport 2019-06-14 10:55:56 +02:00
Enrico Turri 1a91add2e6 Tighter camera frustrum to reduce z-fighting 2019-06-14 10:38:09 +02:00
Enrico Turri a99466ef1d Method Camera::apply_projection() called at every rendered frame 2019-06-13 10:24:19 +02:00
Enrico Turri f0b228c4d2 Added support for distance between camera position and camera target 2019-06-13 09:12:44 +02:00
Enrico Turri 26d48b7f52 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-13 08:48:19 +02:00
Enrico Turri 9805417028 Fixed method Camera::get_position() 2019-06-13 08:47:38 +02:00
Enrico Turri 7bfb0aaac0 Fixed method Camera::get_dir_forward() 2019-06-13 08:38:49 +02:00
Enrico Turri 428cc4e7c9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-12 11:45:57 +02:00
Enrico Turri abdb5c5d74 Fixed conflicts after git cherry-picking 39cfe819daeb7dd71bae5ff20edfbe6396dffbe8 2019-06-12 10:57:20 +02:00
Enrico Turri d07b3fb08b Bed shape dialog refactoring 2019-06-12 10:00:51 +02:00
Enrico Turri c7ba8c4daa Fixed conflicts after cherry-picking 932e54383d28acbc96f0af6c38c838f2bb23f21d 2019-06-10 11:57:42 +02:00
Enrico Turri 836f2d777f Update 3D scene when all compressed texture data are sent to GPU 2019-06-05 10:07:59 +02:00
Enrico Turri a9ea9b3e0a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-05 07:48:32 +02:00
Enrico Turri 273c30c8ce Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-03 15:47:33 +02:00
Enrico Turri 6a8c7a8705 Fixed race condition while compressing texture data and sending them to the GPU 2019-06-03 13:53:30 +02:00
Enrico Turri 4a4deef420 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-03 12:16:38 +02:00
Enrico Turri e6af0d3dc4 Temporary low-res texture shown while generating compressed data on the CPU 2019-06-02 11:01:51 +02:00
Enrico Turri 545c013acd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-02 09:39:11 +02:00
Enrico Turri f0baefb6ff Asynchronous texture compression on CPU 2019-05-31 15:25:02 +02:00
Enrico Turri 58adeb01d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-31 07:41:22 +02:00
Enrico Turri 8d86192530 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-29 08:30:23 +02:00
Enrico Turri 8012499206 Application of anisotropy to textures moved into GLTexture methods 2019-05-28 15:21:34 +02:00
Enrico Turri 886da08f89 Texture compression set as an option 2019-05-28 12:53:16 +02:00
Enrico Turri 61c41aa90f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-28 09:46:40 +02:00
Enrico Turri e0da08906b Disabled debug render statistics dialog 2019-05-27 09:20:48 +02:00
Enrico Turri 61730aee27 Updated shortcut dialog with new scale to fit print volume command 2019-05-24 15:53:15 +02:00
Enrico Turri efe29b3c2d Fixed conflicts after merge with master 2019-05-24 15:29:22 +02:00
Enrico Turri bf9740188a Code cleanup 2019-05-24 15:22:27 +02:00
Enrico Turri 734d946912 1) Added Scale to print volume menu item to objects list context menu
2) Disable [F] key when scale sizmo is dragging
2019-05-24 14:42:59 +02:00
Enrico Turri c92940c985 Fixed conflicts after cherry-picking 844e99f84e 2019-05-24 14:42:46 +02:00
Enrico Turri 9f3a05eef3 Fixed false detection of out of print volume for sla supports 2019-05-24 14:38:05 +02:00