Commit Graph
100 Commits
Author SHA1 Message Date
bubnikv 0fb81e6cda Let the alpha build store its profile into PrusaSlicer-alpha directory. 2019-08-08 10:00:11 +02:00
bubnikv 23b2b4c59f Merge remote-tracking branch 'remotes/origin/vb_picking_fix' 2019-08-08 09:50:02 +02:00
bubnikv 8970ee28b2 Fixed linking of the "pad" combo box of the Plater with the respective
pad boolean values of the configuration layer.
2019-08-08 09:48:56 +02:00
bubnikv b7f93292fa FIx of Single test suite failure on two minority architectures #2461 2019-08-08 09:45:42 +02:00
bubnikv 75f36b83d5 Merge remote-tracking branch 'remotes/origin/master' into tm_zero_elev_ui 2019-08-08 08:43:00 +02:00
bubnikv 2e53cf1464 Merge branch 'tm_zero_elev_ui' of https://github.com/Prusa3d/PrusaSlicer into tm_zero_elev_ui 2019-08-08 08:42:50 +02:00
bubnikv ed2ca9ab0b Merge remote-tracking branch 'remotes/origin/ys_printable_property' into vb_picking_fix 2019-08-07 15:44:25 +02:00
bubnikv 841d0796b7 Fix of the SLA gizmo picking. 2019-08-07 15:36:09 +02:00
bubnikv 7cef1292b2 Yet another fix of the preceding commit. 2019-08-07 15:03:43 +02:00
bubnikv a19a506ad8 GLCanvas requires 8bit alpha channel for picking checksums. 2019-08-07 14:55:34 +02:00
bubnikv abd89e4f9a Merge remote-tracking branch 'remotes/origin/master' into vb_picking_fix 2019-08-07 14:31:16 +02:00
bubnikv 83ed1bed16 Merge remote-tracking branch 'remotes/origin/ys_printable_property' into vb_picking_fix 2019-08-07 14:31:00 +02:00
bubnikv 2d7f478dac Finished picking by color with a checksum in the alpha channel
to guard against unwanted alpha blending and / or multi sampling.
2019-08-07 14:15:38 +02:00
bubnikv 2ad3c05a65 WIP: Improvement in the picking robustness: store a checksum
into the alpha channel.
2019-08-07 11:37:38 +02:00
bubnikv a58b1844e0 WIP: Picking fix - disable alpha blending and render with false colors
including the alpha channels, which have their 3 lowest bits set to zero.
In case some blending occurs, the lowest 3 bits will likely be used
to interpolate between the false colors, therefore the 3 lowest bits
may be used to detect alpha blending or multi-sampling.
2019-08-07 11:14:04 +02:00
bubnikv 2f642ffffb ModelInstance::is_printable() takes into account printability
of the parent ModelObject.
2019-08-07 10:18:16 +02:00
bubnikv b7a8e51907 Merge remote-tracking branch 'remotes/origin/master' into ys_printable_property 2019-08-07 08:43:11 +02:00
Vojtech Bubnik 5ee69842d0 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-08-06 19:53:47 +02:00
Vojtech Bubnik d36c64873d Fix of a Linux / GTK specific crash on deleting of Layers from the side panel: wxWidgets / GTK internally delays the EnsureVisible() call to Idle processing. If the item is deleted after EnsureVisible() is planned and before the Idle processed, the Idle processing routine works with deleted data 2019-08-06 19:53:20 +02:00
bubnikv 621a552dc0 Redirect requests for the Prusa web pages with Slovak locale active
to Czech web pages.
2019-08-06 17:27:36 +02:00
bubnikv 4dd9817176 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-08-06 17:10:39 +02:00
bubnikv c7962b5c20 Added missing include 2019-08-06 17:10:03 +02:00
bubnikv 9905f8d349 Fix of the previous commit: zero extrusion width parameter is
always valid, it is replaced with an "auto" value.
2019-08-06 15:36:16 +02:00
bubnikv 74e592ceaa Improved handling of excessive extrusion width values (too small
or too big).
Fixes std: bad_alloc #2715
2019-08-06 15:11:46 +02:00
bubnikv 29d9c65ee2 Missing include (required by clang, not required by msvc) 2019-08-06 11:40:33 +02:00
bubnikv 9197e3feed Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-08-06 11:29:39 +02:00
bubnikv e1ff808f14 Fixed parallelization of texture compression:
Memory synchronization (memory barriers) are introduced using
std::atomic variables.
2019-08-06 11:29:26 +02:00
bubnikv ef0e323d1b Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-08-05 17:49:31 +02:00
bubnikv cf2f16d864 Fixed Model::convert_multipart_object() for STLs (regression from 8e2af5151dcf6f102b65981ff5aa56c2dfda5a2a).
Removed Model::s_auto_extruder_id and related, as it is a Perl interfacing legacy.
Fixed a typo in asserts introduced in the preceding commit.
2019-08-05 17:49:21 +02:00
bubnikv 219521f6ad Wording improvmenet of some error message. 2019-08-05 14:54:29 +02:00
bubnikv c91df2c769 Fixed a typo in print_host variable name 2019-08-05 14:36:50 +02:00
bubnikv 7e1d2daf78 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-08-05 14:30:42 +02:00
bubnikv 731e5abd88 Fixed a regression issue where excessive memory was allocated
for the GLVolumes before sending to the GPU driver. The following commits
were partially reverted:

