Commit Graph

1303 Commits

Author SHA1 Message Date
1058721dba Added visual hints in 3D scene for layers editing 2019-06-27 13:42:50 +02:00
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
27ee68d2f9 WIP Undo / Redo: ModelID / ModelBase renamed to ObjectID / ObjectBase 2019-06-27 11:02:45 +02:00
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
1525a864c5 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-26 13:33:05 +02:00
104a289cfe Implemented interface for updating 3DScene after set a focus to some editor 2019-06-26 13:30:20 +02:00
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
d818d1b429 Add debug option to display picking pass to screen 2019-06-25 19:25:03 -06:00
3d755e1bbe Removed 'Use legacy OpenGL 1.1 rendering' option 2019-06-25 09:20:58 +02:00
27cc66eb54 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-25 08:57:03 +02:00
d689195bda Fix of the previous commit on color change fix. 2019-06-25 08:56:53 +02:00
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
5320ed9374 Merge branch 'master' of https://github.com/Prusa3d/PrusaSlicer 2019-06-24 15:27:43 +02:00
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
7aaba25520 Do not allow to copy/paste volumes when using sla printer 2019-06-24 13:21:05 +02:00
5766e9e915 Fixed conflicts after merge with branch et_perpsective_camera 2019-06-24 11:08:42 +02:00
00b9a3ad32 ENABLE_COMPRESSED_TEXTURES set as default 2019-06-24 09:54:58 +02:00
8b3d88bc0a Adaptive perspective camera frustrum 2019-06-24 09:38:46 +02:00
301eda7369 ENABLE_TEXTURES_MAXSIZE_DEPENDENT_ON_OPENGL_VERSION set as default 2019-06-24 09:27:19 +02:00
96276394d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-24 08:15:41 +02:00
b7f67369c9 Serialized camera type and fixed Mac build 2019-06-20 10:02:52 +02:00
6af69667a3 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-20 08:51:08 +02:00
09f4831f4e Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-19 16:32:40 +02:00
b91b94ad3c Key K set as camera type toggle and updated keyboard shortcuts dialog 2019-06-19 14:33:09 +02:00
da8179d9c7 More camera related functionalities moved from GLCanvas3D to Camera 2019-06-19 14:18:51 +02:00
a3e6412113 Enabled perspective camera 2019-06-19 13:01:18 +02:00
28dd52d88b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 08:17:58 +02:00
917702f252 Fixed DoubleSlider manipulation from Preview scene 2019-06-18 11:40:26 +02:00
a892fa6105 Merge remote-tracking branch 'remotes/origin/ys_bugfixing' 2019-06-18 09:57:55 +02:00
c95a324c3f Merge branch 'vb_admesh_fix' 2019-06-18 08:54:50 +02:00
72479428d7 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-17 14:02:43 +02:00
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
ac8de0bcaf Follow-up of 1a91add2e6 -> Improvements to tighter camera frustrum to reduce z-fighting 2019-06-14 15:37:29 +02:00
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
da1aea889f Enable wipe tower for all multi-extruder configurations 2019-06-14 12:28:52 +02:00
541f58c656 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-14 10:57:29 +02:00
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
1a91add2e6 Tighter camera frustrum to reduce z-fighting 2019-06-14 10:38:09 +02:00
4712c5bbdf DoubleSlider manipulation from preview scene 2019-06-13 16:10:33 +02:00
a99466ef1d Method Camera::apply_projection() called at every rendered frame 2019-06-13 10:24:19 +02:00
428cc4e7c9 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-12 11:45:57 +02:00
0bb8ee149e Sharing TriangleMesh objects between the front end (UI) and back end
(background processing)
2019-06-11 17:08:47 +02:00
c7ba8c4daa Fixed conflicts after cherry-picking 932e54383d28acbc96f0af6c38c838f2bb23f21d 2019-06-10 11:57:42 +02:00
836f2d777f Update 3D scene when all compressed texture data are sent to GPU 2019-06-05 10:07:59 +02:00
886da08f89 Texture compression set as an option 2019-05-28 12:53:16 +02:00
efe29b3c2d Fixed conflicts after merge with master 2019-05-24 15:29:22 +02:00
9f3a05eef3 Fixed false detection of out of print volume for sla supports 2019-05-24 14:38:05 +02:00
302ac3a849 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-24 08:22:53 +02:00
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
a1e09c3db3 Fix of an icon size slider under OSX and GTK 2019-05-22 17:08:02 +02:00