Commit Graph

9863 Commits

Author SHA1 Message Date
1070991149 Merge remote-tracking branch 'origin/ys_undo_redo' into vb_undo_redo 2019-07-04 20:15:50 +02:00
b5b7463dc5 Testing code for serialization of DynamicPrintConfig 2019-07-04 20:14:38 +02:00
3e5f9b5a22 Removed some junk templates, which pass compilation on Windows
even if they are invalid.
2019-07-04 19:59:45 +02:00
70c6558a4c Fix of compilation on Linux 2019-07-04 19:48:00 +02:00
a29cc9e242 Update object list after undo/redo 2019-07-04 19:46:46 +02:00
e586475bc3 WIP Undo / Redo: Optional debug print outs. 2019-07-04 17:14:15 +02:00
1798e2a84c WIP Undo / Redo : serialization / deserialization of object selection. 2019-07-04 14:35:04 +02:00
5a2ace1a6e WIP Undo / Redo: First Undo in the history of PrusaSlicer! 2019-07-04 10:45:41 +02:00
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
4125519863 WIP Undo / Redo: Capturing of the triangle meshes. 2019-07-02 17:56:38 +02:00
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
27ee68d2f9 WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase 2019-06-27 11:02:45 +02:00
d99e932ee8 WIP Undo / Redo: Serialization of the Model / ModelObject / Model instance
using the cereal framework.
2019-06-26 16:29:12 +02:00
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
27cc66eb54 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-25 08:57:03 +02:00
d689195bda Fix of the previous commit on color change fix. 2019-06-25 08:56:53 +02:00
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
5320ed9374 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-24 15:27:43 +02:00
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
e737f15bfa Fix of OSX build 2019-06-24 13:47:03 +02:00
53d1ff879c Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-24 13:21:14 +02:00
7aaba25520 Do not allow to copy/paste volumes when using sla printer 2019-06-24 13:21:05 +02:00
0f35a95d75 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-24 13:13:34 +02:00
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
75ed542686 Reformatted MTUtils with some refined directives.
Only whitespace changes in MTUtils.hpp !
2019-06-24 13:03:46 +02:00
121b6c078b Print bed not considered as object in arrange anymore. 2019-06-24 13:01:52 +02:00
fab3634931 #2395 - Reworked logic of method Model::convert_multipart_object() 2019-06-24 12:43:18 +02:00
1459ad65c6 #2433 - Time Estimator: clamp accelerate/decelerate distances to avoid them to become negative 2019-06-24 12:35:20 +02:00
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
1c895ee6a0 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-06-24 11:23:43 +02:00
38d5817bc9 Disabled ENABLE_CAMERA_STATISTICS 2019-06-24 11:23:25 +02:00
1eb7634af7 Merge branch 'updating': Index installation 2019-06-24 11:09:55 +02:00
767dcb9607 Merge branch 'bugfixes': Fixes in fw updater UI 2019-06-24 11:09:07 +02:00
5766e9e915 Fixed conflicts after merge with branch et_perpsective_camera 2019-06-24 11:08:42 +02:00
00b9a3ad32 ENABLE_COMPRESSED_TEXTURES set as default 2019-06-24 09:54:58 +02:00
8b3d88bc0a Adaptive perspective camera frustrum 2019-06-24 09:38:46 +02:00
301eda7369 ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default 2019-06-24 09:27:19 +02:00
96276394d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-24 08:15:41 +02:00
503212181c Updating: Index installation
Prevents cancelled updates from popping up repeatedly
on each application startup
2019-06-20 14:26:29 +02:00
9c0554a33b Merge branch 'tm_igl_into_deps' 2019-06-20 13:00:22 +02:00
fe395546f0 Added "info" tooltip for a LockButton on Manipulation panel (#2539) 2019-06-20 12:56:23 +02:00
b8f9d2e2d8 Update default igl dependency to header-only. 2019-06-20 12:54:43 +02:00
bb58d0fb69 Add some missing methods into the igl patch.
Also, make the static igl dep build the default.
2019-06-20 14:15:36 +02:00
8208da0a7b Firmware updater: Fix MMU flashing in GUI 2019-06-20 11:17:35 +02:00
09da7a84b5 Firmware updater: Prevent empty flashing jobs 2019-06-20 11:17:35 +02:00
e5be8adadf Fixed build on MacOS 2019-06-20 11:05:05 +02:00
b7f67369c9 Serialized camera type and fixed Mac build 2019-06-20 10:02:52 +02:00
6af69667a3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-20 08:51:08 +02:00
09f4831f4e Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-19 16:32:40 +02:00
7f8bb94a55 Fixed wxEVT_CHAR handling for DoubleSlider 2019-06-19 16:28:56 +02:00