3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
12510 commits 1 branch 1 tag 249 MiB
Commit graph

939 commits

Author SHA1 Message Date
Enrico Turri
0a530ab7bc Added undo/redo snapshot for layers height editing 2019-07-17 10:03:00 +02:00
Enrico Turri
21624f5305 Framework to serialize gizmos into undo/redo stack 
Serialization into undo/redo of Cut gizmo

Refactoring of GLGizmosManager
 2019-07-17 08:38:48 +02:00
tamasmeszaros
44801f4429 Priority for wipe tower, Increased safety distance from bed edges. 
* WipeTowerInfo class extended in plater (WipeTower) instead of GLCanvas3D
* Bed origin support in ModelInstance and WipeTower
 2019-07-16 18:33:42 +02:00
tamasmeszaros
1b0e192046 Arrange cache in ModeInstance and logical bed remembered. 2019-07-15 17:30:44 +02:00
bubnikv
d2a3a36013 Fix of the SLA Undo 2019-07-15 15:51:25 +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
Lukas Matena
e674c586b0 Merge branch 'lm_improving_wipe_tower'. Summary of changes: 
- wipe tower respects max volumetric flow, slowing down with PVA etc is not hardcoded anymore
- wipe tower is now allowed for multiple-extruder printers. single extruder stuff is not used in that case (ramming, cooling, etc.)
- start/end filament and toolchange custom gcodes are now inserted differently than before - see 41164a9
- some refactoring, e.g. the abstract WipeTower class was eradicated
 2019-07-15 10:25:38 +02:00
tamasmeszaros
df7bb94daf Not handling logical beds in arrange() 2019-07-12 21:17:11 +02:00
Enrico Turri
cc70c8dff9 Tech ENABLE_SVG_ICONS set as default 2019-07-12 10:13:35 +02:00
Enrico Turri
2f57f756e5 Follow-up of 4c6c608342 -> refactoring 2019-07-12 09:26:19 +02:00
Enrico Turri
4c6c608342 GLToolbar and GLToolbarItem refactored to allow two different actions when left/right clicking on items. 
Stack dialog for undo and redo items is now shown on right click only
 2019-07-11 15:29:46 +02:00
Enrico Turri
f964f5e99a Deactivate undo/redo toolbar items by pressing Esc key 2019-07-11 07:54:33 +02:00
Enrico Turri
dbf0eacfa7 Deactivate undo/redo toolbar items when leaving the 3D scene or clicking into it 2019-07-11 07:46:40 +02:00
Enrico Turri
1b5ab100bd GLToolbar::m_imgui_hovered_pos replaced with GLCanvas3D::m_imgui_undo_redo_hovered_pos 2019-07-10 14:08:14 +02:00
Enrico Turri
14dad5039a Imgui dialogs for undo/redo centered on their toolbar item icon 2019-07-10 13:45:25 +02:00
YuSanka
3720e6a3a3 Fixed redo_to() function and code cleaning from redundant options 2019-07-10 10:15:07 +02:00
YuSanka
f985f5190c Completed undo/redo from a toolbar 2019-07-09 20:45:00 +02:00
YuSanka
3dd1bc753c Merge remote-tracking branch 'origin/vb_undo_redo' into ys_undo_redo 2019-07-09 19:41:37 +02:00
YuSanka
1347e655c2 Next improvements of an undo/redo from a toolbar 2019-07-09 19:39:36 +02:00
Enrico Turri
d4914441f3 Modified logic to add snapshots to undo/redo stack using GLCanvas::do_xxxxxx() methods 2019-07-09 10:18:57 +02:00
YuSanka
fbf14b42e9 Added undo/redo icons. Fist step to implementation Undo/Redo list for toolbar 2019-07-08 18:01:14 +02:00
Enrico Turri
4ba7dfb6dd Refactoring of functions thick_lines_to_indexed_vertex_array() to reduce the amount of produced vertices while reducing visual artifacts in gcode toolpaths due to averaged normals 2019-07-08 15:30:59 +02:00
Enrico Turri
9ba5568539 Fixed conflicts after merge with master 2019-07-08 09:23:37 +02:00
bubnikv
4e2fda3315 Undo / Redo fixes 2019-07-05 19:06:19 +02:00
bubnikv
c7cc760067 Merge remote-tracking branch 'origin/master' into vb_undo_redo 2019-07-04 20:22:15 +02:00
YuSanka
e4d8c5410c Merge remote-tracking branch 'origin/master' into ys_new_features 2019-07-04 14:26:05 +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
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
Enrico Turri
d15698e21e GLVolume and GLIndexedVertexArray refactored to send data to gpu at the first render call 2019-07-02 12:55:55 +02:00
Enrico Turri
2356fe5a13 Added member BoundingBoxf3 m_bounding_box to GLIndexedVertexArray and removed member BoundingBoxf3 bounding_box from GLVolume 2019-07-01 13:26:06 +02:00
Enrico Turri
4269c8b23c Removed GLVolume non-VBO rendering 2019-07-01 12:28:16 +02:00
tamasmeszaros
299e4f74c7 Arranging with new structure. 2019-06-28 17:03:50 +02:00
tamasmeszaros
19e6bf58dd WIP on structuring arrange inputs 2019-06-27 21:13:44 +02:00
YuSanka
dd1fb286c3 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-27 14:01:50 +02:00
Enrico Turri
1058721dba Added visual hints in 3D scene for layers editing 2019-06-27 13:42:50 +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
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
YuSanka
1525a864c5 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-26 13:33:05 +02:00
YuSanka
104a289cfe Implemented interface for updating 3DScene after set a focus to some editor 2019-06-26 13:30:20 +02:00
Lukas Matena
d845332de1 Fixed a crash when using place to bed function with the layer editing active 
This was caused by trying to render a deleted layer height profile. Other gizmos were
not affected because they are not dragging at the time of their action, so the profile
was correctly recalculated for them.
 2019-06-26 11:51:18 +02:00
