sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

-> Slight fix for Face Weld code in FLT importer

Browse Source 
Slight fix for welding of faces that only share one vertex
This commit is contained in:
Geoffrey Bantle 2008-03-26 16:45:18 +00:00
parent 4197e37200
commit d94038342c
1 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
release/scripts/flt_import.py
View File

@ -702,7 +702,7 @@ class InterNode(Node):
return False
def __floatcompare(self, __f1, __f2):
epsilon = 0.01
epsilon = 0.1
if ((__f1 + epsilon) > __f2) and ((__f1 - epsilon) < __f2):
return True
return False
@ -717,16 +717,16 @@ class InterNode(Node):
__match = 0
for __vert in __v1bface.verts:
for __vert2 in __v2bface.verts:
if (abs(__vert.co[0] - __vert2.co[0]) <= limit) and (abs(__vert.co[1] - __vert2.co[1]) <= limit) and (abs(__vert.co[2] - __vert2.co[2]) <= limit): #this needs to be fixed!
#if __vert2 in __weldmesh['Vertex Disk'][__vert] or __vert == __vert2:
#if (abs(__vert.co[0] - __vert2.co[0]) <= limit) and (abs(__vert.co[1] - __vert2.co[1]) <= limit) and (abs(__vert.co[2] - __vert2.co[2]) <= limit): #this needs to be fixed!
if __vert2 in __weldmesh['Vertex Disk'][__vert] or __vert == __vert2:
__match += 1
__matchvert = __vert2
#avoid faces sharing more than two verts
if __match > 2:
return False
#consistent winding for face normals
if __match == 2:
if not self.__faceWinding(__weldmesh, __v1bface, __v2bface):
return False
@ -742,6 +742,15 @@ class InterNode(Node):
__v1facenorm.normalize()
__v2facenorm.normalize()
if __match == 1:
#special case, look for comparison of normals angle
__angle = Blender.Mathutils.AngleBetweenVecs(__v1facenorm, __v2facenorm)
if __angle > 70.0:
return False
__v2facenorm = __v2facenorm.negate()
if self.__floatcompare(__v1facenorm[0], __v2facenorm[0]) and self.__floatcompare(__v1facenorm[1], __v2facenorm[1]) and self.__floatcompare(__v1facenorm[2], __v2facenorm[2]):
@ -878,7 +887,6 @@ class InterNode(Node):
self.__replaceFaceVert(doubleface, doublevert, vertex)
for doublefaceindex in removeFaces:
weldmesh['Vertex Faces'][doublevert].remove(doublefaceindex)
#old faces first
oldindices = list()
for face in self.mesh.faces:
@ -911,6 +919,7 @@ class InterNode(Node):
self.mesh.verts.delete(delverts)
#######################################################
## End Remove Doubles Replacement ##
#######################################################
@ -1126,9 +1135,10 @@ class InterNode(Node):
Blender.Mesh.Mode(Blender.Mesh.SelectModes['VERTEX'])
self.mesh.sel= 1
self.header.scene.update(1) #slow!
#self.mesh.remDoubles(0.0001)
weldmesh = self.buildWeldMesh()
self.weldFuseFaces(weldmesh)
welded = self.weldFuseFaces(weldmesh)
self.mesh.verts.delete(0) # remove the dummy vert
edgeHash = dict()