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