BeldrothTheGold
d818d1b429 Add debug option to display picking pass to screen 2019-06-25 19:25:03 -06:00
Enrico Turri
3d755e1bbe Removed 'Use legacy OpenGL 1.1 rendering' option 2019-06-25 09:20:58 +02:00
bubnikv
27cc66eb54 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-25 08:57:03 +02:00
bubnikv
d689195bda Fix of the previous commit on color change fix. 2019-06-25 08:56:53 +02:00
Enrico Turri
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
bubnikv
5320ed9374 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-24 15:27:43 +02:00
bubnikv
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
Enrico Turri
7aaba25520 Do not allow to copy/paste volumes when using sla printer 2019-06-24 13:21:05 +02:00
Enrico Turri
5766e9e915 Fixed conflicts after merge with branch et_perpsective_camera 2019-06-24 11:08:42 +02:00
Enrico Turri
00b9a3ad32 ENABLE_COMPRESSED_TEXTURES set as default 2019-06-24 09:54:58 +02:00
Enrico Turri
8b3d88bc0a Adaptive perspective camera frustrum 2019-06-24 09:38:46 +02:00
Enrico Turri
301eda7369 ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default 2019-06-24 09:27:19 +02:00
Enrico Turri
96276394d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-24 08:15:41 +02:00
Enrico Turri
b7f67369c9 Serialized camera type and fixed Mac build 2019-06-20 10:02:52 +02:00
Enrico Turri
6af69667a3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-20 08:51:08 +02:00
YuSanka
09f4831f4e Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-19 16:32:40 +02:00
Enrico Turri
b91b94ad3c Key K set as camera type toggle and updated keyboard shortcuts dialog 2019-06-19 14:33:09 +02:00
Enrico Turri
da8179d9c7 More camera related functionalities moved from GLCanvas3D to Camera 2019-06-19 14:18:51 +02:00
Enrico Turri
a3e6412113 Enabled perspective camera 2019-06-19 13:01:18 +02:00
Enrico Turri
28dd52d88b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 08:17:58 +02:00
YuSanka
917702f252 Fixed DoubleSlider manipulation from Preview scene 2019-06-18 11:40:26 +02:00
bubnikv
a892fa6105 Merge remote-tracking branch 'remotes/origin/ys_bugfixing' 2019-06-18 09:57:55 +02:00
bubnikv
c95a324c3f Merge branch 'vb_admesh_fix' 2019-06-18 08:54:50 +02:00
YuSanka
72479428d7 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-17 14:02:43 +02:00
Lukas Matena
05e6dbbe4b Wipe tower - refactoring (removed the abstract WipeTower class) 
- abstract class WipeTower and its descendant WipeTowerPrusaMM were merged into a single (non-abstract) WipeTower class
- all uses of WipeTower::xy struct were replaced by Eigen Vec2f (it is no longer necessary to be independent on libraries that PrusaSlicer uses)
- the WipeTowerPrusaMM.hpp/.cpp will be renamed in the next commit (hopefully it will retain its git history that way)
 2019-06-17 10:16:07 +02:00
Enrico Turri
ac8de0bcaf Follow-up of 1a91add2e6 -> Improvements to tighter camera frustrum to reduce z-fighting 2019-06-14 15:37:29 +02:00
Lukas Matena
aee376762e Changed handling of priming extrusions to allow injection of filament and toolchange custom gcodes 
The priming extrusions were handled separately from the rest of the wipe tower toolchanges. In order to be able to use the logic from previous commit for them (custom toolchange gcodes etc), some unpleasant code shuffling was needed
 2019-06-14 14:42:07 +02:00
