3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,283 Commits 1 Branch 1 Tag 249 MiB
3bade450b8
Commit Graph

2416 Commits

Author SHA1 Message Date
Enrico Turri
91d574f8ad Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-07-19 15:37:10 +02:00
Enrico Turri
81d3669a25 Undo/Redo buttons moved into their own toolbar 2019-07-19 15:36:55 +02:00
bubnikv
dbc1918193 Undo / Redo. Workaround for the Wipe tower. 2019-07-19 15:29:04 +02:00
Enrico Turri
37f2362aab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 11:36:07 +02:00
Enrico Turri
749bb2bfed Refactoring in GLTexture 2019-07-19 11:18:19 +02:00
bubnikv
2de6d95322 Memory statistics (total memory, memory usage, Undo / Redo stack size) 
into the System INfo dialog.
 2019-07-19 11:12:38 +02:00
bubnikv
d9c325c7f0 Adding a generic bitmap "flags" attrib to the Undo / Redo snapshot. 
using this new "flags" attrib to store & recover the "Layers editing active"
flag and restoring the "Layers editing" tool state.
 2019-07-19 10:29:06 +02:00
Enrico Turri
84d61e28fd Tech ENABLE_TEXTURES_FROM_SVG set as default 2019-07-19 09:52:01 +02:00
Enrico Turri
3344650255 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-19 09:18:32 +02:00
Enrico Turri
ba4bc8ac82 Render custom bed textures in png format on prusa beds 2019-07-19 09:18:09 +02:00
bubnikv
4049f33609 Fix of osx builds 2019-07-18 18:19:40 +02:00
bubnikv
a0ea96968d Storing the active printer technology onto the Undo / Redo stack, 
remembering the last selected Printer profile for the SLA and FDM
technologies separately, and activating them on Undo / Redo.

When switching the technologies, user is asked whether to discard
the modified profiles or not.
 2019-07-18 17:41:47 +02:00
tamasmeszaros
6ae50a710a Further refactoring 2019-07-18 17:31:27 +02:00
tamasmeszaros
e3ca95152c Minor refactor 2019-07-18 16:30:32 +02:00
Enrico Turri
1c5ff3c72d Small refactoring 2019-07-18 15:03:05 +02:00
Enrico Turri
f61d43de07 Render custom bed textures in svg format on prusa beds 2019-07-18 14:39:19 +02:00
bubnikv
631a952f94 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-18 13:08:48 +02:00
tamasmeszaros
6b8c72944d Merge branch 'master' into tm_arrange_selection 2019-07-18 12:59:40 +02:00
Enrico Turri
af3cb890d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-18 12:57:12 +02:00
Enrico Turri
de383b1809 Added selection of custom bed model to bed shape dialog 2019-07-18 12:56:52 +02:00
Enrico Turri
44d7462bdb Partially revert 8febd88e80 2019-07-18 12:03:41 +02:00
bubnikv
cd95b52dcd Undo / Redo memory conservation strategy: Release recoverable data 
starting from the objects of lowest ObjectID.
(convex hulls are recoverable as well as the indexed triangle sets
inside the TriangleMeshes or the triangle connectivity information).

Now the top most snapshot (the temp one taken before Undo jump) will
never be released.
 2019-07-18 11:51:06 +02:00
Enrico Turri
8febd88e80 Fixed rendering of toolbars' textures with prespective camera 2019-07-18 11:36:17 +02:00
Enrico Turri
1e796b82e1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-18 11:12:30 +02:00
Enrico Turri
08d37aad06 Added selection of custom bed texture to bed shape dialog 2019-07-18 11:12:11 +02:00
tamasmeszaros
6949543912 Fixes after merge with master. 2019-07-17 18:10:08 +02:00
tamasmeszaros
a695dec51a Merge branch 'master' into tm_arrange_selection 2019-07-17 17:25:31 +02:00
bubnikv
cc1338ce6a Fix after merge 2019-07-17 16:00:09 +02:00
bubnikv
7176599a34 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-17 15:54:57 +02:00
bubnikv
3a74e7ab69 WIP: Undo / Redo memory limiting by releasing the least recently 
used snapshots. Memory limit set to 10% of physical system memory.
 2019-07-17 15:48:53 +02:00
Lukas Matena
2b9d285a16 'Place on face' gizmo fix (it used invalid pointer after undo/redo was implemented) 2019-07-17 15:39:58 +02:00
Lukas Matena
81dde630ea SLA support points edits are now pushed onto undo/redo stack 2019-07-17 15:39:58 +02:00
Enrico Turri
75c53a53b6 Refactoring of BedShapePanel and BedShapeDialog 2019-07-17 14:53:02 +02:00
Enrico Turri
ce5618fb27 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-17 14:28:12 +02:00
Enrico Turri
f97a61cdcf Fixed use of translate macros 2019-07-17 14:13:50 +02:00
tamasmeszaros
2728f41123 Solved issue with virtual bed management. 
libnest2d: Fix for unclosed polygons after merge.
 2019-07-17 13:32:31 +02:00
