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

3123 Commits

Author SHA1 Message Date
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
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
tamasmeszaros
af89bcee53 Merge branch 'master' into tm_builtin_pad 2019-07-09 13:21:26 +02:00
tamasmeszaros
18fcb64681 Fixing broken SLA slicing: SPE-984 2019-07-09 13:12:55 +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
6a3fc5bde3 Documented the cereal library manual patching (FIXME!) 2019-07-05 11:42:36 +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
9fd0c55eb8 Simplified the "cereal" includes to not clash with Perl includes 2019-07-04 22:09:14 +02:00
bubnikv
497b01f24a Trying to fix some template resolution on Linux 2019-07-04 21:02:08 +02:00
bubnikv
b1420283b6 Fixed merge issues. 2019-07-04 20:49:46 +02:00
bubnikv
3a24fb2f47 Yet another compilation fix. 2019-07-04 20:25:52 +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
bubnikv
3e5f9b5a22 Removed some junk templates, which pass compilation on Windows 
even if they are invalid.
 2019-07-04 19:59:45 +02:00
bubnikv
70c6558a4c Fix of compilation on Linux 2019-07-04 19:48:00 +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
tamasmeszaros
9372f1c6ad Wip in Nester interface 2019-07-04 13:58:18 +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
tamasmeszaros
b5215dae1b Fix libnest2d tests 2019-07-03 17:05:08 +02:00
tamasmeszaros
bc315f4c2c Deal with infinite box. 2019-07-03 15:06:10 +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
tamasmeszaros
320f2ecefd Try to deal with infinite bin. 2019-07-02 16:08:13 +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
tamasmeszaros
87c5e9bbaa Partial arrange starts to work again. 2019-07-02 15:24:40 +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
tamasmeszaros
914bf63228 Unify AutoArranger subclasses 2019-07-02 12:15:53 +02:00
Vojtech Kral
f09fb92b61 Fix build against system-provided qhull 2019-07-02 11:43:07 +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
ba82cbe007 Fix broken partial arrange 2019-07-02 10:32:01 +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
548f19462a Fix formatting 2019-06-28 15:42:59 +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
37b37cdf25 Fixed small typo 2019-06-27 14:13:07 +02:00
YuSanka
dd1fb286c3 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-27 14:01:50 +02:00
YuSanka
cecc134550 Rewrote layers information export/import to/from 3mf using Boost Property Tree (xml_parser) 2019-06-27 13:55:24 +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
bubnikv
27ee68d2f9 WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase 2019-06-27 11:02:45 +02:00
bubnikv
71d1255219 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-27 09:48:31 +02:00
bubnikv
da3583b1db Fix of https://github.com/prusa3d/PrusaSlicer/issues/2516 2019-06-27 09:48:19 +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
ec28e55ff0 Get rid of the test.cpp warning 2019-06-26 18:03:37 +02:00
tamasmeszaros
e1d612d05f work in progress on new ModelArrange interface 2019-06-26 17:09:26 +02:00
bubnikv
d99e932ee8 WIP Undo / Redo: Serialization of the Model / ModelObject / Model instance 
using the cereal framework.
 2019-06-26 16:29:12 +02:00
lukasmatena
5d6c59bfac
Merge pull request #2484 from stuartpb/patch-1 
Update usage string to match new executable name
 2019-06-26 15:02:21 +02:00
tamasmeszaros
dd108f4513 Hotfix for inconsistent slice index 2019-06-26 14:59:39 +02:00
Lukas Matena
4b9e366f00 Multimaterial print - making sure that temperatures will be changed with SE printer without the wipe tower 2019-06-26 14:50:12 +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
bubnikv
624a6aefb4 Fixed crashes after loading some AMFs. 2019-06-26 13:29:49 +02:00
bubnikv
a710e7e7e4 WIP: Undo / Redo stack. 
Integration of the "cereal" serialization library.
Serialization / deserialization of the DynamicConfig / DynamicPrintConfig.
DynamicPrintConfig serializes ordinal identifiers instead
of the option key strings to conserve space.
 2019-06-26 13:26:49 +02:00
