Commit Graph

2134 Commits

Author SHA1 Message Date
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
YuSanka
7f8bb94a55 Fixed wxEVT_CHAR handling for DoubleSlider 2019-06-19 16:28:56 +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
tamasmeszaros
1e7b5c5a81 Merge branch 'tm_rotcalipers' 2019-06-19 13:11:18 +02:00
Enrico Turri
a3e6412113 Enabled perspective camera 2019-06-19 13:01:18 +02:00
tamasmeszaros
4a71c42f9b Merge branch 'master' into tm_rotcalipers 2019-06-19 11:07:21 +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
tamasmeszaros
78610de473 Fix build on vs2013
Fix 2 for vs2013
2019-06-19 10:18:51 +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
tamasmeszaros
b4ef812d32 Merge branch 'master' into tm_sla_printer_mirror 2019-06-18 17:42:10 +02:00
tamasmeszaros
18bbf493c1 Merge branch 'master' into tm_ui_jobs 2019-06-18 16:26:56 +02:00
tamasmeszaros
468516aa31 Apply fixes for the ui jobs.
- Localization
- Mutual exclusion (ExclusiveJobGroup), only one UI job can run at a time, and background processing is stopped
- m_range not used for finalization anymore
- stop_jobs called before Window is closed
2019-06-18 16:24:30 +02:00
Enrico Turri
b001eca21f #2528 - New project command automatically switches to 3D editor view 2019-06-18 14:45:10 +02:00
tamasmeszaros
d60ecb3788 Merge remote-tracking branch 'origin/master' into tm_ui_jobs 2019-06-18 12:16:24 +02:00
YuSanka
917702f252 Fixed DoubleSlider manipulation from Preview scene 2019-06-18 11:40:26 +02:00
bubnikv
0c95d4e0d9 Merge remote-tracking branch 'remotes/origin/ys_new_features' 2019-06-18 10:01:29 +02:00
bubnikv
a892fa6105 Merge remote-tracking branch 'remotes/origin/ys_bugfixing' 2019-06-18 09:57:55 +02:00
bubnikv
f72f55dc08 A bit of documentation of the mirroring and reset buttons at the side panel. 2019-06-18 09:57:07 +02:00
bubnikv
1cbd6845d5 Merge remote-tracking branch 'remotes/origin/lm_reset_buttons' 2019-06-18 09:33:33 +02:00
bubnikv
c95a324c3f Merge branch 'vb_admesh_fix' 2019-06-18 08:54:50 +02:00
bubnikv
630883ad0f Extended the error message when the G-code cannot be copied to the SD card 2019-06-18 08:54:28 +02:00
Enrico Turri
5ee695b629 #2506 - Fixed crash while manually editing SLA supports 2019-06-18 08:53:13 +02:00
YuSanka
90beadb65f Check a possibility to load SLA project if there is at least one multi-part object on the bed 2019-06-17 17:04:19 +02:00
YuSanka
f70b25d2f8 Fixed SPE 957 - Impossible to add a part by "Load..." to an object, if the object has some instances 2019-06-17 15:33:58 +02:00
YuSanka
72479428d7 Merge remote-tracking branch 'origin/master' into ys_bugfixing 2019-06-17 14:02:43 +02:00
YuSanka
7fe8965c53 Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-17 13:50:12 +02:00
YuSanka
5fd3cc2676 Select edited layer after changing instead of "Layers" selection, if editing was in "Layer" mode 2019-06-17 13:46:56 +02:00
YuSanka
f394f84d51 Fixed selection after layers deleting 2019-06-17 13:09:11 +02:00
tamasmeszaros
ce22251707 Warning hunt session followup 2019-06-17 10:05:46 +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
7b07a8da83 Reset buttons: synchronization of instances/volumes 2019-06-14 15:28:09 +02:00
Lukas Matena
980c6673d4 Reset buttons - fixed rotation of instances with multiple volumes
Mirroring buttons now hide where appropriate
2019-06-14 15:28:09 +02:00
Lukas Matena
a3c1644ead Added mirroring buttons into object manipulation panel 2019-06-14 15:03:42 +02:00
Lukas Matena
9f236bc603 Added transformation reset buttons in object manipulation panel 2019-06-14 15:03:42 +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
bubnikv
dbfa4e6c83 Fix of a smart pointer gymnastics from previous commit 2019-06-13 16:55:12 +02:00
YuSanka
7da9d2f66d Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-13 16:18:39 +02:00
YuSanka
86e7a07dd8 Fixed selection 2019-06-13 16:17:54 +02:00
YuSanka
4712c5bbdf DoubleSlider manipulation from preview scene 2019-06-13 16:10:33 +02:00
YuSanka
a9ee4ff4b5 Fixed object selection in right panel form the Scene by context menu 2019-06-13 15:35:10 +02:00
tamasmeszaros
821ca0e36a Build fix when boost is not in prefix/boost 2019-06-13 14:19:24 +02:00
YuSanka
e00774d2e2 Workarounds for selection under OSX and GTK 2019-06-13 13:00:46 +02:00
YuSanka
c9dd5f8786 Fixed updating of data for LayerEditors selection 2019-06-13 11:37:03 +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
YuSanka
1694204687 Added some logic to layers editor selection 2019-06-12 16:28:25 +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
bubnikv
0bb8ee149e Sharing TriangleMesh objects between the front end (UI) and back end
(background processing)
2019-06-11 17:08:47 +02:00
YuSanka
f0f608f247 Copy/paste Layers for OSX 2019-06-11 10:11:42 +02:00
bubnikv
0cb5b57c5c SLA gimzmo: Sharing the Mesh's indexed triangle set with IGL AABB
structure directly, without having to make a copy.
2019-06-10 22:43:21 +02:00
bubnikv
313ec7424a admesh refactoring: replaced various diagnostics outputs with boost::log 2019-06-10 19:45:38 +02:00
bubnikv
6defabea53 admesh refactoring: separation of the shared vertices / indices
into an indexed_triangle_set structure
2019-06-10 18:30:54 +02:00
YuSanka
72046598a9 Fixed OSX build 2019-06-10 15:49:41 +02:00
YuSanka
8ba447e97f Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-10 15:24:17 +02:00
YuSanka
2b6e5a0a70 Implemented Copy/Paste for Layers.
+ improved selection (in respect to the Layers)
2019-06-10 15:22:09 +02:00
Enrico Turri
c7ba8c4daa Fixed conflicts after cherry-picking 932e54383d28acbc96f0af6c38c838f2bb23f21d 2019-06-10 11:57:42 +02:00
YuSanka
2fa87044be Implemented update_object_list_by_printer_technology() 2019-06-10 10:48:43 +02:00
YuSanka
446e37b151 Implemented extruder selection for Layers 2019-06-07 11:32:46 +02:00
YuSanka
71cc0fdb53 Some code refactoring and improvements 2019-06-06 15:56:42 +02:00
tamasmeszaros
d4fe7b5a96 Adding rotating calipers algorithm for minimum are bounding box rotation.
Cleanup, fix build on windows and add test for rotcalipers.

