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

Code cleanup

Browse source 
Changed to "is None" insted of "== None" to test if numpy.array was initialized
Added extruder to PathSegment in Cura.proto
Changed index_pattern to class variable in Layer.py
This commit is contained in:
Johan K 2016-07-12 01:32:46 +02:00
parent bbd49cee85
commit d31516bbb1
3 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/Layer.py
View file

@ -67,9 +67,11 @@ class Layer:
def createJumps(self):
return self.createMeshOrJumps(False)
# Defines the two triplets of local point indices to use to draw the two faces for each line segment in createMeshOrJump
__index_pattern = numpy.array([[0, 3, 2, 0, 1, 3]], dtype = numpy.int32 )
def createMeshOrJumps(self, make_mesh):
builder = MeshBuilder()
index_pattern = numpy.array([[0, 3, 2, 0, 1, 3]], dtype = numpy.int32 )
line_count = 0
if make_mesh:
@ -106,8 +108,8 @@ class Layer:
# Create 4 points to draw each line segment, points +- normals results in 2 points each. Reshape to one point per line
f_points = numpy.concatenate((points-normals, points+normals), 1).reshape((-1, 3))
# index_pattern defines which points to use to draw the two faces for each lines egment, the following linesegment is offset by 4
f_indices = ( index_pattern + numpy.arange(0, 4 * len(normals), 4, dtype=numpy.int32).reshape((-1, 1)) ).reshape((-1, 3))
# __index_pattern defines which points to use to draw the two faces for each lines egment, the following linesegment is offset by 4
f_indices = ( self.__index_pattern + numpy.arange(0, 4 * len(normals), 4, dtype=numpy.int32).reshape((-1, 1)) ).reshape((-1, 3))
f_colors = numpy.repeat(polygon.mapLineTypeToColor(line_types), 4, 0)
builder.addFacesWithColor(f_points, f_indices, f_colors)

2
cura/LayerPolygon.py
View file

@ -63,7 +63,7 @@ class LayerPolygon:
def build(self, vertex_offset, index_offset, vertices, colors, indices):
if (self._build_cache_line_mesh_mask == None) or (self._build_cache_needed_points == None ):
if (self._build_cache_line_mesh_mask is None) or (self._build_cache_needed_points is None ):
self.buildCache()
line_mesh_mask = self._build_cache_line_mesh_mask

15
plugins/CuraEngineBackend/Cura.proto
View file

@ -61,7 +61,7 @@ message Polygon {
float line_width = 3; // The width of the line being laid down
}
message LayerOptimized {
message LayerOptimized {
int32 id = 1;
float height = 2; // Z position
float thickness = 3; // height of a single layer
@ -71,10 +71,15 @@ message LayerOptimized {
message PathSegment {
int32 ordinal = 1; // The absolute ordinal of this line segment
bytes line_type = 2; // Type of line segment as an unsigned char array of length 1 or N, where N is the number of line segments in this path
bytes points = 3; // The points defining the line segments, bytes of int64[2]? array of length N+1
bytes line_width = 4; // The widths of the line segments as bytes of a float?/int32? array of length 1 or N
int32 extruder = 1; // The extruder used for this path segment
enum PointType {
Point2D = 0;
Point3D = 1;
}
PointType point_type = 2;
bytes points = 3; // The points defining the line segments, bytes of int64[2/3]? array of length N+1
bytes line_type = 4; // Type of line segment as an unsigned char array of length 1 or N, where N is the number of line segments in this path
bytes line_width = 5; // The widths of the line segments as bytes of a float? array of length 1 or N
}