tamasmeszaros
7e52edb88c Try to supress warnings from bundled IGL under Windows. 2019-06-26 13:23:08 +02:00
Lukas Matena
d2136ab625 ObjectList no longer caps number of extruders to 9 (fixes https://github.com/prusa3d/PrusaSlicer/issues/2558) 2019-06-26 13:12:25 +02:00
tamasmeszaros
f4ed0d8137 Working on arrange selection only feature. 
revert changes related to scale/unscale
 2019-06-26 12:24:30 +02:00
Lukas Matena
d845332de1 Fixed a crash when using place to bed function with the layer editing active 
This was caused by trying to render a deleted layer height profile. Other gizmos were
not affected because they are not dragging at the time of their action, so the profile
was correctly recalculated for them.
 2019-06-26 11:51:18 +02:00
tamasmeszaros
f93e7496f7 Merge branch 'tm_scales' 2019-06-26 11:33:42 +02:00
tamasmeszaros
6ff434aba3 Fixes some ModelArrange warnings 2019-06-26 11:10:41 +02:00
tamasmeszaros
14b32c4f16 Make an order in using scale and unscale, remove some warnings. 2019-06-26 10:34:27 +02:00
YuSanka
1de06a9461 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-26 09:49:33 +02:00
YuSanka
ac82cbe0cc Fix of #2548 2019-06-26 09:48:52 +02:00
BeldrothTheGold
d818d1b429 Add debug option to display picking pass to screen 2019-06-25 19:25:03 -06:00
Vojtech Kral
a38bcdde66 avrdude: Fix types in embedded config 2019-06-25 18:16:54 +02:00
Vojtech Kral
85575e5615 Fix: IsTriviallyCopyable on clang 2019-06-25 18:16:53 +02:00
Vojtech Kral
4fb904357f Warnings cleanup in BonjourDialog, ConfigWizard, FirmwareDialog, 
GLGizmoCut, ImGuiWrapper
 2019-06-25 18:16:53 +02:00
Vojtech Kral
f7d4a35c3d semver: warnings cleanup 2019-06-25 18:16:53 +02:00
Vojtech Kral
84027a3d3b avrdude: warnings cleanup 2019-06-25 18:16:49 +02:00
Lukas Matena
cb916c4dda Fixed warnings in libslic3r 2019-06-25 16:04:29 +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
bubnikv
27cc66eb54 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-25 08:57:03 +02:00
bubnikv
d689195bda Fix of the previous commit on color change fix. 2019-06-25 08:56:53 +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
YuSanka
c198d826af Setting min_z bigger than max_z cause an increase of the max_z 2019-06-24 15:43:16 +02:00
bubnikv
5320ed9374 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-24 15:27:43 +02:00
bubnikv
198600543d Fix of incorrect color print preview due to the tbb::parallel_for 
not respecting the grain size exactly.
Also the tool path generation has been optimized to launch less
threads and to produce larger vertex buffers.
 2019-06-24 15:27:32 +02:00
YuSanka
daac165a44 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-24 13:56:35 +02:00
YuSanka
e737f15bfa Fix of OSX build 2019-06-24 13:47:03 +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
YuSanka
0f35a95d75 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-24 13:13:34 +02:00
YuSanka
14d8621ffe Color_print issues : 
- fixed #1933
 - implemented thumb moving to the mouse click position
 - implemented "discard color changes" button
 2019-06-24 13:11:18 +02:00
tamasmeszaros
75ed542686 Reformatted MTUtils with some refined directives. 
Only whitespace changes in MTUtils.hpp !
 2019-06-24 13:03:46 +02:00
tamasmeszaros
121b6c078b Print bed not considered as object in arrange anymore. 2019-06-24 13:01:52 +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
Vojtech Kral
1eb7634af7 Merge branch 'updating': Index installation 2019-06-24 11:09:55 +02:00
Vojtech Kral
767dcb9607 Merge branch 'bugfixes': Fixes in fw updater UI 2019-06-24 11:09:07 +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