Try to fix compilation on windows

With updates from libnest2d
Another build fix.


Clean up and add comments.


adding rotcalipers test  and some cleanup


Trying to fix on OSX


Fix rotcalipers array indexing


Get rid of boost convex hull.


Adding helper function 'remove_collinear_points'


Importing new libnest2d upgrades.


Disable using __int128 in NFP on OSX
2019-06-06 14:27:07 +02:00
YuSanka
44c05fa209 Implemented additional settings for layers range (except of "extruder") 2019-06-05 16:47:09 +02:00
tamasmeszaros
97cbb5344e Merge branch 'master' into tm_sla_printer_mirror 2019-06-05 15:10:02 +02:00
YuSanka
67ed89c240 Fixed OSX build and a bug when for part is able to add "layer_height" option 2019-06-05 13:52:53 +02:00
YuSanka
401999b68b Next try to fix OSX build 2019-06-05 12:32:59 +02:00
YuSanka
1090105b68 Experiments with updating layer_config_ranges from UI
+ Fixed OSX build
2019-06-05 11:50:59 +02:00
YuSanka
4b3df010ab Merge remote-tracking branch 'origin/master' into ys_new_features 2019-06-05 11:16:25 +02:00
YuSanka
567f382938 Implemented focusing of the last edited range 2019-06-05 11:14:57 +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
bubnikv
8da54139c4 WIP: Admesh - replacement of C memory allocation with std vectors 2019-06-04 22:06:42 +02:00
YuSanka
213635f559 Implemented range's min/max Z editing 2019-06-04 17:30:44 +02:00
YuSanka
4756961678 Added LayerRangeEditor class for universally editing of the layer_range's parameters
+ Implemented layer_height editing
2019-06-04 15:22:29 +02:00
YuSanka
79a89c4c8f Some code review for avoid use of OptionsGroup 2019-06-04 11:56:59 +02:00
Vojtech Kral
3c8024bddd BonjourDialog: Fix dialog flags 2019-06-03 17:41:02 +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
YuSanka
51b18fddeb Changed data types 2019-06-03 15:35:21 +02:00
YuSanka
0ee0b546df Fixed a bug with a "gear" button near the filament preset (part of #2440) 2019-06-03 14:59:16 +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
e6af0d3dc4 Temporary low-res texture shown while generating compressed data on the CPU 2019-06-02 11:01:51 +02:00
YuSanka
e09207e27e Fixed OSX and Linux build 2019-05-31 15:36:38 +02:00
YuSanka
5f4b7a5292 ObjectLayers::add_layer_range() -> add a layers range using "Add" button from ObjectLayers sizer 2019-05-31 15:29:09 +02:00
Enrico Turri
f0baefb6ff Asynchronous texture compression on CPU 2019-05-31 15:25:02 +02:00
YuSanka
38641ef578 ObjectLayers::del_layer_range() -> delete a layers range using "Del" button from ObjectLayers sizer 2019-05-31 10:54:52 +02:00
YuSanka
e531d224e8 Implemented delete_layers_from_object() 2019-05-30 16:53:17 +02:00
YuSanka
a516f76f94 Improved layer sizer
+ fixed build under OSX and Linux
2019-05-30 14:42:38 +02:00
YuSanka
b5d7909afb Merge remote-tracking branch 'origin/master' into ys_new_features 2019-05-30 12:53:21 +02:00
YuSanka
bf56d79354 Layers sizer updating 2019-05-30 12:41:16 +02:00
YuSanka
765d4264ae Implemented ObjectLayers class
+ some code refactoring
2019-05-28 16:38:04 +02:00
Enrico Turri
8012499206 Application of anisotropy to textures moved into GLTexture methods 2019-05-28 15:21:34 +02:00