diff options
author | migius <migius@gmx.net> | 2018-12-22 20:45:41 +0300 |
---|---|---|
committer | migius <migius@gmx.net> | 2018-12-22 20:45:41 +0300 |
commit | 5b721956621c34b849281eddd9399fa7c9e1f399 (patch) | |
tree | 74ada57633ceb27021e3df84c04016c72194bdaf /io_export_dxf/primitive_exporters | |
parent | 07ee2422a05d7cc786cd96a10b5651b8d32db306 (diff) |
DXF-exporter: initial port to 2.80
Diffstat (limited to 'io_export_dxf/primitive_exporters')
4 files changed, 11 insertions, 10 deletions
diff --git a/io_export_dxf/primitive_exporters/base_exporter.py b/io_export_dxf/primitive_exporters/base_exporter.py index 1a7d10b6..beb97f82 100644 --- a/io_export_dxf/primitive_exporters/base_exporter.py +++ b/io_export_dxf/primitive_exporters/base_exporter.py @@ -16,7 +16,7 @@ class BasePrimitiveDXFExporter(object): returns a list of [x,y,z] """ #print 'deb:projected_co() verts=', verts #--------- - temp_verts = [matrix*mathutils.Vector(v) for v in verts] + temp_verts = [matrix @ mathutils.Vector(v) for v in verts] #print 'deb:projected_co() temp_verts=', temp_verts #--------- # if GUI_A['Z_force_on'].val: locZ = GUI_A['Z_elev'].val @@ -58,7 +58,7 @@ class BasePrimitiveDXFExporter(object): vec_normal = f.no.copy() #print 'deb: vec_normal=', vec_normal #------------------ # must be transferred to camera/view-CS - vec_normal *= mx_n + vec_normal @= mx_n #vec_normal *= mb.rotationPart() #print 'deb:2vec_normal=', vec_normal #------------------ #vec_normal *= mw0.rotationPart() @@ -72,7 +72,7 @@ class BasePrimitiveDXFExporter(object): frontFace = True else: v = f.verts[0] - vert = mathutils.Vector(v.co) * mx + vert = mathutils.Vector(v.co) @ mx if mathutils.DotVecs(vert, vec_normal) < 0.00001: frontFace = True diff --git a/io_export_dxf/primitive_exporters/insert_exporter.py b/io_export_dxf/primitive_exporters/insert_exporter.py index c016364f..c912d321 100644 --- a/io_export_dxf/primitive_exporters/insert_exporter.py +++ b/io_export_dxf/primitive_exporters/insert_exporter.py @@ -38,7 +38,7 @@ def exportInsert(ob, mx, insert_name, **common): [point] = projected_co([point1], mx) if PERSPECTIVE: clipStart = 10.0 - coef = -clipStart / (point1*mx)[2] + coef = -clipStart / (point1 @ mx)[2] #print 'deb: coef=', coef #-------------- #TODO: ? sizeX *= coef #sizeY *= coef diff --git a/io_export_dxf/primitive_exporters/mesh_exporter.py b/io_export_dxf/primitive_exporters/mesh_exporter.py index 69834871..5d29e2cc 100644 --- a/io_export_dxf/primitive_exporters/mesh_exporter.py +++ b/io_export_dxf/primitive_exporters/mesh_exporter.py @@ -64,8 +64,9 @@ class MeshDXFExporter(BasePrimitiveDXFExporter): allpoints = self.toGlobalOrigin(allpoints) faces=[] edges=[] - me.update(calc_tessface=True) - me_faces = me.tessfaces + + me.calc_loop_triangles() #me.update(calc_tessface=True) + me_faces = me.loop_triangles #tessfaces #print('deb: allpoints=\n', allpoints) #--------- #print('deb: me_faces=\n', me_faces) #--------- if me_faces and self.PROJECTION and self.HIDDEN_LINES: @@ -121,7 +122,7 @@ class MeshDXFExporter(BasePrimitiveDXFExporter): faces = [[v+1 for v in f.vertices] for f in faces] else: # for back-Faces-mode remove face-free vertices - map=verts_state= [0]*len(allpoints) + map=verts_state= [0] * len(allpoints) for f in faces: for v in f: verts_state[v]=1 @@ -130,8 +131,8 @@ class MeshDXFExporter(BasePrimitiveDXFExporter): for used_i,used in enumerate(verts_state): if used: newverts.append(allpoints[used_i]) - map[used_i]=i - i+=1 + map[used_i] = i + i += 1 allpoints = newverts faces = [[map[v]+1 for v in f] for f in faces] args = copy.copy(kwargs) diff --git a/io_export_dxf/primitive_exporters/text_exporter.py b/io_export_dxf/primitive_exporters/text_exporter.py index 5cd9e629..fe997614 100644 --- a/io_export_dxf/primitive_exporters/text_exporter.py +++ b/io_export_dxf/primitive_exporters/text_exporter.py @@ -57,7 +57,7 @@ def exportText(ob, mx, mw, **common): [point] = projected_co([point1], mx) if PERSPECTIVE: clipStart = 10.0 - coef = -clipStart / (point1*mx)[2] + coef = -clipStart / (point1 @ mx)[2] textHeight *= coef #print 'deb: coef=', coef #-------------- |