diff options
Diffstat (limited to 'add_mesh_BoltFactory')
-rw-r--r-- | add_mesh_BoltFactory/Boltfactory.py | 4 | ||||
-rw-r--r-- | add_mesh_BoltFactory/createMesh.py | 48 |
2 files changed, 26 insertions, 26 deletions
diff --git a/add_mesh_BoltFactory/Boltfactory.py b/add_mesh_BoltFactory/Boltfactory.py index c5fa403f..d0734f4a 100644 --- a/add_mesh_BoltFactory/Boltfactory.py +++ b/add_mesh_BoltFactory/Boltfactory.py @@ -229,8 +229,8 @@ class add_mesh_bolt(bpy.types.Operator): if self.bf_Bit_Type == 'bf_Bit_None': pass elif self.bf_Bit_Type == 'bf_Bit_Allen': - col.prop(self, 'bf_Allen_Bit_Depth') - col.prop(self, 'bf_Allen_Bit_Flat_Distance') + col.prop(self, 'bf_Allen_Bit_Depth') + col.prop(self, 'bf_Allen_Bit_Flat_Distance') elif self.bf_Bit_Type == 'bf_Bit_Philips': col.prop(self, 'bf_Phillips_Bit_Depth') col.prop(self, 'bf_Philips_Bit_Dia') diff --git a/add_mesh_BoltFactory/createMesh.py b/add_mesh_BoltFactory/createMesh.py index e7594151..6dae7b4c 100644 --- a/add_mesh_BoltFactory/createMesh.py +++ b/add_mesh_BoltFactory/createMesh.py @@ -72,27 +72,27 @@ disadvantage of not being able to interactively change the properties. def RemoveDoubles(verts,faces,Decimal_Places = 4): - new_verts = [] - new_faces = [] - dict_verts = {} - Rounded_Verts = [] - - for v in verts: - Rounded_Verts.append([round(v[0],Decimal_Places),round(v[1],Decimal_Places),round(v[2],Decimal_Places)]) - - for face in faces: - new_face = [] - for vert_index in face: - Real_co = tuple(verts[vert_index]) - Rounded_co = tuple(Rounded_Verts[vert_index]) - - if Rounded_co not in dict_verts: - dict_verts[Rounded_co] = len(dict_verts) - new_verts.append(Real_co) - if dict_verts[Rounded_co] not in new_face: - new_face.append(dict_verts[Rounded_co]) - if len(new_face) == 3 or len(new_face) == 4: - new_faces.append(new_face) + new_verts = [] + new_faces = [] + dict_verts = {} + Rounded_Verts = [] + + for v in verts: + Rounded_Verts.append([round(v[0],Decimal_Places),round(v[1],Decimal_Places),round(v[2],Decimal_Places)]) + + for face in faces: + new_face = [] + for vert_index in face: + Real_co = tuple(verts[vert_index]) + Rounded_co = tuple(Rounded_Verts[vert_index]) + + if Rounded_co not in dict_verts: + dict_verts[Rounded_co] = len(dict_verts) + new_verts.append(Real_co) + if dict_verts[Rounded_co] not in new_face: + new_face.append(dict_verts[Rounded_co]) + if len(new_face) == 3 or len(new_face) == 4: + new_faces.append(new_face) return new_verts,new_faces @@ -183,7 +183,7 @@ def SpinDup(VERTS,FACES,DEGREE,DIVISIONS,AXIS): faces=[] if DIVISIONS == 0: - DIVISIONS = 1 + DIVISIONS = 1 step = DEGREE/DIVISIONS # set step so pieces * step = degrees in arc @@ -1341,7 +1341,7 @@ def Create_Thread_End_Verts(INNER_DIA,OUTTER_DIA,PITCH,CREST_PERCENT,ROOT_PERCEN z = max(z,Max_Height) Tapper_Radius = OUTTER_RADIUS - (Tapper_Height_Start - z) if Tapper_Radius > INNER_RADIUS: - Tapper_Radius = INNER_RADIUS + Tapper_Radius = INNER_RADIUS x = sin(radians(i*Deg_Step))*(Tapper_Radius) y = cos(radians(i*Deg_Step))*(Tapper_Radius) @@ -1355,7 +1355,7 @@ def Create_Thread_End_Verts(INNER_DIA,OUTTER_DIA,PITCH,CREST_PERCENT,ROOT_PERCEN z = max(z,Max_Height) Tapper_Radius = OUTTER_RADIUS - (Tapper_Height_Start - z) if Tapper_Radius > INNER_RADIUS: - Tapper_Radius = INNER_RADIUS + Tapper_Radius = INNER_RADIUS x = sin(radians(i*Deg_Step))*(Tapper_Radius) y = cos(radians(i*Deg_Step))*(Tapper_Radius) |