Thomas Moore
da1aea889f Enable wipe tower for all multi-extruder configurations 2019-06-14 12:28:52 +02:00
Enrico Turri
541f58c656 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-14 10:57:29 +02:00
Enrico Turri
ed4b71eb15 Layers editing overlay rendering modified to use a texture drawn on a quad lying in a plane parallel to the camera viewport 2019-06-14 10:55:56 +02:00
Enrico Turri
1a91add2e6 Tighter camera frustrum to reduce z-fighting 2019-06-14 10:38:09 +02:00
YuSanka
4712c5bbdf DoubleSlider manipulation from preview scene 2019-06-13 16:10:33 +02:00
Enrico Turri
a99466ef1d Method Camera::apply_projection() called at every rendered frame 2019-06-13 10:24:19 +02:00
Enrico Turri
428cc4e7c9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-12 11:45:57 +02:00
bubnikv
0bb8ee149e Sharing TriangleMesh objects between the front end (UI) and back end 
(background processing)
 2019-06-11 17:08:47 +02:00
Enrico Turri
c7ba8c4daa Fixed conflicts after cherry-picking 932e54383d28acbc96f0af6c38c838f2bb23f21d 2019-06-10 11:57:42 +02:00
Enrico Turri
836f2d777f Update 3D scene when all compressed texture data are sent to GPU 2019-06-05 10:07:59 +02:00
Enrico Turri
886da08f89 Texture compression set as an option 2019-05-28 12:53:16 +02:00
Enrico Turri
efe29b3c2d Fixed conflicts after merge with master 2019-05-24 15:29:22 +02:00
Enrico Turri
9f3a05eef3 Fixed false detection of out of print volume for sla supports 2019-05-24 14:38:05 +02:00
Enrico Turri
302ac3a849 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-24 08:22:53 +02:00
Enrico Turri
3aa14bddf5 Max texture size dependent on OpenGL version on Win and Linux and on retina monitors on Mac 2019-05-23 13:49:57 +02:00
YuSanka
a1e09c3db3 Fix of an icon size slider under OSX and GTK 2019-05-22 17:08:02 +02:00
YuSanka
d845966cbb Implemented a possibility to set a custom toolbars icon size (related to #2247 and same others) 2019-05-22 13:51:02 +02:00
Enrico Turri
efd247fc58 Use texture compression on GPU 2019-05-21 14:19:03 +02:00
Enrico Turri
84632d32ba Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-21 08:23:53 +02:00
Enrico Turri
b0200c04ae Fixed debug technology ENABLE_RENDER_SELECTION_CENTER 2019-05-20 15:59:54 +02:00
Enrico Turri
783a527109 Added imgui debug dialog for camera statistics 2019-05-20 09:39:57 +02:00
Yuri D'Elia
89ff5d03eb Delay refresh until initialized 
on_idle can be called too early on wxGtk3/X11.
Check for m_initialized before refreshing.
 2019-05-18 15:07:33 +02:00
Enrico Turri
8c6304688d Camera refactoring: Frustrum calculations moved into Camera class 2019-05-16 15:54:11 +02:00
bubnikv
3f08d9f30d Changed references to renamed github project 
https://github.com/prusa3d/PrusaSlicer
 2019-05-14 19:46:01 +02:00
Enrico Turri
14c4469cbf Added Esc shortcut and menu item for command deselect all 2019-05-14 11:57:39 +02:00
YuSanka
cd82b03a0e Localization improvements : Empty spaces at the end of phrase are removed from dictionary. 
+ new POT
 2019-05-11 23:29:25 +02:00
bubnikv
ed8430bc9b Application will pick translation dictionaries based on the system default language 
on first start of Slic3r.
Updated help menu (removed reference to the upstream manual)
Fixed some OpenGL assert due to glOrtho being called with zero Z span.
 2019-05-10 14:43:35 +02:00
bubnikv
fb6aabd785 Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-05-10 11:48:01 +02:00
bubnikv
40ffe8270a Merge branch 'master' of https://github.com/Prusa3d/Slic3r 2019-05-10 11:47:11 +02:00
Enrico Turri
b55c60125c Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-05-10 11:45:10 +02:00
bubnikv
c9f7965599 Reverted a change in number text formatting. 
Fixed some message wording.
 2019-05-10 11:44:21 +02:00
Lukas Matena
5dbcec5126 Turn off the SLA gizmo when switching to FFF printer profile 2019-05-10 11:32:30 +02:00
Enrico Turri
f0da19446b Merge branch 'lm_arrange_wipe_tower' of https://github.com/prusa3d/Slic3r 2019-05-10 11:14:42 +02:00
Enrico Turri
769f0144c2 Follow-up of 14925af62872c11be9ef638edd95457dd51fb70f -> Fixed detection of sla supports out of bed 2019-05-10 10:43:49 +02:00
Enrico Turri
efd429ea46 Detection of sla supports out of printbed in Preview and when sla gizmo is active 2019-05-10 10:43:39 +02:00
bubnikv
b7361200bf Some more localization improvements. 2019-05-09 19:24:21 +02:00
bubnikv
8126ec33fc Fixed localization of 3D scene toolbar tips. 2019-05-09 17:18:03 +02:00
Enrico Turri
ec57a7f971 Fixed current gizmo not turning off when removing last object from selection by ctrl + click and using selection rectangle 2019-05-09 10:09:33 +02:00
bubnikv
a351e99bac Merge remote-tracking branch 'remotes/origin/vb_wold_object_manipulation' 2019-05-07 13:50:40 +02:00
Lukas Matena
e9a53e49db Arrange is accounting for the wipe tower now 2019-05-06 08:14:45 +02:00
Lukas Matena
5f226c5d7f Allow wipe tower rotation by the rotation gizmo 2019-05-06 08:14:45 +02:00
bubnikv
045879f68a Fix of a crash when deleting an object while it is edited 
with the smooth variable layer editing tool.
 2019-05-04 21:40:58 +02:00
bubnikv
31e724abac Merge branch 'master' into vb_wold_object_manipulation 2019-05-04 20:59:57 +02:00
YuSanka
8e007c5b6a Localization improvements 2019-05-04 02:07:07 +02:00
bubnikv
1c6006f657 Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation 2019-05-03 12:37:43 +02:00
bubnikv
0ab96ed6b5 Changed the "non-uniform scaling is not possible" message. 2019-05-03 12:36:26 +02:00
Enrico Turri
d971c821b7 Merge branch 'et_selection_rectangle' of https://github.com/prusa3d/Slic3r 2019-05-03 11:44:37 +02:00
Enrico Turri
4a5992ba6e Top toolbar use layers_white.svg icon for layers editing 2019-04-30 15:43:19 +02:00
Enrico Turri
3a5485a179 Flip X mouse deltas if bed is upside down (when camera up vector has negative Z) 2019-04-30 15:09:25 +02:00
bubnikv
ebb7981d16 Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation 2019-04-29 17:39:28 +02:00
Lukas Matena
3ec17fae67 A hotfix for #2179 (GCode preview crash on T-1 in GCode) 2019-04-29 14:26:46 +02:00
Enrico Turri
dfe2719656 Rectangle selection -> Min size of rectangle selection set to 1 pixel 2019-04-29 08:31:32 +02:00
Enrico Turri
fdf1b8af81 Rectangle selection -> Removed cursor change 2019-04-29 08:26:08 +02:00
bubnikv
16560f6e27 Merge remote-tracking branch 'remotes/origin/master' into vb_wold_object_manipulation 2019-04-26 17:42:51 +02:00
bubnikv
6526a8fcaf WIP: Transformation of instances in world coordinate space: 
Ulocking the "anisotropic" scaling checkbox will bake the transformation
into meshes to allow for scaling in world axes.

Optimized and templated the stl_transform functions, now also available for 3x3 matrices.
The Canvas3D::reload_scene() now maintains selection even if all volumes of an instance changed their IDs.
 2019-04-26 17:28:31 +02:00
Enrico Turri
818f7ad647 Rectangle selection in 3D scene -> Fixed selection cleared when mouse left-up follows shift-up 2019-04-26 14:07:46 +02:00
Enrico Turri
6f273bef7f Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_selection_rectangle 2019-04-26 13:38:34 +02:00
Enrico Turri
8857d556f6 Rectangle selection in 3D scene -> tweaks to hovering detection and selection update logic 2019-04-26 13:37:34 +02:00
YuSanka
127a78d953 Fixed default font for legends in respect to the OS 2019-04-26 13:08:25 +02:00
Enrico Turri
36252a42da Small optimization 2019-04-25 15:08:14 +02:00
Enrico Turri
905673f344 Small refactoring 2019-04-25 13:41:00 +02:00
Enrico Turri
748a4438ba Attempt to fix build on Linux 2019-04-25 13:35:24 +02:00
Enrico Turri
a0640d2d24 Rectangle selection in 3D scene -> selection update 2019-04-25 12:31:55 +02:00
Enrico Turri
3fba850793 Rectangle selection in 3D scene -> tweaks to the hovering detection logic 2019-04-25 11:50:30 +02:00
Enrico Turri
d2597482e0 Added imgui debug dialog for render statistics 2019-04-25 11:10:01 +02:00
Enrico Turri
d2d06c9f73 Rectangle selection in 3D scene -> refactored GLVolume member varialbe for hovering 2019-04-25 10:21:24 +02:00
Enrico Turri
11490dfb06 Rectangle selection in 3D scene -> hovering detection 2019-04-25 09:46:26 +02:00
Enrico Turri
ec2f319a3d Rectangle selection in 3D scene -> rendering 2019-04-25 09:10:03 +02:00
Enrico Turri
b557336fa6 Fixed conflicts after merge with master 2019-04-25 08:12:48 +02:00
YuSanka
065448e9e5 Big Refactoring: - deleted/renamed all _Prusa_ prefixes, 
- cleaned code from commented parts
 - rescale() -> msw_rescale()
 2019-04-25 01:45:00 +02:00
bubnikv
2cc7b00a7d WIP: World / local transformations of an object instance from the side panel. 2019-04-24 19:03:05 +02:00
Enrico Turri
d79a2b8d2d GLCanvas3D -> added support for cursor change and change cursor when using SLA support gizmo rectangle selection 2019-04-24 15:43:52 +02:00
Enrico Turri
9710140948 int GLCanvas3D::m_hover_volume_id replaced with std::vector<int> GLCanvas3D::m_hover_volume_idxs 2019-04-24 15:07:28 +02:00
YuSanka
5761c8f126 Merge remote-tracking branch 'origin/master' into ys_msw_dpi 2019-04-18 15:33:50 +02:00
YuSanka
de55801e31 Merge remote-tracking branch 'origin/ys_bug_fixing' into ys_msw_dpi 2019-04-18 15:24:50 +02:00
Lukas Matena
8df2a19974 SLA clipping plane can now be controlled by Ctrl + mouse wheel rotation 2019-04-17 14:27:20 +02:00
Enrico Turri
dfa924e8eb Ctrl+C and Ctrl+V for Copy and Paste refactored in the same way as Ctrl+A for Select All 2019-04-16 13:47:37 +02:00
YuSanka
fc63a28481 Application Scaling for MSW: 
+ Experiments with toolBars scaling
+ Rescaled warning and printing legends
 2019-04-16 12:13:45 +02:00
Enrico Turri
e8c08d8f91 Switch to regular shading when manipulating an object with gizmos while layers editing is active 2019-04-16 08:50:46 +02:00
Enrico Turri
00a7673a2b Fixed glitches in rendering when activating layers editing 2019-04-15 14:19:18 +02:00
Enrico Turri
dddea0db22 Fixed selection when right-clicking in the 3D scene to show the context menu 2019-04-15 10:27:40 +02:00
bubnikv
1e455bc065 Fix of "Variable layer height feature breaks after rotating part #2073" 
There was an approximate bounding box used at the GUI, while a snug
bounding box was used at the back end, causing invalidation
of the variable layer height editing profile on rotated objects.

A snug bounding box around the first instance is now cached.
 2019-04-13 14:15:54 +02:00
bubnikv
80afb6da78 Fixed SLA clippling plane & picking. 2019-04-12 16:08:40 +02:00
Enrico Turri
7d15ee8fd9 Offset used to place newly added volumes and instances proportional to the bed max size 2019-04-12 15:31:33 +02:00
Enrico Turri
5a1b9cd382 Copy and paste -> Fixed tooltips for copy and paste toolbar items on Mac 2019-04-12 08:57:53 +02:00
Enrico Turri
3e902ecfbd Fixed conflicts after merge with master 2019-04-12 08:41:59 +02:00
bubnikv
112f218c03 Merge branch 'lm_sla_gizmo_clipping_plane' 2019-04-11 15:45:49 +02:00
bubnikv
4a210aeecf Vojtech's improvements in the SLA preview cutting dialog. 2019-04-11 15:44:32 +02:00
Enrico Turri
4718c839f6 Copy and paste -> Added items for copy and paste on the toolbar 2019-04-11 13:20:34 +02:00
Enrico Turri
1b6bf30e76 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 14:03:57 +02:00
Enrico Turri
2dc88ab0be Fixed crash when typing on keyboard during the app start-up 2019-04-10 13:52:18 +02:00
Lukas Matena
678c513cb9 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-10 13:43:02 +02:00
Enrico Turri
a80978f84a Do not show as hovered the entire instance when hovering on modifiers 2019-04-10 12:20:07 +02:00
Enrico Turri
6043dbd07d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-04-10 11:20:28 +02:00
Enrico Turri
e61be7d260 Render picking pass renders volumes in the same order as the regular render pass 2019-04-10 11:20:09 +02:00
bubnikv
7b8b8b97ef Fixed Cmd-A selection in the SLA gizmo. 2019-04-10 10:16:04 +02:00
Enrico Turri
0889877e26 Tweaks to selection from 3D scene 2019-04-09 15:42:00 +02:00
Vojtech Kral
d97037e246 GLCanvas3D: Fix an assert in _set_current() 2019-04-09 15:16:10 +02:00
Enrico Turri
a13b2b1de3 Fixed crash when using mouse wheel before the 3D scene is shown (during app startup) 2019-04-09 11:18:40 +02:00
bubnikv
4904359399 Finished SLA print / material correction visualization. 2019-04-08 18:09:31 +02:00
Lukas Matena
eadf7daa37 Merge branch 'master' into lm_sla_gizmo_clipping_plane 2019-04-08 10:50:10 +02:00
Lukas Matena
bbda1896f9 The gizmo is now able to triangulate and show the cut, the triangulated cut is cached 2019-04-08 10:31:19 +02:00
Lukas Matena
9b7857aaab SLA gizmo clipping plane logic moved to fragment shader 
This means the clipping now works again with both legacy and modern OpenGL
 2019-04-08 10:31:16 +02:00
Lukas Matena
273fcf68a1 SLA gizmo now uses glClipPlane instead of touching projection matrix 
Messing with the projection matrix invalidates the z-buffer
This currently only works in OpenGL legacy mode
 2019-04-08 10:31:13 +02:00
Lukas Matena
bc9164e40c SLA gizmo now respects the clipping plane when rendering points and raycasting mouse onto mesh 2019-04-08 10:31:10 +02:00
Lukas Matena
fd1f9d65fb First steps on SLA clipping plane 2019-04-08 10:31:04 +02:00
Enrico Turri
a688493d91 Merge branch 'et_canvas_gui_refactoring' of https://github.com/prusa3d/Slic3r 2019-04-08 09:09:12 +02:00
Enrico Turri
8cdc461d34 CTRL-click replace SHIFT-click for addind/removing objects to the current selection from the 3D scene 2019-04-08 08:30:28 +02:00
Enrico Turri
6ca49c05df Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-04-05 11:55:56 +02:00
Lukas Matena
177f5b02fa Disabled layer editing mode for SLA 2019-04-05 09:51:58 +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
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
c542413962 imgui: More refactoring, cut gizmo window positioning 2019-04-02 10:36:24 +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
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
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
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
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
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
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
tamasmeszaros
bc74761513 Integrating new step, removing old and unused steps. 2019-03-27 10:59:29 +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
tamasmeszaros
4d8800bc8a Fixing broken statistics. 2019-03-26 16:45:04 +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
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
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
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
d73d9309f1 Refactoring and commenting slice index solution. 2019-03-25 19:02:05 +01:00
Lukas Matena
3f7f8f978e Fix of sla gizmo (it sometimes showed supports for hidden objects) 2019-03-24 13:35:09 +01:00
bubnikv
2fe27a29e0 Fixed the SLA layer preview. 2019-03-22 21:26:58 +01:00
tamasmeszaros
4ece50e3db Merge branch 'master' into tm_slice_index 2019-03-22 15:31:58 +01:00
tamasmeszaros
d165dbb498 Refactoring changes to the slice index. 2019-03-22 15:31:38 +01:00
Lukas Matena
0848617fd3 SLA gizmo fix: adding points to selection by Shift+click should now work again (was broken by 8466c55) 2019-03-22 10:56:51 +01:00
tamasmeszaros
0ffc0c3a84 Merge branch 'master' into tm_slice_index 2019-03-21 15:17:01 +01:00
tamasmeszaros
24a5dd4235 FIx for broken slice preview 2019-03-21 15:16:33 +01:00
bubnikv
562343cd2a Localization fix of the warning texts in the 3D scene. 
Improved anti-aliasing of the warning texts in the 3D scene
and the G-code legend. A ClearType rendering has been suppressed
by rendering of the text into a red channel only.
 2019-03-21 14:33:55 +01:00
tamasmeszaros
d4dde12d0d Slic3r compiles with the new slice index interface. 2019-03-21 12:25:33 +01:00
Enrico Turri
3a923b7121 Fixed conflicts after merge with master 2019-03-20 16:09:14 +01:00
Lukas Matena
8466c55b78 SLA gizmo - points are added on leftdown event, not leftup as before 2019-03-20 14:04:59 +01:00
Lukas Matena
df01af975a SLA gizmo now forces objects to use their normal color (not SELECTED_COLOR) 2019-03-20 14:04:20 +01:00
Enrico Turri
d23824af97 GLCanvas3D::Gizmos as a standalone class (GLGizmosManager) 2019-03-20 13:51:25 +01:00
Lukas Matena
2728e45646 Renamed function mouse_event to gizmo_event 2019-03-20 13:44:34 +01:00
Enrico Turri
df250039df Tech ENABLE_CANVAS_GUI_REFACTORING set as default 2019-03-20 09:33:30 +01:00
Enrico Turri
80c1a8d8e4 GLCanvas3D::Selection as a standalone class 2019-03-19 13:30:21 +01:00
Enrico Turri
5bb89f4da2 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-19 10:48:51 +01:00
Enrico Turri
262f187699 Fixed visual hints for position in case of single volume selection 2019-03-19 10:09:54 +01:00
Enrico Turri
334b5a82a6 Tech ENABLE_MOVE_MIN_THRESHOLD set as default 2019-03-19 10:04:19 +01:00
Enrico Turri
42939e76a3 Code cleanup 2019-03-19 09:21:27 +01:00
Enrico Turri
8b85e09062 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-18 12:07:32 +01:00
Lukas Matena
e813a562a1 Removed technology ENABLE_IMGUI 2019-03-18 11:45:15 +01:00
Lukas Matena
d3c8e3166e Separated gizmos into individual files 2019-03-18 11:45:15 +01:00
Enrico Turri
e97dcbb660 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-18 11:08:02 +01:00
Enrico Turri
feb2041c7b Context menu in 3D scene shown on right mouse up event 2019-03-18 10:47:01 +01:00
Enrico Turri
710bb66dfc Fixed assert in imgui when starting Slic3r for the 1st time (no config data saved on disk) 2019-03-18 10:10:11 +01:00
Enrico Turri
7554c9862d Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-15 13:24:58 +01:00
Enrico Turri
bc3036d777 Follow-up to previous commits on gizmo grabbers picking (use of centralized static constant for ids and added comments) 2019-03-15 12:07:25 +01:00
Lukas Matena
ef939905b1 Another fix of the gizmo grabber color picking 2019-03-15 11:04:08 +01:00
Enrico Turri
6ab0a526b3 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_canvas_gui_refactoring 2019-03-15 09:15:11 +01:00
Enrico Turri
5b01eb3004 2nd fix for x position of gizmos' imgui dialogs 2019-03-15 09:13:15 +01:00
Enrico Turri
5018089351 Toolbar refactoring 
1) toolbar items define 3 callback functions for setting the visibility, setting the enabling state and defining their action which are set while adding a new item to the toolbar

