3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Added layer view options

Browse source
This commit is contained in:
Jack Ha 2016-12-30 14:31:53 +01:00
parent 1217281727
commit fc4c60b0dc
9 changed files with 143 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

28
plugins/LayerView/LayerPass.py
View file

@ -30,16 +30,24 @@ class LayerPass(RenderPass):
self._layer_view = None
def setLayerView(self, layerview):
self._layerview = layerview
self._layer_view = layerview
def render(self):
if not self._layer_shader:
self._layer_shader = OpenGL.getInstance().createShaderProgram(os.path.join(PluginRegistry.getInstance().getPluginPath("LayerView"), "layers.shader"))
# Use extruder 0 if the extruder manager reports extruder index -1 (for single extrusion printers)
self._layer_shader.setUniformValue("u_active_extruder", float(max(0, self._extruder_manager.activeExtruderIndex)))
self._layer_shader.setUniformValue("u_layer_view_type", 0)
self._layer_shader.setUniformValue("u_only_color_active_extruder", 1)
self._layer_shader.setUniformValue("u_extruder_opacity", [1, 1, 1, 1])
if self._layer_view:
self._layer_shader.setUniformValue("u_layer_view_type", self._layer_view.getLayerViewType())
self._layer_shader.setUniformValue("u_only_color_active_extruder", (1 if self._layer_view.getOnlyColorActiveExtruder() else 0))
self._layer_shader.setUniformValue("u_extruder_opacity", self._layer_view.getExtruderOpacities())
self._layer_shader.setUniformValue("u_show_travel_moves", self._layer_view.getShowTravelMoves())
else:
#defaults
self._layer_shader.setUniformValue("u_layer_view_type", 1)
self._layer_shader.setUniformValue("u_only_color_active_extruder", 1)
self._layer_shader.setUniformValue("u_extruder_opacity", [1, 1, 1, 1])
self._layer_shader.setUniformValue("u_show_travel_moves", 0)
if not self._tool_handle_shader:
self._tool_handle_shader = OpenGL.getInstance().createShaderProgram(Resources.getPath(Resources.Shaders, "toolhandle.shader"))
@ -58,12 +66,12 @@ class LayerPass(RenderPass):
continue
# Render all layers below a certain number as line mesh instead of vertices.
if self._layerview._current_layer_num > -1 and not self._layerview._only_show_top_layers:
if self._layer_view._current_layer_num > -1 and not self._layer_view._only_show_top_layers:
start = 0
end = 0
element_counts = layer_data.getElementCounts()
for layer, counts in element_counts.items():
if layer > self._layerview._current_layer_num:
if layer > self._layer_view._current_layer_num:
break
end += counts
@ -75,11 +83,11 @@ class LayerPass(RenderPass):
# Create a new batch that is not range-limited
batch = RenderBatch(self._layer_shader, type = RenderBatch.RenderType.Solid)
if self._layerview._current_layer_mesh:
batch.addItem(node.getWorldTransformation(), self._layerview._current_layer_mesh)
if self._layer_view._current_layer_mesh:
batch.addItem(node.getWorldTransformation(), self._layer_view._current_layer_mesh)
if self._layerview._current_layer_jumps:
batch.addItem(node.getWorldTransformation(), self._layerview._current_layer_jumps)
if self._layer_view._current_layer_jumps:
batch.addItem(node.getWorldTransformation(), self._layer_view._current_layer_jumps)
if len(batch.items) > 0:
batch.render(self._scene.getActiveCamera())

34
plugins/LayerView/LayerView.py
View file

