suzanne.soy/FreeCAD
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Arch: updated OBJ/DAE exporters to export groups

Browse Source
This commit is contained in:
Yorik van Havre 2016-06-16 18:31:21 -03:00
parent dce4695674
commit 95195e3765
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,7 @@
#* * #* *
#*************************************************************************** #***************************************************************************
import FreeCAD, Mesh, os, numpy, MeshPart import FreeCAD, Mesh, os, numpy, MeshPart, Arch, Draft
if FreeCAD.GuiUp: if FreeCAD.GuiUp:
from DraftTools import translate from DraftTools import translate
else: else:
@ -145,7 +145,9 @@ def export(exportList,filename,tessellation=1):
colmesh.materials.append(mat) colmesh.materials.append(mat)
objind = 0 objind = 0
scenenodes = [] scenenodes = []
for obj in exportList: objectslist = Draft.getGroupContents(exportList,walls=True,addgroups=True)
objectslist = Arch.pruneIncluded(objectslist)
for obj in objectslist:
vindex = [] vindex = []
nindex = [] nindex = []
findex = [] findex = []

6
src/Mod/Arch/importOBJ.py
View File

@ -21,7 +21,7 @@
#* * #* *
#*************************************************************************** #***************************************************************************
import FreeCAD, DraftGeomUtils, Part, Draft import FreeCAD, DraftGeomUtils, Part, Draft, Arch
if FreeCAD.GuiUp: if FreeCAD.GuiUp:
from DraftTools import translate from DraftTools import translate
else: else:
@ -108,7 +108,9 @@ def export(exportList,filename):
outfile.write("# FreeCAD v" + ver[0] + "." + ver[1] + " build" + ver[2] + " Arch module\n") outfile.write("# FreeCAD v" + ver[0] + "." + ver[1] + " build" + ver[2] + " Arch module\n")
outfile.write("# http://www.freecadweb.org\n") outfile.write("# http://www.freecadweb.org\n")
offset = 1 offset = 1
for obj in exportList: objectslist = Draft.getGroupContents(exportList,walls=True,addgroups=True)
objectslist = Arch.pruneIncluded(objectslist)
for obj in objectslist:
if obj.isDerivedFrom("Part::Feature"): if obj.isDerivedFrom("Part::Feature"):
if obj.ViewObject.isVisible(): if obj.ViewObject.isVisible():
vlist,elist,flist = getIndices(obj.Shape,offset) vlist,elist,flist = getIndices(obj.Shape,offset)