2) the toolbar takes care to update all its items visibility and enabled states through a new update method to be called by the parent idle event handler

3) the toolbar handles mouse events by calling its on_mouse method
 2019-03-14 13:54:05 +01:00
Lukas Matena
63b65bb3c8 Wipe tower brim lines are now printed with overlaps as they should be 2019-03-13 10:46:50 +01:00
bubnikv
1da97c9415 Merge remote-tracking branch 'remotes/origin/ys_buttons' 2019-03-12 09:01:17 +01:00
Enrico Turri
b89e95aea7 Fixed rotation of multiple instances selection 2019-03-08 14:52:32 +01:00
Enrico Turri
172daa8989 Top toolbar icon size set to 40px 2019-03-08 14:35:33 +01:00
Enrico Turri
862700ab46 Added change removed by mistale in 02163f7f9648b81ad1dc59a4ad6c1a5c55c02a50 2019-03-08 12:04:06 +01:00
Enrico Turri
513256649e Final version of fix to prevent showing old framebuffer when switching between views on Mac 2019-03-08 12:04:01 +01:00
Enrico Turri
628a868cfd 2nd attempt to prevent showing old framebuffer when switching between views on Mac 2019-03-08 12:03:49 +01:00
Enrico Turri
fc70b73f45 Refactoring - Shared members of GLCanvas3D as references instead of pointers 2019-03-08 12:03:37 +01:00
Enrico Turri
b5217918cf Code cleanup 2019-03-08 12:03:31 +01:00
Enrico Turri
72239732e4 Fixed build on Mac 2019-03-08 12:03:25 +01:00
Enrico Turri
aa4c44dbea Use unique camera shared by 3d view and preview (experimental) 2019-03-08 12:03:17 +01:00
Enrico Turri
af72d781ad Fixed GLCanvas3D::Selection::is_single_full_instance() 2019-03-08 10:36:12 +01:00
Lukas Matena
8b74cc48eb Prevented instance move event when SLA gizmo is active so right panel is not needlessly updated 2019-03-08 09:26:42 +01:00
YuSanka
aa0737fa5e Fixed assert after try to add Part to Object with several Instances from the ObjectList. 
+ Fixed selection on the 3DScene before a context menu showing
 2019-03-07 10:08:21 +01:00
