kindred/create
1
1
Fork 0
Code Issues 43 Pull Requests Actions 1 Packages Projects 9 Releases 2 Wiki Activity

Copy mesh data directly into the numpy arrays instead of creating a temporary local copy in order to save memory when dealing with very large meshes

Browse Source
This commit is contained in:
Daniel Burr
2017-12-29 04:33:41 +01:00
committed by wmayer
parent 7ec6d1b5a2
commit 9bd3b8f20d
1 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/Mod/Arch/importDAE.py
View File

@@ -193,9 +193,7 @@ def export(exportList,filename,tessellation=1):
objectslist = Draft.getGroupContents(exportList,walls=True,addgroups=True)
objectslist = Arch.pruneIncluded(objectslist)
for obj in objectslist:
vindex = []
nindex = []
findex = []
findex = numpy.array([])
m = None
if obj.isDerivedFrom("Part::Feature"):
print("exporting object ",obj.Name, obj.Shape)
@@ -205,21 +203,29 @@ def export(exportList,filename,tessellation=1):
m = obj.Mesh
if m:
Topology = m.Topology
Facets = m.Facets
# vertex indices
for v in Topology[0]:
vindex.extend([v.x*scale,v.y*scale,v.z*scale])
vindex = numpy.empty(len(Topology[0]) * 3)
for i in xrange(len(Topology[0])):
v = Topology[0][i]
vindex[list(range(i*3, i*3+3))] = (v.x*scale,v.y*scale,v.z*scale)
# normals
for f in m.Facets:
n = f.Normal
nindex.extend([n.x,n.y,n.z])
nindex = numpy.empty(len(Facets) * 3)
for i in xrange(len(Facets)):
n = Facets[i].Normal
nindex[list(range(i*3, i*3+3))] = (n.x,n.y,n.z)
# face indices
findex = numpy.empty(len(Topology[1]) * 6, numpy.int64)
for i in xrange(len(Topology[1])):
f = Topology[1][i]
findex.extend([f[0],i,f[1],i,f[2],i])
findex[list(range(i*6, i*6+6))] = (f[0],i,f[1],i,f[2],i)
print(len(vindex), " vert indices, ", len(nindex), " norm indices, ", len(findex), " face indices.")
vert_src = collada.source.FloatSource("cubeverts-array"+str(objind), numpy.array(vindex), ('X', 'Y', 'Z'))
normal_src = collada.source.FloatSource("cubenormals-array"+str(objind), numpy.array(nindex), ('X', 'Y', 'Z'))
vert_src = collada.source.FloatSource("cubeverts-array"+str(objind), vindex, ('X', 'Y', 'Z'))
normal_src = collada.source.FloatSource("cubenormals-array"+str(objind), nindex, ('X', 'Y', 'Z'))
geom = collada.geometry.Geometry(colmesh, "geometry"+str(objind), obj.Name, [vert_src, normal_src])
input_list = collada.source.InputList()
input_list.addInput(0, 'VERTEX', "#cubeverts-array"+str(objind))
@@ -254,7 +260,7 @@ def export(exportList,filename,tessellation=1):
colmesh.effects.append(effect)
colmesh.materials.append(defaultmat)
matnode = collada.scene.MaterialNode(matref, defaultmat, inputs=[])
triset = geom.createTriangleSet(numpy.array(findex), input_list, matref)
triset = geom.createTriangleSet(findex, input_list, matref)
geom.primitives.append(triset)
colmesh.geometries.append(geom)
geomnode = collada.scene.GeometryNode(geom, [matnode])