4269c8b23c Removed GLVolume non-VBO rendering
d15698e21e GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call

Namely, the GLVolume buffers are "shrink to size"'d before sending their
content to the OpenGL driver, and the vertex buffers are populated
as quickly as possible from the GLVolume, so that the same buffer is not
kept twice in RAM on systems, where the RAM is shared with the graphics
card.

Also the memory allocation reporting was improved for the GLVolumes.
2019-08-05 14:30:32 +02:00
bubnikv 07250bd781 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-08-01 15:25:40 +02:00
bubnikv 9f393e6b9b Not taking the snapshot with non-empty Redo stack will likely be more confusing than losing the Redo stack.
Let's wait for user feedback.
2019-08-01 15:25:35 +02:00
bubnikv 576643c7ed Bumped up the version to 2.1.0-alpha0.
Updated the bundled profiles to integrate retract overrides
for PET and FLEX materials.
2019-08-01 11:53:22 +02:00
bubnikv 93f86b795d asserts for accessing deleted object list nodes. 2019-07-31 16:36:56 +02:00
bubnikv 1ba9100994 Fix of gizmo deserialization after Undo / Redo: Deselect all gizmos
but the gizmo to be deserialized.
2019-07-31 14:00:43 +02:00
bubnikv ca1c78b3fc Merge remote-tracking branch 'remotes/origin/et_custom_bed' 2019-07-30 16:48:47 +02:00
bubnikv 45b4c87926 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-29 17:55:58 +02:00
bubnikv 3d9df02f5f When accessing the localized web pages provided by Prusa Research,
only those language codes are now passed to the Prusa Research
web server, which are currently supported.
For example, there is no web page for "en_UK", the "en_UK" code will be
translated to "en_US".
2019-07-29 17:55:50 +02:00
bubnikv 3b21c64c2e Fix of "Unable to slice in command line mode: Mixing configurations
for FFF and SLA technologies" #2426
2019-07-29 16:19:32 +02:00
bubnikv 08a90b8c1b Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-26 13:44:41 +02:00
bubnikv 30d4bfd410 New Undo / Redo stack for the gizmos. The Gizmo specific stack is
entered with Plater::enter_gizmos_stack(), and left with
Plater::enter_gizmos_stack(). Other than that, the 2nd Undo / Redo
stack is transparent to the user of the Plater.