Enrico Turri
2a6de99f06 Fixed rotation of multiple volumes selection 2019-03-06 15:22:17 +01:00
Enrico Turri
2c99fd35d3 Force canvas resize when switching between views 2019-03-06 13:37:20 +01:00
Enrico Turri
de06db7989 Allow dragging of objects also along world Z axis in side views 2019-03-06 12:09:20 +01:00
Enrico Turri
1bb5630eaa Fixed gizmos' imgui dialog x position 2019-03-06 10:47:48 +01:00
Lukas Matena
f147f192b4 Disabled object context menu when the SLA gizmo is active 2019-03-06 10:10:10 +01:00
Enrico Turri
925378ba90 Added background to legend texture 2019-03-05 13:57:41 +01:00
Enrico Turri
822bd92bd1 Fixed conflicts after merge with master 2019-03-05 08:27:21 +01:00
Lukas Matena
02c68ed895 Prevented the sla gizmo dialog to overlap the bottom toolbar 2019-03-04 14:52:08 +01:00
Enrico Turri
319a48f42d Added svg icons for view toolbar and gismos 2019-03-04 14:21:52 +01:00
Enrico Turri
5ddf45806b Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-03-04 13:47:34 +01:00
Enrico Turri
06c2b4bdf3 Allow to drag object's subparts once selected using the sidebar table 2019-03-04 11:00:52 +01:00
Enrico Turri
3c7ec5f7c6 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-03-04 08:33:52 +01:00
bubnikv
570bc63e58 Merge branch 'master' of https://github.com/prusa3d/Slic3r 2019-03-01 15:36:01 +01:00
bubnikv
0ec450f3d7 Fix of instance rotations from the side panel 
in regard to instance synchronization.
 2019-03-01 15:35:48 +01:00
