159 Commits

Author	SHA1	Message	Date
Jack Ha	0d444298bc	Added myEmitVertex function in layers3d.shader. CURA-3273	2017-02-08 13:29:24 +01:00
Jack Ha	8e80593232	Added comment. CURA-3273	2017-02-08 13:03:48 +01:00
Jack Ha	cc950732b6	Added comment. CURA-3273	2017-02-08 11:57:59 +01:00
Jack Ha	47ab49795f	Added comments, changed small layout and id thing. CURA-3273	2017-02-08 11:48:00 +01:00
Jack Ha	6c19bc1c16	Only show legend in color: line_type	2017-02-08 11:08:59 +01:00
Arjen Hiemstra	74bef2ff95	Fix OpenGL 2.0 fallback shader for Layer View	2017-02-07 17:34:02 +01:00
Jack Ha	4057996e23	Made layers.shader compatibility shader compatible. CURA-3273	2017-02-07 14:28:22 +01:00
Jack Ha	4b02a425d8	Let Layer View compatibility mode depend on OpenGL version we asked for (may be different than actual). CURA-3273	2017-02-07 11:55:51 +01:00
Jack Ha	1d77864915	Added force layer view compatibility mode. CURA-3273	2017-02-07 09:36:21 +01:00
Jack Ha	7c964045db	Removed unused line in shader. CURA-3273	2017-02-06 13:16:47 +01:00
Jack Ha	0889722350	Finishing up opengl 4.1 core profile things, it all works. CURA-3273	2017-02-02 17:08:20 +01:00
Jack Ha	4659d8616e	Fixed some opengl 4.1 core vertex and fragment shaders, layerview anchor. CURA-3273	2017-02-01 16:29:21 +01:00
Jack Ha	4bb8e1b025	Converted layers3d.shader to 41core spec. Contributes to CURA-3273	2017-02-01 16:10:52 +01:00
Jack Ha	aa923321f8	Fix compatibility mode layout. CURA-3273	2017-01-31 09:19:18 +01:00
Jack Ha	5a2aa8846b	Added extruder count detection to layer view. CURA-3273	2017-01-30 13:29:35 +01:00
Jack Ha	5f6ed488d1	Layerview removed Color Only Selected Extruder, cleanup 3d shader. CURA-3273	2017-01-30 11:39:59 +01:00
Jack Ha	2f9618f2ad	Merge branch 'master' into layer_view3_cleanup	2017-01-30 11:25:55 +01:00
fieldOfView	bf3d3d46e2	Fix Rectangles that always show as white regardless of the theme	2017-01-25 15:12:57 +01:00
Jack Ha	3a2438937d	Removed crappy legend	2017-01-25 12:46:07 +01:00
fieldOfView	878ccc679c	Add a legend to Layer View	2017-01-24 23:24:52 +01:00
Jack Ha	e21a6ed62a	Cleanup	2017-01-24 16:52:47 +01:00
Jack Ha	f80a04cbc3	Auto detect compatibility mode for layer view.	2017-01-24 16:31:57 +01:00
fieldOfView	45c8083423	Use themeable colors in Solid, Xray & Layer view	2017-01-23 22:08:27 +01:00
Jack Ha	abe7a8e9a3	Merge branch 'master' into layer_view3_cleanup	2017-01-17 15:16:50 +01:00
Simon Edwards	16a748e0d6	Merge pull request #1326 from Ultimaker/big_flame_graph ... Support for the Big Flame Graph profiler	2017-01-12 14:25:18 +01:00
Simon Edwards	a5181f157e	Applied the profiler's pyqtSlot decorator to all of the code.	2017-01-10 13:35:39 +01:00
Jack Ha	cd8eaf7759	minimum layer slider now works	2017-01-03 15:58:35 +01:00
Jack Ha	55dd08eff8	Somewhat better layout, added legend	2017-01-03 09:18:26 +01:00
Jack Ha	f0e0d65635	Finishing up compatibility mode	2017-01-02 14:56:31 +01:00
Jack Ha	93137fcc91	Added compatibility mode - old layer view is now also available	2017-01-02 12:56:18 +01:00
Jack Ha	73a8859b0e	WIP second slider LayerView	2017-01-02 09:20:27 +01:00
Jack Ha	e3d77de6df	Working quite well	2016-12-30 15:43:32 +01:00
Jack Ha	6271774528	Added all kinds of options to layer view	2016-12-30 15:32:06 +01:00
Jack Ha	fc4c60b0dc	Added layer view options	2016-12-30 14:31:53 +01:00
Jack Ha	1217281727	Busy with layer_view options	2016-12-29 16:49:00 +01:00
Jack Ha	0f2fb86cd9	Layer shader now uses own attribute for line dimensions instead of misusing uvs.	2016-12-28 15:20:14 +01:00
Jack Ha	9904dad07b	Added line thickness to layer view	2016-12-28 11:30:59 +01:00
Victor Larchenko	67ab0cab41	D6: Changed decorator and swapping to LayerView	2016-12-23 15:53:17 -05:00
Victor Larchenko	647c2f15ba	D6: Changed Decorator	2016-12-23 15:53:17 -05:00
Victor Larchenko	4aa59950ca	D5: Added decorator	2016-12-23 15:53:16 -05:00
Victor Larchenko	ce9251b5a6	T466: Fixed show only top layers bug	2016-12-23 15:53:16 -05:00
Victor Larchenko	b24d5ef12b	T466: Ignoring top layers option for gcode files	2016-12-23 15:53:15 -05:00
Victor Larchenko	8987aa2048	T466: Revert the previous commit since it messed up the file rights.	2016-12-23 15:53:15 -05:00
Victor Larchenko	64d7bb0c2a	T466: Added ability to print loaded gcode	2016-12-23 15:53:14 -05:00
Victor Larchenko	333e501268	T466: Removed cube, Changed label, Added clearing of scene	2016-12-23 15:53:13 -05:00
Victor Larchenko	8aa3b1b38c	T466: Added basic file loading and parsing	2016-12-23 15:53:12 -05:00
Victor Larchenko	65f3495a29	T466: Added pausing of backend work	2016-12-23 15:53:12 -05:00
Victor Larchenko	b9514527dd	T466: Added test line	2016-12-23 15:53:12 -05:00
Jack Ha	c12e6da3ac	Started setting layer height and line width in layer view	2016-12-22 14:41:50 +01:00
Jack Ha	c6d56b60f6	Working quite nicely	2016-12-22 09:44:00 +01:00