117 Commits

Author SHA1 Message Date
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
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
Jack Ha
47e204038f Got cylinders 2016-12-21 15:44:01 +01:00
Jack Ha
0adb1a4c1c Finally got normals in 2016-12-21 14:37:02 +01:00
Jack Ha
9e6c070ac6 tryout 2016-12-21 09:21:05 +01:00
Jack Ha
3d9bccb7c7 big tryout 2016-12-20 16:32:34 +01:00
Jack Ha
57cec4ec59 wip 2016-12-20 14:00:34 +01:00
Jack Ha
61dcaf8811 wip 2016-12-20 11:45:05 +01:00
Jaime van Kessel
9f13338c17 Codestyle 2016-12-06 14:28:25 +01:00
fieldOfView
1895cd7062 Fix layerview shade for single extrusion printers
CURA-2025
2016-09-22 17:16:08 +02:00
Jaime van Kessel
89c78fa2da Increased difference between display color for active/inactive extruder
CURA-2025
2016-09-22 11:41:52 +02:00
fieldOfView
9300489796 Shade layerview elements printed with non-active extruder(s)
CURA-2025
2016-09-21 21:21:20 +02:00
fieldOfView
4911eaed00 Fix merge mistakes
CURA-2299
2016-09-19 18:30:23 +02:00
fieldOfView
087ad6f472 Move layerdata and busy handling back into LayerView
This reverts commits 17b12b904809cae093aa59cfdd2e5958978eb6e0 and 66f8a62e6c1cf376ab6fb089a8d4911fc311e4b0.

# Conflicts:
#	plugins/LayerView/LayerPass.py
#	plugins/LayerView/LayerView.py
2016-09-19 17:59:24 +02:00
fieldOfView
155fe326b7 Remove unnecessary bools
CURA-2199
2016-09-19 17:17:03 +02:00
fieldOfView
b05caa8bdc Remove unused uniforms from composite shaders
CURA-2299
2016-09-19 17:15:22 +02:00
fieldOfView
7bca6a648a Merge branch 'feature_layerview_ghosts' into ghosts
# Conflicts:
#	plugins/LayerView/LayerView.py
2016-09-19 16:43:17 +02:00
fieldOfView
72b4442320 Show warning in layerview that wireprint display is not accurate
CURA-2288
2016-09-14 08:50:46 +02:00
fieldOfView
c43b277901 Fixed double import
3rd time lucky?
2016-09-13 11:53:46 +02:00
fieldOfView
d907bfb5e3 Fixed copy/paste error 2016-09-13 11:52:18 +02:00
fieldOfView
ebd9332823 Fix imports 2016-09-13 11:49:27 +02:00
fieldOfView
f527da2f3c Add message to layerview about incompatibility with wireprinting
The message is not currently shown yet, but added before the string freeze. CURA-2288
2016-09-13 11:01:26 +02:00
Ghostkeeper
0794f9f31c Fix grammar in documentation
Contributes to issue CURA-1601.
2016-09-07 14:02:03 +02:00
Ghostkeeper
6c258e2214 Update copyright notice
Today we live in 2016.

Contributes to issue CURA-1601.
2016-09-07 14:02:02 +02:00
fieldOfView
26a6df4c4d Fix indentation
CURA-1601
2016-09-07 14:02:01 +02:00
fieldOfView
5d9e1c2458 Improve depth sorting on layers
CURA-1601
2016-09-07 14:02:01 +02:00
fieldOfView
f1b81dfad0 Code style
CURA-1601
2016-09-07 14:02:00 +02:00
fieldOfView
4e3f4162c2 Make background color a uniform
CURA-1601
2016-09-07 14:02:00 +02:00
fieldOfView
66f8a62e6c Move busy handling into LayerPass and cleanup
CURA-1601
2016-09-07 14:01:59 +02:00
fieldOfView
17b12b9048 Move layer data into LayerPass for cleaner access
CURA-1601
2016-09-07 14:01:58 +02:00
fieldOfView
2c35f0196d Code cleanup
CURA-1601
2016-09-07 14:01:10 +02:00
fieldOfView
b090eab221 Use renderpass to render layers above ghosts
CURA-1601
2016-09-07 14:01:09 +02:00
fieldOfView
90a1f5f8ed Revert "Revert "Show "ghosts" for all objects on the buildplate in layerview""
This reverts commit 0f9b989ae86fa319269a715d960b533f2a51c09d.
2016-09-07 14:01:09 +02:00
fieldOfView
aa689dc2fb Fix layerview for grouped objects
The "ghosts" would be rendered over grouped objects, thereby making them not visible. Note that this quick fix comes at the price of slightly "muddying" all the layerview colors. A better fix was proposed here (but it is not yet working correctly): https://github.com/Ultimaker/Cura/pull/906

CURA-2246
2016-09-01 13:34:18 +02:00
fieldOfView
46ee6c0713 Show "ghosts" for all objects on the buildplate in layerview
Simpler implementation that works.
CURA-1601
2016-08-30 13:27:19 +02:00
fieldOfView
0f9b989ae8 Revert "Show "ghosts" for all objects on the buildplate in layerview"
This reverts commit b765855ba5d3bb96d7113e485e34c4e8b8f3cd49.
2016-08-02 12:30:22 +02:00
fieldOfView
b765855ba5 Show "ghosts" for all objects on the buildplate in layerview
CURA-1601
2016-08-01 17:33:00 +02:00
Jaime van Kessel
102a0793e6 Codestyle & documentation 2016-07-29 17:38:35 +02:00
Jaime van Kessel
b9a1d50e05 Added option to only display top layers in layerview 2016-07-29 13:17:41 +02:00
Jaime van Kessel
8d59d7187f Deleting old toplayer data is now only done when new data is complete.
This prevents the pretty annoying blinking behavior that we had before
2016-07-29 13:01:03 +02:00
Jaime van Kessel
76723c2412 Removed 50 ms delay in staring top layer calculation 2016-07-26 09:55:04 +02:00
Johan K
bbd49cee85 Merge branch 'master' of https://github.com/Ultimaker/Cura into layerview_dev 2016-07-12 00:37:27 +02:00
Jack Ha
0745b3bbf5 Unbreak LayerView.
CURA-1381
2016-07-11 10:29:21 +02:00
Jack Ha
6374eee7b4 Fix LayerView cursor issue.
CURA-1381
2016-07-07 16:55:56 +02:00