3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
7,756 Commits 1 Branch 1 Tag 249 MiB
9571e7c209
Commit Graph

643 Commits

Author SHA1 Message Date
Enrico Turri
ba4c8c1b87 PrusaControl-like background color 2018-12-12 10:38:07 +01:00
YuSanka
98f9c4f56d Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-12 08:50:02 +01:00
YuSanka
a57ff1c221 Fixed DnD under all platforms 
+ try to fix the work of Backspase in ObjectList (using EVT_KEY_DOWN instead of EVT_CHAR)
 2018-12-12 08:40:10 +01:00
bubnikv
09c539a242 Trigger background processing update when switching to a preview tab. 
Implements "Go Direct to the preview screen after slicing #152"
 2018-12-11 17:49:31 +01:00
bubnikv
2b9319eea1 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-11 16:34:21 +01:00
bubnikv
52db7b055a WIP: Merged commits from stable between 1.41.2-beta and 1.42.2 final. 
Changes in SupportMaterial.cpp, TriangleMesh.cpp and 01_trianglemesh.t
are yet to be merged.

WIP: Refactoring of layer height editing.
Removed layer_height_ranges from PrintObject, as the Print/PrintObject
now hold their copies of Model/ModelObject.
 2018-12-11 16:33:43 +01:00
YuSanka
e1cea03cda Added template for the handle of the TextCtrl's focus event 2018-12-11 14:05:56 +01:00
YuSanka
d7bc1410ee Update value inside TextCtrl & SpinCtrl after wxEVT_KILL_FOCES instead of wxEVT_TEXT (or wxEVT_TEXT_ENTER) 2018-12-11 14:05:56 +01:00
Enrico Turri
984b8b79b0 Another fix into GLCanvas3D::Selection::is_single_full_instance() 2018-12-11 10:35:12 +01:00
Enrico Turri
5e077c5edf Fixed GLCanvas3D::Selection::is_single_full_instance() 2018-12-11 09:43:10 +01:00
YuSanka
edd79883a1 Try to fix DnD under OSX 
+ try to fix wxEVT_CHAR under OSX
+ some code-rebase
 2018-12-11 09:37:58 +01:00
YuSanka
05fef33b10 Update extruder value for adding objects 2018-12-11 08:53:18 +01:00
YuSanka
d7db1cdc73 Fixed extruder number updating after changing of the extruder count 2018-12-10 17:02:54 +01:00
Enrico Turri
0420d76037 Fixed rotation of volumes contained in rotated instances 2018-12-10 16:09:20 +01:00
YuSanka
5e4c6c8e2d Fixed build under OSX 2018-12-10 14:13:25 +01:00
Enrico Turri
eb1518bf31 Removed out of bed detection for sla pad 2018-12-10 13:57:43 +01:00
YuSanka
293d6ba8ad Suppressed import/adding of the 3mf which contains multi-part objects 
+ Try to fix the wrong extruder selection under OSX
 2018-12-10 13:40:19 +01:00
Enrico Turri
1f0c12dd9f Do not show objects' shell in sla preview until pass slaposIndexSlices is completed 2018-12-10 13:27:00 +01:00
Enrico Turri
9e952c9122 Fixed rendering of caps in sla preview 2018-12-10 12:59:49 +01:00
YuSanka
abbc451f80 Fixed wrong importing of the 3mf with modifier/part which is contain settings 2018-12-10 10:42:55 +01:00
Enrico Turri
31387af176 Fixed camera zoom after object scale 2018-12-10 10:40:57 +01:00
Enrico Turri
b6bac7824f Fixed volumes translation when instance has a transformation containing mirror 2018-12-10 09:46:01 +01:00
YuSanka
33a2d86bad After merge context menu fixing 2018-12-07 18:28:59 +01:00
YuSanka
386d46417a Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-12-07 18:00:17 +01:00
YuSanka
c80267bb29 Context menu from the object on the 3Dscene 2018-12-07 17:50:48 +01:00
Enrico Turri
967afa8717 Disabled imgui dialogs for move/scale/rotate gizmos 2018-12-07 16:57:43 +01:00
Enrico Turri
45f44da3b1 Fixed volume shown in info panel 2018-12-07 16:44:18 +01:00
Enrico Turri
198b23283c Camera target constrained to scene bounding box 2018-12-07 16:23:04 +01:00
Lukas Matena
705ad7fb69 First version of SLA support points generation 2018-12-07 14:21:33 +01:00
Vojtech Kral
0c7c9d5754 Plater: single object STL export and reloading 
Based on Plater.pm`export_object_stl() and reload_from_disk()
 2018-12-07 13:58:44 +01:00
Enrico Turri
8fc723b746 Fixed wipe tower translation 2018-12-07 11:24:29 +01:00
Enrico Turri
b1f819f83b Fixed rendering of sla support points when object's instance transformation contains mirror 2018-12-07 10:36:43 +01:00
Enrico Turri
ec2d9d6d08 Changed starting orientation of rotate gizmo grabbers 2018-12-07 10:01:30 +01:00
Enrico Turri
512677ed73 Fixed typo 2018-12-07 09:01:58 +01:00
Enrico Turri
20cff0f630 Fixed crash when selecting wipe tower 2018-12-07 09:00:17 +01:00
bubnikv
fbbfcf70d3 File wildcards now include an extension of a file provided 
as a default. This is useful for the G-code or SLA export,
as one may chose his own file extension for the export file.
 2018-12-06 17:32:49 +01:00
bubnikv
ce6937c725 Fixed missing includes on osx. 2018-12-06 17:00:46 +01:00
bubnikv
67e9829b49 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-06 15:41:42 +01:00
bubnikv
e41f8b9bc7 Wipe tower update fixes 2018-12-06 15:40:41 +01:00
YuSanka
e382692a3f Try to fix sub_menu work(on the Scene) under OSX and Linux 
+ some code refactoring for context menu inside ObjectList
 2018-12-06 14:49:57 +01:00
bubnikv
79986188a7 Removed the "Quick Slice" menu items from the main menu, 
a little bit of code cleaning / refactoring.
 2018-12-06 14:47:53 +01:00
bubnikv
edc306db45 Don't store the octoprint host key to the amf/3mf files. 2018-12-06 14:42:15 +01:00
bubnikv
c6ef194094 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-06 14:36:33 +01:00
Enrico Turri
512e9d5bca Fixed lost selection when double-clicking while a gizmo is active 2018-12-06 14:26:13 +01:00
Enrico Turri
c96c9808aa Removal of tabs from plater -> Nicer icons and reduced flickering when changing view 2018-12-06 13:44:38 +01:00
Enrico Turri
d6b5ed2063 Fixed OxS compile 2018-12-06 13:09:39 +01:00
Enrico Turri
7e613b706d Fixed wrong position of modifiers 2018-12-06 13:06:04 +01:00
bubnikv
4eaca91f11 include "libslic3r" from slic3r project directly, not as "../../libslicer" 
(rely on -Ilibslic3r set correctly) for the slic3r project.
 2018-12-06 12:52:28 +01:00
Enrico Turri
8d78b23c78 Removal of tabs from plater -> Fixed buttons update when switching between views using keyboard 2018-12-06 12:37:39 +01:00
Enrico Turri
c908a4674a Removal of tabs from plater -> added buttons to scene to switch between views 2018-12-06 10:38:19 +01:00
bubnikv
b6861a5791 System Dialog - use bigger image, as the smaller one is not contained 
in our Windows binary distro.
Fixed typo in "Add support bloker"
 2018-12-05 16:24:43 +01:00
Enrico Turri
609a0e8aa5 Fixed typo into GLCanvas3D::Selection::is_single_full_instance() 2018-12-05 13:55:38 +01:00
YuSanka
adbf1b674b GLVolume : set color from the model volume to correct part rendering on the Scene 2018-12-05 12:11:03 +01:00
Enrico Turri
6997f7f5b5 Fixed crash when deleting sla support points 2018-12-05 10:26:08 +01:00
bubnikv
c108cc9045 Fix of a typo. 2018-12-04 19:21:53 +01:00
bubnikv
1a01f62bb7 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-04 19:10:46 +01:00
bubnikv
50e44af46c Fixed compilation on OSX, 
improved utf8 compatibility of Tab::may_discard_current_dirty_preset(),
renamed "SLA Print Profile" / "SLA Material Profile" to just "Print Profile"
resp. Material Profile.
 2018-12-04 19:10:31 +01:00
YuSanka
9e19e43818 Fix for my last commit 2018-12-04 18:15:20 +01:00
bubnikv
27b95584f4 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-04 17:57:05 +01:00
bubnikv
c586ca4ae0 Implemented compatible_printer / compatible_printer_condition 
for filaments and SLA materials.

Fixed compatible_printers / compatible_prints dialog to show
system profiles as well.
 2018-12-04 17:56:49 +01:00
Enrico Turri
9bfcf10cc6 Gizmos shortcuts set as default 2018-12-04 16:01:25 +01:00
Enrico Turri
04d7154d40 Gizmos rendered on top set as default 2018-12-04 15:53:40 +01:00
Enrico Turri
8d25f3aaaf Removal of tabs from plater -> fixed no-imgui case 2018-12-04 15:17:24 +01:00
YuSanka
e0aa25b677 Fixed "extruder" column editing for non-object/part items. It's suppressed now. 
+ Try to fix the wrong last column width updating under OSX
 2018-12-04 14:32:15 +01:00
Enrico Turri
428800ad1e 1st installment of removal of tabs from plater 2018-12-04 13:55:25 +01:00
YuSanka
129c35b714 One more fix to updates of the "Slice now" and "Export G-code buttons" 
- "Sliced now" button is hidden when "Background process" is selected
- deleted extra enable_buttons() function call
 2018-12-04 12:30:47 +01:00
bubnikv
96e14b5d3b Fixed Canvas3D update after an object instance is deleted. 2018-12-04 11:35:04 +01:00
bubnikv
60f870bbd9 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-04 11:15:10 +01:00
bubnikv
160aa6c78c Fixed updates of the "Slice now" and "Export G-code buttons" 
based on the object inside / outside the work space condition.

Removed TabIface.cpp/hpp Perl bindings.

Fixed reset of the status bar / cancel button after the last object
is removed from the plater.
 2018-12-04 11:14:39 +01:00
YuSanka
3c86203655 Disable "Slice now" and "Export G-code" buttons during BGP 2018-12-04 10:28:56 +01:00
Enrico Turri
6c69d0e922 Fixed scene update after select all command 2018-12-04 08:38:31 +01:00
YuSanka
b3c5a62709 Check selection for PresetComboBox 2018-12-03 15:17:07 +01:00
Enrico Turri
fe8e431356 New menu layout set as default 2018-12-03 15:06:02 +01:00
Enrico Turri
c08d0a4a78 Bunch of fixes into sla support gizmo 2018-12-03 14:02:58 +01:00
YuSanka
7395b923bd Update gizmos on/off state 2018-12-03 13:29:28 +01:00
bubnikv
435163fb73 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-12-03 13:21:48 +01:00
bubnikv
d46d0dc365 Implemented naming of the SLA export file based on the output file name 
template.

Reworked naming of the plater exports to not use the output file name
template, but to derive the file name from the first printable object's name.

Fixed error handling: Reimpemented the Perl's "eval" blocks
as try / catch blocks.
 2018-12-03 13:14:28 +01:00
YuSanka
d522e8ea70 Delete mixed selection 2018-12-03 12:13:57 +01:00
Enrico Turri
c205e3fb0c Gizmo flatten -> allow for only single instance and let planes follow the instance when moving the object by dragging it on the scene 2018-12-03 11:14:17 +01:00
Enrico Turri
e1c90c83e8 Fixed GLVolumes reuse after instance deletion 2018-12-03 10:37:46 +01:00
Enrico Turri
693a4168f8 Always show axis name when hovering over gizmo grabbers 2018-12-03 10:17:42 +01:00
Enrico Turri
020994f987 Refactoring into extended gizmo grabbers 2018-12-03 09:37:46 +01:00
Enrico Turri
624df6bf9a Extended grabbers for gizmo move 2018-12-03 08:51:18 +01:00
tamasmeszaros
d50644eef8 Fix for uninitialized variable which might break sla auto rotation 2018-11-30 15:41:45 +01:00
bubnikv
041fae8148 Added the bed texture for SL1 2018-11-30 15:31:47 +01:00
Enrico Turri
1f3b9d0657 Fixed vertical centering of gizmo overlay icons 2018-11-30 13:27:54 +01:00
Enrico Turri
918a7f8ddd Fixed lost selection when selecting object while place on face gizmo is active 2018-11-30 12:49:31 +01:00
Enrico Turri
b83468e763 Removed gizmo reset by double-cliking on grabbers 2018-11-30 11:42:36 +01:00
YuSanka
054d202817 Correct mixed_selection updating from 3dScene to ObjectList 2018-11-30 11:22:06 +01:00
YuSanka
4bb771683d Fixed assert message after wxAutoBufferedPaintDC and warnings in 2DBed.cpp 2018-11-30 11:22:06 +01:00
Enrico Turri
4e4760bb82 Fixed translation of volumes belonging to scaled instances 2018-11-30 10:59:00 +01:00
Enrico Turri
dca0cb04ea New icons for gizmo overlay 2018-11-30 08:48:32 +01:00
tamasmeszaros
6c99837a9d Quick fix for broken MacOS build 2018-11-29 18:33:30 +01:00
tamasmeszaros
55d62b8295 Fix for empty or broken png output. 
Fix for instance transformation order error and state invalidation issues with rasterization.
 2018-11-29 18:12:40 +01:00
Enrico Turri
bf94751a94 Esc key toggles off current gizmo 2018-11-29 15:33:52 +01:00
Enrico Turri
42b70c4933 Modified gizmo rotate rendering 2018-11-29 15:10:11 +01:00
YuSanka
d7f9e86400 Update additional object setting after print technology changing 2018-11-29 15:01:20 +01:00
tamasmeszaros
38733ff56a Merge branch 'tm_sla_supports_backend' 2018-11-29 13:34:48 +01:00
YuSanka
2add733caa Suppress change preset to SLA if we have multi-part object 2018-11-29 12:35:07 +01:00
Vojtech Kral
be9ba936e9 Cut: Sanitize Z when switching selections 2018-11-29 12:22:06 +01:00
tamasmeszaros
980c53970b merge tm_sla_supports_backend with master, reapply fix for index slice invalidation, fix for autorotation z offset 2018-11-29 11:45:02 +01:00
Enrico Turri
ef1d43c711 SLA slices preview - improved performances 2018-11-29 11:11:39 +01:00
tamasmeszaros
8fbfad275c Reordered scene reload to prevent race conditions. 
Also extended progress status bar to support status value -1 for pulsing.
 2018-11-29 10:57:06 +01:00
Enrico Turri
7913060869 Added zoom in/out using keys [i]/[o] 2018-11-29 09:03:38 +01:00
Vojtech Kral
18c95c404c Fix wxNotebook event incontinence 2018-11-28 19:26:48 +01:00
Enrico Turri
19c47afb7b Fixed size of gizmo scale grabbers 2018-11-28 16:09:04 +01:00
YuSanka
c010e14460 Suppress ColorPrint for the multi-material printing 2018-11-28 16:03:25 +01:00
YuSanka
360133246c Fixed ColorPrint current layer identification 2018-11-28 16:03:24 +01:00
Enrico Turri
bac021d516 SLA slices preview - completed prototype 2018-11-28 15:13:25 +01:00
Lukas Matena
ebac4c7eb8 Place on bed gizmo disabled for individual object parts 2018-11-28 12:08:25 +01:00
Lukas Matena
5813ec08c9 Place on bed planes recalculation after individual volumes are manipulated 2018-11-28 11:37:41 +01:00
Enrico Turri
0a47bc1c5c SLA slices preview - wip 5 2018-11-28 09:28:07 +01:00
Vojtech Kral
f5080ea7f5 Fix re-entrant render() calls, add an assert to enforce 2018-11-27 16:57:37 +01:00
Vojtech Kral
0bdbd3ee63 imgui: Use OpenGL 2.0 2018-11-27 16:57:37 +01:00
Vojtech Kral
21cb489077 WIP: imgui: Fix GLSL version enumeration 2018-11-27 16:57:37 +01:00
YuSanka
f203f6fbd9 ColorPrint improvement 
+ Select "Color Print" preview type if it's not after add/delete new color change
+ Added level heights to the color legend instead of "Color N"
 2018-11-27 16:04:56 +01:00
Enrico Turri
4c8f3f6ea7 SLA slices preview - wip 4 2018-11-27 15:36:31 +01:00
Enrico Turri
e6369fe548 SLA slices preview - wip 3 2018-11-27 14:50:57 +01:00
Vojtech Kral
cc557b8a7f Yet more fix of ENABLE_IMGUI 2018-11-27 12:51:50 +01:00
Vojtech Kral
d0b6beaaaa One more fix of ENABLE_IMGUI 2018-11-27 12:00:44 +01:00
Vojtech Kral
2585e3103d imgui: Fix ENABLE_IMGUI, disable on OS X for now 2018-11-27 11:28:19 +01:00
YuSanka
db4ceaa5fa DoubleSlider improvement 
+ added thicks selection by mouse in the DoubleSlider
 + Click on the Unlock icon on DoubleSlider => set Min and Max slider values
 2018-11-27 11:13:00 +01:00
tamasmeszaros
3f0ea223d1 Speeding up the auto rotation algorithm (decreasing accuracy) 2018-11-27 11:09:25 +01:00
bubnikv
85e81a2a21 SLA support points gizmo: Limit manipulation to an active instance 
(the first instance selected), show the points on other instances
grayed out.
 2018-11-26 20:39:18 +01:00
bubnikv
3fa099bd1a Fix of SLA support gizmos: 
Fix of the Z offset.
Background processing is now not re-triggered during dragging
of a support point.
 2018-11-26 19:22:16 +01:00
Vojtech Kral
3b20d03e1d Cut: Preserve Z-rotation, fix upper part mesh position, 
perform custom placing instead of arrange()
 2018-11-26 17:09:37 +01:00
Lukas Matena
21a1106776 SLA support points are rendered with regard to sla_shift_z 2018-11-26 16:32:42 +01:00
YuSanka
f8bc7cb959 Implementation of the "ColorPrint" on the 3DScene 2018-11-26 16:28:12 +01:00
Enrico Turri
b153c8cb20 SLA slices preview - wip 2 2018-11-26 16:17:59 +01:00
Lukas Matena
878c7ee3d7 SLA support point gizmo - ImGui experimental overlay plus a small bugfix related to point deletion 2018-11-26 15:54:37 +01:00
bubnikv
ebbce32158 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-26 15:19:58 +01:00
bubnikv
b5c56caf6f Fixed an issue with the SLA Z offset at the end of slicing, 
fixed compilation on OSX due to the libigl overriding our "L" localization
macro.
 2018-11-26 15:19:42 +01:00
Enrico Turri
4ca302ba6a SLA slices preview - wip 2018-11-26 15:16:35 +01:00
bubnikv
a378bb7bed Removed some obsolete Perl bindings. 
Removed libslic3r from the default include paths for all modules but
libslic3r. Now headers from libslic3r need to be included with an
explicit path (libslic3r/libslic3r.h etc)
Split the localization macros into I18N.{cpp,h}
 2018-11-26 14:41:58 +01:00
Lukas Matena
9f2fdfabb9 Lay flat gizmo should work correctly with multiple instances and modifier meshes 2018-11-26 13:03:03 +01:00
Lukas Matena
d28d4823e0 SLA support points gizmo - multiple instance support 2018-11-26 13:03:03 +01:00
Enrico Turri
e038c3a20d Merge branch 'master' of https://github.com/prusa3d/Slic3r 2018-11-26 12:11:37 +01:00
Vojtech Kral
25f4f1fe55 Cut: Use world coordinates 2018-11-26 12:08:10 +01:00
Enrico Turri
63996f5ba1 Fixed update of GLCanvas3D::m_moving member 2018-11-26 11:49:04 +01:00
Vojtech Kral
c29493a41b imgui: Refactor, use in cut gizmo 2018-11-26 11:16:39 +01:00
Vojtech Kral
763b443459 imgui: Update 2018-11-26 10:57:14 +01:00
Enrico Turri
57e9d28a84 Added ImGuiWrapper 2018-11-26 10:57:12 +01:00
Enrico Turri
b94f19eaf4 Added method GLCanvas3D::is_dragging() 2018-11-26 10:41:16 +01:00
Enrico Turri
da0b9b9b75 Generate EVT_GLCANVAS_MOUSE_DRAGGING_FINISHED event after an object has been dragged on scene 2018-11-26 08:36:31 +01:00
bubnikv
9258ca8cc6 Further removal of the 3DScene / GLCanvas3DManager scaffold. 2018-11-23 17:15:17 +01:00
Enrico Turri
aaab549cfa Partial cleanup of obsolete methods 2018-11-23 15:05:43 +01:00
Enrico Turri
f838d8cf18 Fixed GLCanvas3D::Selection::_ensure_on_bed() method 2018-11-23 13:20:04 +01:00
tamasmeszaros
746c1d2fd8 SLA support parameters changed: radiuses for diameters. 2018-11-23 13:05:24 +01:00
bubnikv
9722bcdd75 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2018-11-23 12:47:46 +01:00
bubnikv
b03f672801 Refactored to get direct access to GLCanvas3D in Plater and Preview. 
WIP: SLA update delayed until mouse is released.
 2018-11-23 12:47:32 +01:00