Commit graph

1266 commits

Author SHA1 Message Date
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
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
1798e2a84c WIP Undo / Redo : serialization / deserialization of object selection. 2019-07-04 14:35:04 +02:00
YuSanka
e4d8c5410c Merge remote-tracking branch 'origin/master' into ys_new_features 2019-07-04 14:26:05 +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
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
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
87c5e9bbaa Partial arrange starts to work again. 2019-07-02 15:24:40 +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
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
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
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
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
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
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
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
YuSanka
1525a864c5 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-26 13:33:05 +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
f4ed0d8137 Working on arrange selection only feature.
revert changes related to scale/unscale
2019-06-26 12:24:30 +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