Commit Graph
100 Commits
Author SHA1 Message Date
Enrico Turri 38d5817bc9 Disabled ENABLE_CAMERA_STATISTICS 2019-06-24 11:23:25 +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 e5be8adadf Fixed build on MacOS 2019-06-20 11:05:05 +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
Enrico Turri 5dcc6c7f36 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 14:33:31 +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 b0b54ed0e6 Fixed flickering of 3D view when moving objects on NVIDIA graphic cards 2019-06-19 11:05:34 +02:00
Enrico Turri a15cb597ab Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-19 10:35:27 +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
Enrico Turri b001eca21f #2528 - New project command automatically switches to 3D editor view 2019-06-18 14:45:10 +02:00
Enrico Turri 5ee695b629 #2506 - Fixed crash while manually editing SLA supports 2019-06-18 08:53:13 +02:00
Enrico Turri ddb4c1ff3f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-17 09:34:25 +02:00
Enrico Turri 9ffd294f07 Fixed functions declaration template<class Tf> inline constexpr coord_t scaled(Tf val) and template<class Tf> inline constexpr Tf unscaled(coord_t val) to use constexpr on versions of Visual Studio which support it 2019-06-17 09:28:41 +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
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
Enrico Turri a99466ef1d Method Camera::apply_projection() called at every rendered frame 2019-06-13 10:24:19 +02:00
Enrico Turri f0b228c4d2 Added support for distance between camera position and camera target 2019-06-13 09:12:44 +02:00
Enrico Turri 26d48b7f52 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-06-13 08:48:19 +02:00
Enrico Turri 9805417028 Fixed method Camera::get_position() 2019-06-13 08:47:38 +02:00
Enrico Turri 7bfb0aaac0 Fixed method Camera::get_dir_forward() 2019-06-13 08:38:49 +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
Enrico Turri abdb5c5d74 Fixed conflicts after git cherry-picking 39cfe819daeb7dd71bae5ff20edfbe6396dffbe8 2019-06-12 10:57:20 +02:00
Enrico Turri d07b3fb08b Bed shape dialog refactoring 2019-06-12 10:00:51 +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 a9ea9b3e0a Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-05 07:48:32 +02:00
Enrico Turri 273c30c8ce Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-03 15:47:33 +02:00
Enrico Turri 6a8c7a8705 Fixed race condition while compressing texture data and sending them to the GPU 2019-06-03 13:53:30 +02:00
Enrico Turri 4a4deef420 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-03 12:16:38 +02:00
Enrico Turri e6af0d3dc4 Temporary low-res texture shown while generating compressed data on the CPU 2019-06-02 11:01:51 +02:00
Enrico Turri 545c013acd Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-06-02 09:39:11 +02:00
Enrico Turri f0baefb6ff Asynchronous texture compression on CPU 2019-05-31 15:25:02 +02:00
Enrico Turri 58adeb01d1 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-31 07:41:22 +02:00
Enrico Turri 8d86192530 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-29 08:30:23 +02:00
Enrico Turri 8012499206 Application of anisotropy to textures moved into GLTexture methods 2019-05-28 15:21:34 +02:00
Enrico Turri 886da08f89 Texture compression set as an option 2019-05-28 12:53:16 +02:00
Enrico Turri 61c41aa90f Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-28 09:46:40 +02:00
Enrico Turri e0da08906b Disabled debug render statistics dialog 2019-05-27 09:20:48 +02:00
Enrico Turri 61730aee27 Updated shortcut dialog with new scale to fit print volume command 2019-05-24 15:53:15 +02:00
Enrico Turri efe29b3c2d Fixed conflicts after merge with master 2019-05-24 15:29:22 +02:00
Enrico Turri bf9740188a Code cleanup 2019-05-24 15:22:27 +02:00
Enrico Turri 734d946912 1) Added Scale to print volume menu item to objects list context menu
2) Disable [F] key when scale sizmo is dragging
2019-05-24 14:42:59 +02:00
Enrico Turri c92940c985 Fixed conflicts after cherry-picking 844e99f84e 2019-05-24 14:42:46 +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
Enrico Turri 4504569f8e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-23 12:39:47 +02:00
Enrico Turri a8e92be6eb 1) Added Scale to print volume menu item to objects list context menu
2) Disable [F] key when scale sizmo is dragging
2019-05-23 09:20:11 +02:00
Enrico Turri 763576fbc2 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-23 08:29:43 +02:00
Enrico Turri 844e99f84e Prototype of scale to fit print volume command 2019-05-22 14:42:38 +02:00
Enrico Turri f70cc70626 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-22 13:59:33 +02:00
Enrico Turri 77efc33670 Fixed scaling of multiple selection 2019-05-22 13:57:39 +02:00
Enrico Turri 3f990f1f45 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_experiments 2019-05-22 10:31:12 +02:00
Enrico Turri efd247fc58 Use texture compression on GPU 2019-05-21 14:19:03 +02:00
Enrico Turri 91b97337b0 Tech ENABLE_NEW_EULER_ANGLES set as default 2019-05-21 10:16:44 +02:00
Enrico Turri ac368e2c9e Tech ENABLE_GENERIC_SUBPARTS_PLACEMENT set as default 2019-05-21 10:01:04 +02:00
Enrico Turri 83c06859a6 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-21 09:43:14 +02:00
Enrico Turri 975ccc4ac1 Tech ENABLE_VOLUMES_CENTERING_FIXES set as default 2019-05-21 09:42:59 +02:00
Enrico Turri 2a973c1dfa Removed tech DISABLE_DESELECT_ALL_MENU_ITEM 2019-05-21 09:23:45 +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 951f9c1dab Reset tooltip in objects list when no item is hovered 2019-05-20 13:52:58 +02:00
Enrico Turri 0132313ee0 Fixed position of instances after paste object 2019-05-20 10:33:49 +02:00
Enrico Turri 7bb79062e6 Ctrl+Shift+S in place of Ctrl+Alt+S for command Save Project as on Mac 2019-05-20 10:02:51 +02:00
Enrico Turri 783a527109 Added imgui debug dialog for camera statistics 2019-05-20 09:39:57 +02:00
Enrico Turri c5e4ada75b Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-20 08:28:34 +02:00
Enrico Turri 64bd392e7d Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_perspective_camera 2019-05-17 15:14:08 +02:00
Enrico Turri e354a306e6 Fixed delayed update of 3D scene when moving preview layers' slider (as reported in #1250) 2019-05-17 15:04:06 +02:00
Enrico Turri a098f118b6 Follow-up of c62006048f -> Notify Windows only when the its registry is changed 2019-05-17 11:35:35 +02:00
Enrico Turri 8c6304688d Camera refactoring: Frustrum calculations moved into Camera class 2019-05-16 15:54:11 +02:00
Enrico Turri 8e31668704 Fixed method Vec3d Camera::get_position() const 2019-05-16 12:06:02 +02:00
Enrico Turri 0298e9077f Fix build of d0fd8a4a29 on OsX and Linux 2019-05-15 14:55:51 +02:00
Enrico Turri d0fd8a4a29 Follow-up of f54fd10897 -> Project name stored with no extension, updated after drag and drop of .3mf or .amf files and used by export g-code and send g-code commands 2019-05-15 14:09:16 +02:00
Enrico Turri 64d4e7cd0c Follow-up of 8ae1dfd4d0 -> Fixed build on OsX 2019-05-15 10:59:00 +02:00
Enrico Turri 8ae1dfd4d0 File->Open Project allows to load .amf files 2019-05-15 10:23:02 +02:00
Enrico Turri bdd9ed123a Updated keyboard shortcuts dialog 2019-05-14 15:16:37 +02:00
Enrico Turri f54fd10897 Implementation of File->New project menu item 2019-05-14 15:00:24 +02:00
Enrico Turri 5f6c7853d4 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer 2019-05-14 11:57:48 +02:00
Enrico Turri 14c4469cbf Added Esc shortcut and menu item for command deselect all 2019-05-14 11:57:39 +02:00
Enrico Turri c4c292168d Merge branch 'et_copy_and_paste' of https://github.com/prusa3d/PrusaSlicer 2019-05-14 10:31:56 +02:00
Enrico Turri 016c5f6557 Added placeholder for File->New Project menu item 2019-05-14 10:30:14 +02:00
Enrico Turri 979b66f231 Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_copy_and_paste 2019-05-14 09:07:53 +02:00
Enrico Turri 9ba8cb502e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_copy_and_paste 2019-05-13 14:18:34 +02:00
Enrico Turri 9b8323389e Merge branch 'master' of https://github.com/prusa3d/PrusaSlicer into et_copy_and_paste 2019-05-13 11:59:29 +02:00
Enrico Turri f55e494899 Constrained gizmo-scaling -> Fixed grabbers offsets transformation for volumes 2019-05-13 09:02:33 +02:00
Enrico Turri 9a16af5251 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-13 08:30:30 +02:00
Enrico Turri e785709b91 Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-10 15:22:00 +02:00
Enrico Turri 6a0885002f Added Cancel button to the confirm delete all dialog to enable dismiss the dialog using esc key 2019-05-10 15:20:46 +02:00
Enrico Turri 11c7accabf Constrained gizmo-scaling -> small refactoring 2019-05-10 14:44:10 +02:00
Enrico Turri 38e8f345f5 Constrained gizmo-scaling -> fixed offset for uniform scale 2019-05-10 14:04:43 +02:00
Enrico Turri 3432218e8b Merge branch 'master' of https://github.com/prusa3d/Slic3r into et_copy_and_paste 2019-05-10 13:50:46 +02:00