@ -60,8 +60,14 @@ class LayerView(View):
self._proxy = LayerViewProxy.LayerViewProxy()
self._controller.getScene().getRoot().childrenChanged.connect(self._onSceneChanged)
self._layer_view_type = 0 # 0 is material color, 1 is color by linetype, 2 is speed
self._only_color_active_extruder = True
self._extruder_opacity = [1.0, 1.0, 1.0, 1.0]
self._show_travel_moves = 0
Preferences.getInstance().addPreference("view/top_layer_count", 5)
Preferences.getInstance().addPreference("view/only_show_top_layers", False)
Preferences.getInstance().preferenceChanged.connect(self._onPreferencesChanged)
self._solid_layers = int(Preferences.getInstance().getValue("view/top_layer_count"))
@ -134,6 +140,34 @@ class LayerView(View):
self.currentLayerNumChanged.emit()
def setLayerViewType(self, layer_view_type):
self._layer_view_type = layer_view_type
self.currentLayerNumChanged.emit()
def getLayerViewType(self):
return self._layer_view_type
def setOnlyColorActiveExtruder(self, only_color_active_extruder):
self._only_color_active_extruder = only_color_active_extruder
self.currentLayerNumChanged.emit()
def getOnlyColorActiveExtruder(self):
return self._only_color_active_extruder
def setExtruderOpacity(self, extruder_nr, opacity):
self._extruder_opacity[extruder_nr] = opacity
self.currentLayerNumChanged.emit()
def getExtruderOpacities(self):
return self._extruder_opacity
def setShowTravelMoves(self, show):
self._show_travel_moves = show
self.currentLayerNumChanged.emit()
def getShowTravelMoves(self):
return self._show_travel_moves
def calculateMaxLayers(self):
scene = self.getController().getScene()
self._activity = True

18
plugins/LayerView/LayerView.qml
View file

