Enrico Turri
c7d6691658
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-04-04 11:31:44 +02:00
Enrico Turri
30f44880d7
Removed 'Export print config' checkbox from save dialog for 3mf and amf files
2019-04-04 11:31:26 +02:00
bubnikv
39ce4c33a4
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-04-04 09:41:23 +02:00
Enrico Turri
936f7a3b84
Select newly added parts/volumes from current selected instance when adding from 3D scene's context menu
2019-04-04 09:35:13 +02:00
bubnikv
a36bdefda5
Code to load SVG icons into the BitmapCache class.
2019-04-04 09:20:11 +02:00
Enrico Turri
6d9180ba92
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-04-04 09:03:25 +02:00
Enrico Turri
a7318dbe19
Keeps non selected instances as disabled for any combination of current instance's volumes selection
2019-04-04 09:01:47 +02:00
tamasmeszaros
c6b5fe05e4
Scaling correction parameters in material and print conf.
...
Scaling is applied in sla_trafo but no effect unless set before model import.
2019-04-03 17:34:46 +02:00
Vojtech Kral
703b9bda32
imgui: Fix scaling
2019-04-03 16:39:28 +02:00
Vojtech Kral
c99fe20504
imgui: Yet another font size fix
2019-04-03 16:31:49 +02:00
Enrico Turri
305b07978c
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-04-03 15:28:27 +02:00
Enrico Turri
28ec3415eb
Keep instance mode selection when at least one instance is already selected
2019-04-03 15:28:09 +02:00
Lukas Matena
69027b53fd
SLA gizmo now allows to deselect a point
2019-04-03 14:44:24 +02:00
Enrico Turri
7d488e3424
Added call to schedule_background_process() when deleting modifier attribute
2019-04-03 12:45:06 +02:00
bubnikv
527c213b57
Fixed cutting of objects in left oriented coordinate space.
...
Removed some spurious debugging printf.
2019-04-03 12:07:58 +02:00
Lukas Matena
2269e1b183
Deliberately setting the SLA dialog a bit too large
...
It is not possible to precisely calculate actual window size before the rendering, so I added a safety margin.
It would be nicer to let the window autoscale and only use the inflated dimension for possible moving the window upward to prevent collision with the bottom panel, but...
ImGui autoscaling does not work properly for some reason (the window size autoscales only after a mouse move), so this is a workaround.
2019-04-03 10:41:45 +02:00
Enrico Turri
eff8dd1ae5
Fixed negative values for size shown in the sidebar matrix fields when mirroring is applied
2019-04-03 09:05:52 +02:00
YuSanka
d806e8e5e1
Merge remote-tracking branch 'origin/master' into ys_selection
2019-04-03 08:42:12 +02:00
YuSanka
fed0f189d3
Fixed typo
2019-04-03 08:39:36 +02:00
Enrico Turri
48da4d4756
Fixed conflicts after merge with master
2019-04-03 08:38:32 +02:00
bubnikv
eeae1c0495
Fixed update of the SLAPrint back end after mirroring in a specific
...
case of mirroring around the X axis.
Fixed some asserts on visual studio due to access to empty std::vector
2019-04-02 18:04:23 +02:00
YuSanka
81809018bc
Selection improvements
...
+ "Delete" menu_item for Instances under OSX
2019-04-02 16:33:52 +02:00
Vojtech Kral
1979baf619
imgui: Fix font size and scaling on Windows
2019-04-02 15:28:14 +02:00
Enrico Turri
89a0c84c83
Fixed conflicts after merge with master
2019-04-02 15:13:26 +02:00
Enrico Turri
ba4f0445c3
Fixed rendering of sla cap slices after deleting object
2019-04-02 14:43:38 +02:00
Enrico Turri
f147da1e5d
Fixed conflicts after cherry-picking 5c89135
2019-04-02 14:32:12 +02:00
bubnikv
dc64b4d971
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-04-02 13:54:46 +02:00
bubnikv
086f11df98
Handling of left hand oriented coordinate systems:
...
is_left_handed() method on transformations and volumes
rendering of GLVolumes in left handed coordinate systems by glFrontFace(GL_CW);
SLA slicing on left hand oriented instances by flipping the mesh for SLAPrintObject in X.
rendering of the SLA cutting plane in left handed systems
resetting the SLA clipping planes on 3D preview invalidation
2019-04-02 13:47:49 +02:00
Vojtech Kral
9d5eb2cd48
Fix build
2019-04-02 10:56:30 +02:00
Enrico Turri
adf9c4bd40
Follow-up of d4b22cfb87
-> Fixed dragging of sla instances after slicing
2019-04-02 10:55:36 +02:00
Vojtech Kral
c542413962
imgui: More refactoring, cut gizmo window positioning
2019-04-02 10:36:24 +02:00
Vojtech Kral
145b8fd0df
Firmware updater: Improve logging
2019-04-02 10:33:37 +02:00
Vojtech Kral
75990923f7
Firmware updater: Support for CW1
2019-04-02 10:33:37 +02:00
Lukas Matena
e20ffbfd85
SLA gizmo uses CallAfter to trigger SLA supports calculation to prevent recursive rendering calls
2019-04-02 09:36:16 +02:00
Lukas Matena
5f66a2d181
SLA gizmo dialog now respects system font settings
2019-04-01 14:51:18 +02:00
Vojtech Kral
88cc93cdc9
imgui: Refactor font size, font initialization
2019-04-01 14:28:39 +02:00
Enrico Turri
83aaa471cf
Fixed conflicts after merge with master
2019-04-01 14:21:55 +02:00
Enrico Turri
d4b22cfb87
Fix dragging of mixed instances plus volumes selections
2019-04-01 13:53:48 +02:00
tamasmeszaros
50942e9382
Merge branch 'tm_reuse_unified'
2019-04-01 12:24:50 +02:00
Enrico Turri
7cfcf8fb9a
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-04-01 11:40:08 +02:00
bubnikv
62539bc35b
Fix of No preview of position in variable layer editing UI at retina resolution #2050
2019-04-01 11:08:26 +02:00
Enrico Turri
2ae5f386ae
Added missing include
2019-04-01 10:28:04 +02:00
Enrico Turri
d87b478d60
Camera refactoring
...
1) All camera related OpenGL calls moved into class
2) The Camera class now stores the view matrix, the projection matrix and the viewport
3) The Camera class now exposes methods to get the camera orientation vectors, the camera position, the view matrix, the projection matrix and the viewport
4) All the code operating on the camera or requiring camera data has been modified to use the new methods
2019-04-01 10:00:10 +02:00
Enrico Turri
ba89f04429
Fix of visual hints for rotation of full single instance selection
2019-04-01 09:11:23 +02:00
Enrico Turri
1ce3bb690c
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-04-01 08:28:38 +02:00
tamasmeszaros
725f115756
Merging with master for having minz png compression.
...
Much greater performance boost from better compression algorithm than that from the merged polygons.
2019-03-29 15:21:46 +01:00
Vojtech Kral
3cfb234e86
imgui: Get font size from wxWidgets, fix #2043
2019-03-29 14:58:32 +01:00
YuSanka
ac6a232795
Improved Selection from ObjectList side
2019-03-29 14:36:59 +01:00
Lukas Matena
32ed064797
SLA gizmo fix: occasional crashes after deleting objects
2019-03-29 13:38:33 +01:00
Enrico Turri
aca78cfba2
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-29 12:58:41 +01:00
Enrico Turri
49fe8a9f08
Volumes selected from the sidebar table taken from the currently selected instance
2019-03-29 10:48:20 +01:00
YuSanka
44d3243df1
Added context menu Item "Change Extruder" on 3D-Scene
2019-03-28 16:32:19 +01:00
YuSanka
016b5e35b6
Some _cosmetic_ fixes :
...
+ Set wxDEFAULT_DIALOG_STYLE for MsgDialog
+ Changed Msg text before language changing
2019-03-28 16:32:19 +01:00
Enrico Turri
af3a32b8a0
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-28 09:30:23 +01:00
Enrico Turri
9b3f1a8942
Small refactoring -> GLGizmosManager gets model from selection and not from canvas
2019-03-28 09:30:01 +01:00
bubnikv
fc49abc2a4
Merge remote-tracking branch 'remotes/origin/tm_sla_png_minz'
2019-03-28 09:14:37 +01:00
Enrico Turri
98a848d239
Layers editing initialized only for 3D view and not for g-code preview
2019-03-28 09:12:32 +01:00
Enrico Turri
a4f404a6a4
Selection enabled only for 3D view and not for g-code preview
2019-03-28 08:44:46 +01:00
Enrico Turri
702186eec3
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-28 08:24:25 +01:00
YuSanka
3c163285e5
Fix of SPE-879 and #2021
2019-03-27 17:00:29 +01:00
Enrico Turri
46eafca0eb
Follow-up of 8ea8eb67e4
, utf-8 path conversion moved into nanosvg library
2019-03-27 15:42:01 +01:00
Enrico Turri
d0046283fa
Added #define glcheck() for the case HAS_GLSAFE not defined
2019-03-27 15:14:40 +01:00
Enrico Turri
8459410e3c
Fixed conflicts after merge with master
2019-03-27 14:57:05 +01:00
Enrico Turri
d795f07e7b
Added glsafe() around OpenGL calls where missing
2019-03-27 14:42:09 +01:00
Lukas Matena
490074a2dd
SLA gizmo now turns off in case someone adds an object/instance (to prevent rendering points in thin air, etc.)
...
Also, a bug appering when adding an object larger than the bed and scaling it down was fixed (sla gizmo did not work correctly in that case)
2019-03-27 14:19:12 +01:00
Vojtech Kral
1e9e378659
Fix string access in Preferences.cpp
2019-03-27 13:53:00 +01:00
YuSanka
87febaacc0
Fix of #2014
2019-03-27 13:19:27 +01:00
Enrico Turri
30c4e4fed6
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-27 12:51:59 +01:00
Enrico Turri
c44b6a30f9
Fixed conflicts after merge with master
2019-03-27 12:51:40 +01:00
Vojtech Kral
734d57a714
Fix build on MSVC with PCH off
2019-03-27 12:14:34 +01:00
Enrico Turri
8ea8eb67e4
Fixed loading of SVG textures from utf-8 paths
2019-03-27 12:02:50 +01:00
Vojtech Kral
8dbbfc140b
Merge pull request #2005 from SijmenSchoon/fix-assertions
...
Fix tree-related assertions on startup on Linux
2019-03-27 11:29:32 +01:00
tamasmeszaros
bc74761513
Integrating new step, removing old and unused steps.
2019-03-27 10:59:29 +01:00
bubnikv
84ff7f4221
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-03-27 10:27:01 +01:00
bubnikv
3987296b62
Improved glsafe macro to print out file name, line number and function
...
name on OpenGL assert.
2019-03-27 10:26:55 +01:00
Enrico Turri
3cd6db2278
Fixed selection lost when Place on Face gizmo is active and user click on another object
2019-03-27 09:06:53 +01:00
Enrico Turri
000542f48d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-27 08:33:48 +01:00
YuSanka
c8291c6e52
Fix of #2029
...
+ Some improvements for the language changing
2019-03-26 18:02:26 +01:00
Vojtech Kral
937f6112ce
imgui: Fix assert caused by set_language() while new frame is open
2019-03-26 17:57:54 +01:00
tamasmeszaros
4d8800bc8a
Fixing broken statistics.
2019-03-26 16:45:04 +01:00
tamasmeszaros
4c972549fb
Merge branch 'master' into tm_slice_index_lyrh
2019-03-26 16:06:52 +01:00
Enrico Turri
fee0a6b6b5
void GLCanvas3D::update_gizmos_data() moved into void GLGizmosManager::update_data(GLCanvas3D& canvas)
2019-03-26 15:55:47 +01:00
Enrico Turri
1fbdf7bdaa
Gizmos' grabbers size made uniform as the mean value of the selection's bounding box sides
2019-03-26 14:53:32 +01:00
Enrico Turri
47c39f51e5
Handling of gizmos related key events moved into new method GLGizmosManager::on_key()
2019-03-26 14:38:30 +01:00
Enrico Turri
52f11a6f0d
Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring
2019-03-26 14:08:46 +01:00
Enrico Turri
d18208458b
Handling of gizmos related char events moved into new method GLGizmosManager::on_char()
2019-03-26 14:08:02 +01:00
bubnikv
0a3500b5ab
Added tooltip [Ctrl - R] to the Slice now button
2019-03-26 14:00:53 +01:00
Enrico Turri
c1d74d2943
Code cleanup
2019-03-26 12:39:40 +01:00
Enrico Turri
eafdcb04ba
Handling of gizmos related mouse events moved into GLGizmosManager::on_mouse()
2019-03-26 12:30:17 +01:00
tamasmeszaros
a49643ebdb
Merging with master, solving conflicts.
2019-03-26 11:13:28 +01:00
tamasmeszaros
57e28b53f2
Further refactor and simplification of slice index and print data.
2019-03-26 10:57:45 +01:00
bubnikv
82321c7aee
Merge branch 'master' of https://github.com/prusa3d/Slic3r
2019-03-26 10:39:08 +01:00
bubnikv
e0e1e2b682
Improved SLA layer view: Low layer shall be rendered from the slice above,
...
triangulated slices are shifted slightly away from the clipping planes.
FDM: Ported a "(bridged)" G-code comment from upstream.
2019-03-26 10:38:50 +01:00
YuSanka
910979cf73
Fixed crash after change of a language
...
+ Updating of a mode after recreation
2019-03-26 10:09:53 +01:00
Enrico Turri
a09197879d
Code cleanup
2019-03-26 09:10:35 +01:00
Enrico Turri
3818bfa19a
1st installment of gizmos refactoring
...
1) GLCanvas3D::Gizmos moved into a standalone class GLGizmosManager
2) GLGizmosManager handles mouse events by calling its on_mouse method (wip)
2019-03-26 09:01:04 +01:00
tamasmeszaros
b4ea43a6b0
Merge branch 'master' into tm_slice_index_lyrh
2019-03-25 19:02:35 +01:00
tamasmeszaros
d73d9309f1
Refactoring and commenting slice index solution.
2019-03-25 19:02:05 +01:00
Sijmen Schoon
1ed7895f61
Merge branch 'master' into fix-assertions
2019-03-25 17:24:04 +01:00
Enrico Turri
3e0ec8098b
Code cleanup
2019-03-25 14:13:20 +01:00