WIP: Currently the Gizmo stack takes a snapshot of the whole scene on
Plater::enter_gizmos_stack(). While it should work, it may be cheaper
to modify the Undo/Redo stack to only take a snapshot of the gizmos
in the Gizmo mode.
2019-07-26 13:44:33 +02:00
bubnikv 17edc289e9 Fixed missing return value. 2019-07-25 17:18:51 +02:00
bubnikv 86287a28ec Fixed the Perl bindings, made Print::m_placeholder_parser protected,
removed the non-const accessor method to m_placeholder_parser.
2019-07-25 17:08:31 +02:00
bubnikv 34013ad142 Fixed broken Perl bindings. 2019-07-25 14:52:51 +02:00
bubnikv 2bcdfc8378 Merge remote-tracking branch 'remotes/origin/master' into vb_filament_overrides 2019-07-25 14:40:54 +02:00
bubnikv f8218eb903 Reworked the FFF Print::update() to process the filament retract
override values and to store them into the output G-code.
2019-07-25 14:39:19 +02:00
bubnikv 42c8940795 Fixed is_nil() method on ConfigOptions.
PlaceholderParser was extended to support external config.
The external config has a lowest priority when looking up a variable.
2019-07-24 12:39:01 +02:00
bubnikv 6ea3a8e2b4 WIP: Nullable config values. Fixed compare operator for float vectors. 2019-07-23 17:15:34 +02:00
bubnikv 3b1a44c084 WIP: Nullable configuration value concept, implemented for
ConfigOptionFloatsNullable, ConfigOptionIntsNullable,
ConfigOptionPercentsNullable, ConfigOptionBoolsNullable.

retract override values were added to the Filament profile:
vector of floats: "retract_length", "retract_lift", "retract_lift_above",
	"retract_lift_below", "retract_speed", "deretract_speed",
	"retract_restart_extra", "retract_before_travel",
vector of bools: "retract_layer_change", "wipe"
vector of percents: "retract_before_wipe"
2019-07-23 14:15:42 +02:00
bubnikv bb604242aa Updated the Prusa3D profiles. 2019-07-23 14:04:10 +02:00
bubnikv b34252bf0f Fixed compilation on clang. 2019-07-22 17:26:06 +02:00
bubnikv bed21b1e2d Undo / Redo refactoring: Moved the snapshot flags definition
to SnapshotData
2019-07-22 17:00:50 +02:00
bubnikv a5c64e8477 Refactoring of the Undo / Redo stack interface:
The Snapshot specific data, which is fully provided from the outside
of the Undo / Redo stack is now stored as an StackData structure.
The StackData structure may be extended with small size data,
like the cursor position in the side bar.
2019-07-22 16:52:47 +02:00
bubnikv 356166ad86 Merge branch 'master' into ys_overrides 2019-07-22 16:27:00 +02:00
bubnikv 8112d80fa2 Merge branch 'master' into ys_overrides 2019-07-22 09:36:55 +02:00
bubnikv 47df9506bb Fix of OSX Imgui Undo / Redo pull down list scaling issue. 2019-07-19 17:16:20 +02:00
bubnikv 07a3072622 Simplified loading of the SLA support structures into the scene.
Fixed referesh of SLA support structures after Undo / Redo
and when moving an object outside / inside the build volume.
2019-07-19 17:14:37 +02:00
bubnikv ba997be812 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-19 15:59:35 +02:00
bubnikv 152c2fe0c0 Undo / Redo pull down menu scaling fix on OSX Retina 2019-07-19 15:59:23 +02:00
bubnikv 252159e31e Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-19 15:29:15 +02:00
bubnikv dbc1918193 Undo / Redo. Workaround for the Wipe tower. 2019-07-19 15:29:04 +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 f1f6fe5fb5 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-19 10:29:17 +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
bubnikv 4049f33609 Fix of osx builds 2019-07-18 18:19:40 +02:00
bubnikv d669a00980 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-18 17:42:10 +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
bubnikv 631a952f94 Merge remote-tracking branch 'remotes/origin/master' into vb_undo_redo2 2019-07-18 13:08:48 +02:00
bubnikv 69ef6cf806 Fix for compilation on clang: Forward declarations of templates. 2019-07-18 12:07:50 +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
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
bubnikv 4865240a9c Fixed compilation issue 2019-07-16 09:19:00 +02:00
bubnikv 72ba890091 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-15 15:51:31 +02:00
bubnikv d2a3a36013 Fix of the SLA Undo 2019-07-15 15:51:25 +02:00
bubnikv 35b691d28c Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-07-15 12:00:10 +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
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 3d420db531 Fix of perl bindings 2019-07-04 21:28:57 +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