Enrico Turri
ba7df2a64e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-17 13:17:50 +02:00
Enrico Turri
401707a6fe Another refactoring of GLGizmosManager 2019-07-17 12:43:27 +02:00
Enrico Turri
da1fa0b6e3 Refactoring of GLGizmosXX classes to cleanup their interface 2019-07-17 12:06:23 +02:00
Enrico Turri
0a530ab7bc Added undo/redo snapshot for layers height editing 2019-07-17 10:03:00 +02:00
Enrico Turri
21624f5305 Framework to serialize gizmos into undo/redo stack 
Serialization into undo/redo of Cut gizmo

Refactoring of GLGizmosManager
 2019-07-17 08:38:48 +02:00
tamasmeszaros
44801f4429 Priority for wipe tower, Increased safety distance from bed edges. 
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
 2019-07-16 18:33:42 +02:00
tamasmeszaros
5446167c11 Fixes for arranging wipe tower 2019-07-15 18:18:34 +02:00
tamasmeszaros
1b0e192046 Arrange cache in ModeInstance and logical bed remembered. 2019-07-15 17:30:44 +02:00
Lukas Matena
dc80616bf6 Fixed a use-after-free problem in object list 
this was uncovered by ASAN when attempting to Delete All objects with multiple instances
 2019-07-15 17:09:06 +02:00
bubnikv
d2a3a36013 Fix of the SLA Undo 2019-07-15 15:51:25 +02:00
bubnikv
a492360d19 Fix of the merge - missing Undo / Redo toolbar buttons. 2019-07-15 11:59:54 +02:00
bubnikv
ab7ecc1819 Merge remote-tracking branch 'remotes/origin/vb_undo_redo' 2019-07-15 11:34:18 +02:00
Lukas Matena
e674c586b0 Merge branch 'lm_improving_wipe_tower'. Summary of changes: 
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
- some refactoring, e.g. the abstract WipeTower class was eradicated
 2019-07-15 10:25:38 +02:00
Enrico Turri
610e0f7ee6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_custom_bed 2019-07-15 08:19:58 +02:00
YuSanka
44f0e387dc Fix of #2621 2019-07-13 10:38:10 +02:00
tamasmeszaros
df7bb94daf Not handling logical beds in arrange() 2019-07-12 21:17:11 +02:00
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
YuSanka
4d8a028262 Finally fix for settings item selection 2019-07-12 13:56:56 +02:00
YuSanka
6826e31e2a Some code refactoring for settings items 2019-07-12 13:56:56 +02:00
YuSanka
aed6acc073 Add take_snapshot for layers range editing actions 2019-07-12 13:56:56 +02:00
Lukas Matena
45db42ca3b Merge branch 'lm_drop_to_bed' 2019-07-12 13:38:18 +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
YuSanka
eced3dcea8 Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo 2019-07-11 16:00:28 +02:00
YuSanka
a6a5b94155 Added suppress_snapshots() and allow_snapshots() for avoid of excess "snapshoting" 2019-07-11 16:00:01 +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
YuSanka
5cbaa7b081 FreqChangedParams : workaround for right border alignment 2019-07-10 17:50:24 +02:00
YuSanka
1dc0439a31 Fixed margins for FreqChangedParams 2019-07-10 15:55:53 +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
YuSanka
baece78390 Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo 2019-07-10 11:38:52 +02:00
YuSanka
99df9f56c4 Added take_snapshot() for adding of settings 2019-07-10 11:28:11 +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
YuSanka
3720e6a3a3 Fixed redo_to() function and code cleaning from redundant options 2019-07-10 10:15:07 +02:00
YuSanka
f985f5190c Completed undo/redo from a toolbar 2019-07-09 20:45:00 +02:00
YuSanka
3dd1bc753c Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo 2019-07-09 19:41:37 +02:00
YuSanka
1347e655c2 Next improvements of an undo/redo from a toolbar 2019-07-09 19:39:36 +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
e8461f65df Refactoring in class BedShapePanel 2019-07-09 13:33:15 +02:00
tamasmeszaros
af89bcee53 Merge branch 'master' into tm_builtin_pad 2019-07-09 13:21:26 +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
YuSanka
fbf14b42e9 Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar 2019-07-08 18:01:14 +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
YuSanka
7b6229289d Added undo/redo to the "Edit" menu 2019-07-08 10:57:35 +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
bubnikv
fb725502b7 Undo / Redo: Bound Ctrl-V/Ctrl-Z to the side panel. 2019-07-05 20:27:44 +02:00
bubnikv
45a5487e51 Fix of compilation on clang 2019-07-05 20:09:30 +02:00
bubnikv
270fec84d3 Fix of the Undo / Redo for Cut. 
Added some more operations (for example Rotation) to the Undo / Redo.
 2019-07-05 19:46:48 +02:00
