3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Added line thickness to layer view

Browse source
This commit is contained in:
Jack Ha 2016-12-28 11:30:59 +01:00
parent c12e6da3ac
commit 9904dad07b
5 changed files with 24 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

10
plugins/CuraEngineBackend/ProcessSlicedLayersJob.py
View file

@ -146,12 +146,12 @@ class ProcessSlicedLayersJob(Job):
# We are done processing all the layers we got from the engine, now create a mesh out of the data
layer_mesh = layer_data.build()
# Hack for adding line widths and heights: misuse u, v coordinates.
uvs = numpy.zeros([layer_mesh.getVertexCount(), 2], dtype=numpy.float32)
uvs[:, 0] = 0.175
uvs[:, 1] = 0.125
#uvs = numpy.zeros([layer_mesh.getVertexCount(), 2], dtype=numpy.float32)
#uvs[:, 0] = 0.175
#uvs[:, 1] = 0.125
from UM.Math import NumPyUtil
layer_mesh._uvs = NumPyUtil.immutableNDArray(uvs)
#from UM.Math import NumPyUtil
#layer_mesh._uvs = NumPyUtil.immutableNDArray(uvs)
# mesh._uvs = numpy.zeros([layer_mesh.getVertexCount(), 2])
# mesh._uvs[:, 0] = 1.0 # width
# mesh._uvs[:, 1] = 0.1 # height

8
plugins/LayerView/layers.shader
View file

@ -24,7 +24,9 @@ vertex =
void main()
{
vec4 world_space_vert = u_modelMatrix * a_vertex;
vec4 v1_vertex = a_vertex;
v1_vertex.y -= a_uvs.y / 2; // half layer down
vec4 world_space_vert = u_modelMatrix * v1_vertex;
// gl_Position = u_viewProjectionMatrix * world_space_vert;
gl_Position = world_space_vert;
// gl_Position = u_modelViewProjectionMatrix * a_vertex;
@ -75,8 +77,8 @@ geometry =
vec3 g_vertex_normal_horz_head;
vec4 g_vertex_offset_horz_head;
float size_x = v_uvs[0].x;
float size_y = v_uvs[0].y;
float size_x = v_uvs[0].x / 2 + 0.01; // radius, and make it nicely overlapping
float size_y = v_uvs[0].y / 2 + 0.01;
//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;