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