bubnikv
4e2fda3315 Undo / Redo fixes 2019-07-05 19:06:19 +02:00
bubnikv
357e578a84 Fixed includes on OSX 2019-07-05 10:46:42 +02:00
bubnikv
7c732c7482 Trying to fix some Linux & OSX compilation issues. 2019-07-04 23:34:18 +02:00
bubnikv
211d1ee1e3 Trying to make all C++ of the platforms happy. 2019-07-04 22:52:33 +02:00
bubnikv
b1420283b6 Fixed merge issues. 2019-07-04 20:49:46 +02:00
bubnikv
c7cc760067 Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
bubnikv
1070991149 Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo 2019-07-04 20:15:50 +02:00
bubnikv
b5b7463dc5 Testing code for serialization of DynamicPrintConfig 2019-07-04 20:14:38 +02:00
YuSanka
a29cc9e242 Update object list after undo/redo 2019-07-04 19:46:46 +02:00
bubnikv
e586475bc3 WIP Undo / Redo: Optional debug print outs. 2019-07-04 17:14:15 +02:00
bubnikv
1798e2a84c WIP Undo / Redo : serialization / deserialization of object selection. 2019-07-04 14:35:04 +02:00
YuSanka
f617d74729 Merge remote-tracking branch 'origin/ys_default_presets' into ys_new_features 2019-07-04 14:30:54 +02:00
YuSanka
e4d8c5410c Merge remote-tracking branch 'origin/master' into ys_new_features 2019-07-04 14:26:05 +02:00
YuSanka
74f9a5432f Reset previous layers range selection before selection Layers Item 2019-07-04 14:25:40 +02:00
bubnikv
5a2ace1a6e WIP Undo / Redo: First Undo in the history of PrusaSlicer! 2019-07-04 10:45:41 +02:00
tamasmeszaros
e81f8a5fd9 WIP still with arrange return value. 2019-07-03 19:24:41 +02:00
YuSanka
040f1fedff Added UI-prototype for FilamentSettings->Overrides page 2019-07-03 15:32:17 +02:00
bubnikv
e2a670218b WIP Undo / Redo: Serializing the configs of ModelObject / ModelVolume 
/ ModelMaterial as separate objects to conserve memory.
 2019-07-03 13:43:54 +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
bubnikv
4125519863 WIP Undo / Redo: Capturing of the triangle meshes. 2019-07-02 17:56:38 +02:00
bubnikv
5e846112ee WIP UndoRedo: Added Undo/Redo stack, added Platter::take_snapshot(), 
experimental snapshots on loading STLs and increasing / decreasing
model instances.
 2019-07-02 16:42:23 +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
YuSanka
0bcad2a5c5 Fix for the last commit 2019-07-02 15:26:11 +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
YuSanka
136e5156bc Fixed colot_print issues: 
* Disabled color change information for the SLA and FFF-multimaterial presets
* Corrected switch between "color print" and "feature type" on Preview
 2019-07-02 14:06:58 +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
tamasmeszaros
253ec07cb2 Still WIP 2019-07-01 18:22:07 +02:00
YuSanka
e5e7496cea Some changes for options tooltips 2019-07-01 16:56:38 +02:00
YuSanka
a934c2e79c Changed a behavior logic of a value reverting for presets, derived from default. 
LOCKs and ARROWs work now in a same way like for presets, derived from system presets.
 2019-07-01 14:56:28 +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
Vojtech Kral
1a529cb778 PresetUpdater: Fix: Index installed too early 2019-07-01 11:35:02 +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
YuSanka
125f474f02 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-29 12:38:03 +02:00
tamasmeszaros
cb3a586deb Adapt find_new_position is WIP. Cleaning up comments. 2019-06-28 18:27:15 +02:00
tamasmeszaros
299e4f74c7 Arranging with new structure. 2019-06-28 17:03:50 +02:00
tamasmeszaros
f0ac54ba32 Merge branch 'master' into tm_builtin_pad 2019-06-28 16:51:55 +02:00
tamasmeszaros
4c69a855a1 Merge branch 'master' into tm_builtin_pad 2019-06-28 15:29:26 +02:00
Vojtech Kral
61080bcff6 Merge branch 'bugfixes': avrdude warnings cleanup 2019-06-28 15:21:45 +02:00
tamasmeszaros
19e6bf58dd WIP on structuring arrange inputs 2019-06-27 21:13:44 +02:00
YuSanka
0b940ec089 Some code improvements 2019-06-27 16:07:32 +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
YuSanka
dd1fb286c3 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-27 14:01:50 +02:00
Enrico Turri
1058721dba Added visual hints in 3D scene for layers editing 2019-06-27 13:42:50 +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
bubnikv
27ee68d2f9 WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase 2019-06-27 11:02:45 +02:00
enricoturri1966
d16c670ed1
Merge pull request #2569 from BeldrothTheGold/master 
Add debug preprocessor directive in Technologies.hpp to render picking pass to window.
 2019-06-27 09:44:48 +02:00
tamasmeszaros
96f6fd2d9f Merge branch 'master' into tm_arrange_selection 2019-06-27 09:33:32 +02:00
tamasmeszaros
e1d612d05f work in progress on new ModelArrange interface 2019-06-26 17:09:26 +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
YuSanka
1525a864c5 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-26 13:33:05 +02:00
YuSanka
104a289cfe Implemented interface for updating 3DScene after set a focus to some editor 2019-06-26 13:30:20 +02:00