@ -129,12 +129,12 @@ Item
{
id: layerViewTypes
ListElement {
text: "Line type"
type_id: 0 // these ids match the switching in the shader
text: "Material color"
type_id: 0
}
ListElement {
text: "Material color"
type_id: 1
text: "Line type"
type_id: 1 // these ids match the switching in the shader
}
ListElement {
text: "Printing speed"
@ -150,6 +150,7 @@ Item
onActivated: {
CuraApplication.log("Combobox" + String(index));
CuraApplication.log(layerViewTypes.get(index).type_id);
UM.LayerView.setLayerViewType(layerViewTypes.get(index).type_id);
}
}
@ -158,27 +159,28 @@ Item
CheckBox {
checked: true
onClicked: {
CuraApplication.log("First");
UM.LayerView.setExtruderOpacity(0, checked ? 1.0 : 0.0);
}
text: "Extruder 1"
}
CheckBox {
checked: true
onClicked: {
CuraApplication.log("First");
UM.LayerView.setExtruderOpacity(1, checked ? 1.0 : 0.0);
}
text: "Extruder 2"
}
CheckBox {
onClicked: {
CuraApplication.log("First");
UM.LayerView.setShowTravelMoves(checked ? 1 : 0);
}
text: "Travel moves"
}
CheckBox {
checked: true
onClicked: {
CuraApplication.log("First");
CuraApplication.log("First" + checked);
UM.LayerView.setOnlyColorActiveExtruder(checked);
}
text: "Only color active extruder"
}

25
plugins/LayerView/LayerViewProxy.py
View file

@ -50,6 +50,31 @@ class LayerViewProxy(QObject):
if type(active_view) == LayerView.LayerView.LayerView:
active_view.setLayer(layer_num)
@pyqtSlot(int)
def setLayerViewType(self, layer_view_type):
active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView:
active_view.setLayerViewType(layer_view_type)
@pyqtSlot(bool)
def setOnlyColorActiveExtruder(self, only_color_active_extruder):
active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView:
active_view.setOnlyColorActiveExtruder(only_color_active_extruder)
# Opacity 0..1
@pyqtSlot(int, float)
def setExtruderOpacity(self, extruder_nr, opacity):
active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView:
active_view.setExtruderOpacity(extruder_nr, opacity)
@pyqtSlot(bool)
def setShowTravelMoves(self, show):
active_view = self._controller.getActiveView()
if type(active_view) == LayerView.LayerView.LayerView:
active_view.setShowTravelMoves(show)
def _layerActivityChanged(self):
self.activityChanged.emit()

59
plugins/LayerView/layers.shader
View file

@ -17,6 +17,7 @@ vertex =
attribute highp vec4 a_normal;
attribute highp vec2 a_line_dim; // line width and thickness
attribute highp int a_extruder;
attribute highp int a_line_type;
varying lowp vec4 v_color;
//varying lowp vec4 v_material_color;
@ -26,6 +27,7 @@ vertex =
//varying lowp vec2 v_uvs;
varying lowp vec2 v_line_dim;
varying highp int v_extruder;
varying int v_line_type;
varying lowp vec4 f_color;
varying highp vec3 f_vertex;
@ -44,19 +46,19 @@ vertex =
switch (u_layer_view_type) {
case 0: // "Line type"
v_color = a_color;
v_color = a_material_color;
break;
case 1: // "Material color"
v_color = a_material_color;
v_color = a_color;
break;
case 2: // "Speed"
v_color = a_color;
break;
}
if (u_only_color_active_extruder == 1) {
v_color = (a_extruder == u_active_extruder) ? v_color : vec4(0.4, 0.4, 0.4, 1.0);
v_color = (a_extruder == u_active_extruder) ? v_color : vec4(0.4, 0.4, 0.4, v_color.a);
} else {
v_color = (a_extruder == u_active_extruder) ? v_color : v_color * u_shade_factor;
v_color = (a_extruder == u_active_extruder) ? v_color : vec4((v_color * u_shade_factor).rgb, v_color.a);
}
if (a_extruder < 4) {
v_color.a *= u_extruder_opacity[a_extruder]; // make it (in)visible
@ -66,19 +68,20 @@ vertex =
v_normal = (u_normalMatrix * normalize(a_normal)).xyz;
v_line_dim = a_line_dim;
v_extruder = a_extruder;
//v_material_color = a_material_color;
v_line_type = a_line_type;
// for testing without geometry shader
f_color = v_color;
/*f_color = v_color;
f_vertex = v_vertex;
f_normal = v_normal;
f_extruder = v_extruder;
f_extruder = v_extruder; */
}
geometry =
#version 410
uniform highp mat4 u_viewProjectionMatrix;
uniform int u_show_travel_moves;
layout(lines) in;
layout(triangle_strip, max_vertices = 26) out;
@ -88,7 +91,7 @@ geometry =
in vec3 v_normal[];
in vec2 v_line_dim[];
in int v_extruder[];
//in vec4 v_material_color[];
in int v_line_type[];
out vec4 f_color;
out vec3 f_normal;
@ -106,13 +109,24 @@ geometry =
vec3 g_vertex_normal_horz_head;
vec4 g_vertex_offset_horz_head;
float size_x = v_line_dim[0].x / 2 + 0.01; // radius, and make it nicely overlapping
float size_y = v_line_dim[0].y / 2 + 0.01;
float size_x;
float size_y;
// See LayerPolygon; 8 is MoveCombingType, 9 is RetractionType
if (((v_line_type[0] == 8) || (v_line_type[0] == 9)) && (u_show_travel_moves == 0)) {
return;
}
if ((v_line_type[0] == 8) || (v_line_type[0] == 9)) {
// fixed size for movements
size_x = 0.1;
size_y = 0.1;
} else {
size_x = v_line_dim[0].x / 2 + 0.01; // radius, and make it nicely overlapping
size_y = v_line_dim[0].y / 2 + 0.01;
}
f_extruder = v_extruder[0];
//f_material_color = v_material_color[0];
//g_vertex_normal_horz = normalize(v_normal[0]); //vec3(g_vertex_delta.z, g_vertex_delta.y, -g_vertex_delta.x);
g_vertex_delta = gl_in[1].gl_Position - gl_in[0].gl_Position;
g_vertex_normal_horz_head = normalize(vec3(-g_vertex_delta.x, -g_vertex_delta.y, -g_vertex_delta.z));
g_vertex_offset_horz_head = vec4(g_vertex_normal_horz_head * size_x, 0.0);
@ -125,28 +139,24 @@ geometry =
f_vertex = v_vertex[0];
f_color = v_color[0];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
f_normal = g_vertex_normal_horz;
gl_Position = u_viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_horz);
EmitVertex();
f_vertex = v_vertex[1];
f_color = v_color[1];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
f_normal = g_vertex_normal_horz;
gl_Position = u_viewProjectionMatrix * (gl_in[1].gl_Position + g_vertex_offset_horz);
EmitVertex();
f_vertex = v_vertex[0];
f_color = v_color[0];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
f_normal = g_vertex_normal_vert;
gl_Position = u_viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_vert);
EmitVertex();
f_vertex = v_vertex[1];
f_color = v_color[1];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
f_normal = g_vertex_normal_vert;
gl_Position = u_viewProjectionMatrix * (gl_in[1].gl_Position + g_vertex_offset_vert);
EmitVertex();
@ -154,27 +164,23 @@ geometry =
f_vertex = v_vertex[0];
f_normal = -g_vertex_normal_horz;
f_color = v_color[0];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
gl_Position = u_viewProjectionMatrix * (gl_in[0].gl_Position - g_vertex_offset_horz);
EmitVertex();
f_vertex = v_vertex[1];
f_color = v_color[1];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
f_normal = -g_vertex_normal_horz;
gl_Position = u_viewProjectionMatrix * (gl_in[1].gl_Position - g_vertex_offset_horz);
EmitVertex();
f_vertex = v_vertex[0];
f_color = v_color[0];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
f_normal = -g_vertex_normal_vert;
gl_Position = u_viewProjectionMatrix * (gl_in[0].gl_Position - g_vertex_offset_vert);
EmitVertex();
f_vertex = v_vertex[1];
f_color = v_color[1];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
f_normal = -g_vertex_normal_vert;
gl_Position = u_viewProjectionMatrix * (gl_in[1].gl_Position - g_vertex_offset_vert);
EmitVertex();
@ -182,13 +188,11 @@ geometry =
f_vertex = v_vertex[0];
f_normal = g_vertex_normal_horz;
f_color = v_color[0];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
gl_Position = u_viewProjectionMatrix * (gl_in[0].gl_Position + g_vertex_offset_horz);
EmitVertex();
f_vertex = v_vertex[1];
f_color = v_color[1];
//f_color = vec4(v_uvs[0], 0.0, 1.0);
f_normal = g_vertex_normal_horz;
gl_Position = u_viewProjectionMatrix * (gl_in[1].gl_Position + g_vertex_offset_horz);
EmitVertex();
@ -289,8 +293,9 @@ fragment =
void main()
{
mediump vec4 finalColor = vec4(0.0);
float alpha = f_color.a;
finalColor += u_ambientColor;
finalColor.rgb += f_color.rgb * 0.3;
highp vec3 normal = normalize(f_normal);
highp vec3 lightDir = normalize(u_lightPosition - f_vertex);
@ -298,8 +303,7 @@ fragment =
// Diffuse Component
highp float NdotL = clamp(dot(normal, lightDir), 0.0, 1.0);
finalColor += (NdotL * f_color);
//finalColor += (NdotL * f_material_color);
//finalColor.a = 1.0;
finalColor.a = alpha; // Do not change alpha in any way
gl_FragColor = finalColor;
}
@ -313,10 +317,12 @@ u_extruder_opacity = [1.0, 1.0]
u_shade_factor = 0.60
u_specularColor = [0.4, 0.4, 0.4, 1.0]
u_ambientColor = [0.3, 0.3, 0.3, 0.3]
u_ambientColor = [0.3, 0.3, 0.3, 0.0]
u_diffuseColor = [1.0, 0.79, 0.14, 1.0]
u_shininess = 20.0
u_show_travel_moves = 0
[bindings]
u_modelViewProjectionMatrix = model_view_projection_matrix
u_modelMatrix = model_matrix
@ -331,3 +337,4 @@ a_normal = normal
a_line_dim = line_dim
a_extruder = extruders
a_material_color = material_color
a_line_type = line_type