Enrico Turri
3a1dcedaff Prevent camera rotation when clicking and dragging on toolbars 2019-03-01 12:23:33 +01:00
YuSanka
247b70395b Merge remote-tracking branch 'origin/master' into ys_buttons 2019-03-01 12:13:33 +01:00
YuSanka
a123099f80 Implemented another behavior of the "Slice Now" / "Export/Send G-code" buttons (SPE-831) 2019-03-01 11:00:34 +01:00
Enrico Turri
e03199d989 Allow selection of subparts only from sidebar table 2019-03-01 10:40:10 +01:00
bubnikv
d009be7609 Fixed rotation of single instance -> it works now with absolute values. 
Added Absolute / relative, World / Local, Rigid body / independent
modifier parameter to the object / group rotation.
 2019-03-01 10:20:12 +01:00
Enrico Turri
e5a2c0a8c8 ENABLE_MODE_AWARE_TOOLBAR_ITEMS set as default 2019-02-28 12:21:36 +01:00
Enrico Turri
2d77f89360 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-27 10:42:30 +01:00
Lukas Matena
bb533e386a Fixed shortcut for [M]ove gizmo (accidentally overridden by a shortcut for [M]anual changes of SLA support points) 2019-02-27 10:12:54 +01:00
Enrico Turri
8cc1486cab Fixed uv in gizmos overlay 2019-02-27 10:03:58 +01:00
Enrico Turri
e1eff8fa5c Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-26 12:56:43 +01:00
Enrico Turri
a8610f990e Automatic generation of variants of icons for toolbars and gizmos 2019-02-26 12:56:13 +01:00
Enrico Turri
2f205dd77b Fix of #1853 (Translation of volumes in side view) 2019-02-26 12:31:49 +01:00
bubnikv
f3b33eac50 Yet another fix of keyboard / mouse focus on the 3D scene. 2019-02-26 11:50:45 +01:00
Enrico Turri
f47fe861ac Allow non-squared textures for toolbars and gizmo icons 2019-02-26 10:40:00 +01:00
Enrico Turri
0f683a6a1e 1st installment of svg icons for toolbars and gizmos 2019-02-26 09:56:23 +01:00
bubnikv
feef5608b9 Workaround for mouse events sent out of order 
(mouse button down being sent before mouse enter)
 2019-02-25 17:09:44 +01:00
Lukas Matena
bb3819fd18 SLA support gizmo hotkeys added (A,M,Esc,Enter) 2019-02-25 13:04:05 +01:00
Enrico Turri
fab87ff1d9 Merge branch 'master' of https://github.com/prusa3d/Slic3r into svg_icons 2019-02-25 09:32:02 +01:00
bubnikv
7b65803cb3 Fix of SPE-832 
Workaround for a wxWidget bug, where the mouse down event comes
before mouse enter event after a pop-up menu is closed.
 2019-02-22 16:16:04 +01:00
Enrico Turri
03022ce124 Code cleanup 2019-02-22 12:06:56 +01:00
Enrico Turri
a36896e4c9 Fixed conflicts after merge with master 2019-02-22 10:18:15 +01:00