3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 06:57:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge branch '15.06' of https://github.com/Ultimaker/Cura into 15.06

Browse source 
Conflicts:
	plugins/LayerView/LayerView.py
This commit is contained in:
Jaime van Kessel 2015-06-05 17:43:34 +02:00
commit 66e50ceb37
4 changed files with 27 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/LayerView/LayerView.py
View file

@ -8,6 +8,8 @@ from UM.Resources import Resources
from UM.Event import Event, KeyEvent
from UM.Signal import Signal
from . import LayerViewProxy
from UM.Scene.Selection import Selection
from UM.Math.Color import Color
## View used to display g-code paths.
class LayerView(View):
@ -34,17 +36,20 @@ class LayerView(View):
scene = self.getController().getScene()
renderer = self.getRenderer()
renderer.setRenderSelection(False)
## Recalculate num max layers
#self.calculateMaxLayers()
if not self._material:
self._material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "vertexcolor.frag"))
self._material.setUniformValue("u_color", [1.0, 0.0, 0.0, 1.0])
self._selection_material = renderer.createMaterial(Resources.getPath(Resources.ShadersLocation, "basic.vert"), Resources.getPath(Resources.ShadersLocation, "color.frag"))
self._selection_material.setUniformValue("u_color", Color(35, 35, 35, 128))
for node in DepthFirstIterator(scene.getRoot()):
if not node.render(renderer):
if node.getMeshData() and node.isVisible():
if Selection.isSelected(node):
renderer.queueNode(node, material = self._selection_material, transparent = True)
try:
layer_data = node.getMeshData().layerData
except AttributeError: