Signed-off-by: Antonio Ospite <ospite@studenti.unina.it>
def debug(msg):
if print_debug:
sys.stderr.write(msg)
def debug(msg):
if print_debug:
sys.stderr.write(msg)
- if x == 0:
- return 0
- elif x < 0:
# ---------------------------------------------------------------------
# ---------------------------------------------------------------------
opacity_string = ""
if color[3] != 255:
opacity = float(color[3])/255.0
opacity_string = ""
if color[3] != 255:
opacity = float(color[3])/255.0
- opacity_string = " fill-opacity: %g; stroke-opacity: %g; opacity: 1;" % (opacity, opacity)
+ #opacity_string = " fill-opacity: %g; stroke-opacity: %g; opacity: 1;" % (opacity, opacity)
+ opacity_string = "opacity: %g;" % (opacity)
self.file.write("\tstyle=\"fill:" + str_col + ";")
self.file.write(opacity_string)
self.file.write("\tstyle=\"fill:" + str_col + ";")
self.file.write(opacity_string)
# see http://www.antigrain.com/svg/index.html for more info
stroke_width = 1.0
# see http://www.antigrain.com/svg/index.html for more info
stroke_width = 1.0
- if config.polygons['EXPANSION_TRICK']:
- str_col = "#000000" # For debug
+ # EXPANSION TRICK is not that useful where there is transparency
+ if config.polygons['EXPANSION_TRICK'] and color[3] == 255:
+ # str_col = "#000000" # For debug
self.file.write(" stroke:%s;\n" % str_col)
self.file.write(" stroke-width:" + str(stroke_width) + ";\n")
self.file.write(" stroke-linecap:round;stroke-linejoin:round")
self.file.write(" stroke:%s;\n" % str_col)
self.file.write(" stroke-width:" + str(stroke_width) + ";\n")
self.file.write(" stroke-linecap:round;stroke-linejoin:round")
self._doModelingTransformation(mesh, obj.matrix)
self._doBackFaceCulling(mesh)
self._doModelingTransformation(mesh, obj.matrix)
self._doBackFaceCulling(mesh)
+
+ # When doing HSR with NEWELL we may want to flip all normals
+ # toward the viewer
+ if config.polygons['HSR'] == "NEWELL":
for f in mesh.faces:
f.sel = 1-f.sel
mesh.flipNormals()
for f in mesh.faces:
f.sel = 1
for f in mesh.faces:
f.sel = 1-f.sel
mesh.flipNormals()
for f in mesh.faces:
f.sel = 1
# Do "projection" now so we perform further processing
# in Normalized View Coordinates
self._doProjection(mesh, self.proj)
# Do "projection" now so we perform further processing
# in Normalized View Coordinates
self._doProjection(mesh, self.proj)
def _doConvertGeometricObjsToMesh(self, scene):
"""Convert all "geometric" objects to mesh ones.
"""
def _doConvertGeometricObjsToMesh(self, scene):
"""Convert all "geometric" objects to mesh ones.
"""
- #geometricObjTypes = ['Mesh', 'Surf', 'Curve', 'Text']
- geometricObjTypes = ['Mesh', 'Surf', 'Curve']
+ geometricObjTypes = ['Mesh', 'Surf', 'Curve', 'Text']
+ #geometricObjTypes = ['Mesh', 'Surf', 'Curve']
Objects = scene.getChildren()
objList = [ o for o in Objects if o.getType() in geometricObjTypes ]
Objects = scene.getChildren()
objList = [ o for o in Objects if o.getType() in geometricObjTypes ]
by_furthest_z = (lambda f1, f2: progress.update() and
by_furthest_z = (lambda f1, f2: progress.update() and
- cmp(max([v.co[2] for v in f1]), max([v.co[2] for v in f2]))
+ cmp(max([v.co[2] for v in f1]), max([v.co[2] for v in f2])+EPS)
)
# FIXME: using NMesh to sort faces. We should avoid that!
)
# FIXME: using NMesh to sort faces. We should avoid that!
"""Newell's depth sorting.
"""
"""Newell's depth sorting.
"""
by_furthest_z = (lambda f1, f2:
by_furthest_z = (lambda f1, f2:
- cmp(max([v.co[2] for v in f1]), max([v.co[2] for v in f2]))
+ cmp(max([v.co[2] for v in f1]), max([v.co[2] for v in f2])+EPS)
from split import Distance, isOnSegment
from split import Distance, isOnSegment
v2 = Vector(P.v[i])
v2[2] = 0
v2 = Vector(P.v[i])
v2[2] = 0
for j in range(0, len(Q.v)):
for j in range(0, len(Q.v)):
v3 = Vector(Q.v[j-1])
v3[2] = 0
v4 = Vector(Q.v[j])
v4[2] = 0
v3 = Vector(Q.v[j-1])
v3[2] = 0
v4 = Vector(Q.v[j])
v4[2] = 0
+
+ #print "\n\nTEST if we have coincidence!"
+ #print v1, v2
+ #print v3, v4
+ #print "distances:"
+ d1 = (v1-v3).length
+ d2 = (v1-v4).length
+ d3 = (v2-v3).length
+ d4 = (v2-v4).length
+ #print d1, d2, d3, d4
+ #print "-----------------------\n"
+
+ if d1 < EPS or d2 < EPS or d3 < EPS or d4 < EPS:
+ continue
+ # TODO: Replace with LineIntersect2D in newer API
ret = LineIntersect(v1, v2, v3, v4)
ret = LineIntersect(v1, v2, v3, v4)
# if line v1-v2 and v3-v4 intersect both return
# values are the same.
# if line v1-v2 and v3-v4 intersect both return
# values are the same.
- if ret and ret[0] == ret[1] and isOnSegment(v1, v2,
- ret[0], True) and isOnSegment(v3, v4, ret[1], True):
+ if ret and ret[0] == ret[1] and isOnSegment(v1, v2, ret[0], True) and isOnSegment(v3, v4, ret[1], True):
+ #l1 = (ret[0] - v1).length
+ #l2 = (ret[0] - v2).length
- l1 = (ret[0] - v1).length
- l2 = (ret[0] - v2).length
+ #l3 = (ret[1] - v3).length
+ #l4 = (ret[1] - v4).length
- l3 = (ret[1] - v3).length
- l4 = (ret[1] - v4).length
+ #print "New DISTACES againt the intersection point:"
+ #print l1, l2, l3, l4
+ #print "-----------------------\n"
- if (l1 < EPS or l2 < EPS) and (l3 < EPS or l4 < EPS):
- continue
+ #if l1 < EPS or l2 < EPS or l3 < EPS or l4 < EPS:
+ # continue
debug("Projections OVERLAP!!\n")
debug("line1:"+
debug("Projections OVERLAP!!\n")
debug("line1:"+
facelist = nmesh.faces[:]
maplist = []
facelist = nmesh.faces[:]
maplist = []
# The steps are _at_least_ equal to len(facelist), we do not count the
# The steps are _at_least_ equal to len(facelist), we do not count the
- # feces coming out from plitting!!
+ # feces coming out from splitting!!
progress.setActivity("HSR: Newell", len(facelist))
progress.setActivity("HSR: Newell", len(facelist))
- progress.setQuiet(True)
+ #progress.setQuiet(True)
- steps = -1
- split_done = 0
- marked_face = 0
+ #split_done = 0
+ #marked_face = 0
- print "\n----------------------"
+ debug("\n----------------------\n")
+ debug("len(facelits): %d\n" % len(facelist))
-
- #steps += 1
- #if steps == 3:
- # maplist = facelist
- # break
- print len(facelist)
- if len(facelist) == 33:
- #maplist = facelist
- break
-
- #pSign = 1
- #if P.normal[2] < 0:
- # pSign = -1
pSign = sign(P.normal[2])
pSign = sign(P.normal[2])
- # We can discard faces thar are perpendicular to the view
+ # We can discard faces parallel to the view vector
if pSign == 0:
facelist.remove(P)
continue
if pSign == 0:
facelist.remove(P)
continue
split_done = 0
face_marked = 0
split_done = 0
face_marked = 0
debug("Q.smooth: " + str(Q.smooth) + "\n")
debug("\n")
debug("Q.smooth: " + str(Q.smooth) + "\n")
debug("\n")
- #qSign = 1
- #if Q.normal[2] < 0:
- # qSign = -1
qSign = sign(Q.normal[2])
# We need to test only those Qs whose furthest vertex
qSign = sign(Q.normal[2])
# We need to test only those Qs whose furthest vertex
zP = [v.co[2] for v in P.v]
zQ = [v.co[2] for v in Q.v]
zP = [v.co[2] for v in P.v]
zQ = [v.co[2] for v in Q.v]
- ZOverlap = min(zP) < max(zQ)
+ notZOverlap = min(zP) > max(zQ) + EPS
debug("\nTest 0\n")
debug("NOT Z OVERLAP!\n")
if Q.smooth == 0:
debug("\nTest 0\n")
debug("NOT Z OVERLAP!\n")
if Q.smooth == 0:
# Test 1: X extent overlapping
xP = [v.co[0] for v in P.v]
xQ = [v.co[0] for v in Q.v]
# Test 1: X extent overlapping
xP = [v.co[0] for v in P.v]
xQ = [v.co[0] for v in Q.v]
- notXOverlap = (max(xP) <= min(xQ)) or (max(xQ) <= min(xP))
+ #notXOverlap = (max(xP) <= min(xQ)) or (max(xQ) <= min(xP))
+ notXOverlap = (min(xQ) >= max(xP)-EPS) or (min(xP) >= max(xQ)-EPS)
if notXOverlap:
debug("\nTest 1\n")
if notXOverlap:
debug("\nTest 1\n")
# Test 2: Y extent Overlapping
yP = [v.co[1] for v in P.v]
yQ = [v.co[1] for v in Q.v]
# Test 2: Y extent Overlapping
yP = [v.co[1] for v in P.v]
yQ = [v.co[1] for v in Q.v]
- notYOverlap = (max(yP) <= min(yQ)) or (max(yQ) <= min(yP))
+ #notYOverlap = (max(yP) <= min(yQ)) or (max(yQ) <= min(yP))
+ notYOverlap = (min(yQ) >= max(yP)-EPS) or (min(yP) >= max(yQ)-EPS)
if notYOverlap:
debug("\nTest 2\n")
if notYOverlap:
debug("\nTest 2\n")
n = 0
for Pi in P:
d = qSign * Distance(Vector(Pi), Q)
n = 0
for Pi in P:
d = qSign * Distance(Vector(Pi), Q)
n += 1
pVerticesBehindPlaneQ = (n == len(P))
n += 1
pVerticesBehindPlaneQ = (n == len(P))
n = 0
for Qi in Q:
d = pSign * Distance(Vector(Qi), P)
n = 0
for Qi in Q:
d = pSign * Distance(Vector(Qi), P)
n += 1
qVerticesInFrontPlaneP = (n == len(Q))
n += 1
qVerticesInFrontPlaneP = (n == len(Q))
# Split P or Q
debug("Possibly a cycle detected!\n")
debug("Split here!!\n")
# Split P or Q
debug("Possibly a cycle detected!\n")
debug("Split here!!\n")
- old_facelist = facelist[:]
facelist = facesplit(P, Q, facelist, nmesh)
split_done = 1
break
facelist = facesplit(P, Q, facelist, nmesh)
split_done = 1
break
# The question now is: Does Q obscure P?
# Test 3bis: Q vertices are all behind the plane of P
n = 0
for Qi in Q:
d = pSign * Distance(Vector(Qi), P)
# The question now is: Does Q obscure P?
# Test 3bis: Q vertices are all behind the plane of P
n = 0
for Qi in Q:
d = pSign * Distance(Vector(Qi), P)
n += 1
qVerticesBehindPlaneP = (n == len(Q))
n += 1
qVerticesBehindPlaneP = (n == len(Q))
n = 0
for Pi in P:
d = qSign * Distance(Vector(Pi), Q)
n = 0
for Pi in P:
d = qSign * Distance(Vector(Pi), Q)
n += 1
pVerticesInFrontPlaneQ = (n == len(P))
n += 1
pVerticesInFrontPlaneQ = (n == len(P))
debug("Test 3bis or 4bis failed\n")
debug("Split here!!2\n")
debug("Test 3bis or 4bis failed\n")
debug("Split here!!2\n")
- old_facelist = facelist[:]
facelist = facesplit(P, Q, facelist, nmesh)
facelist = facesplit(P, Q, facelist, nmesh)
-
- steps += 1
- if steps == 2:
- maplist = [P, Q]
- print P, Q
facelist.remove(Q)
facelist.insert(0, Q)
Q.smooth = 1
face_marked = 1
facelist.remove(Q)
facelist.insert(0, Q)
Q.smooth = 1
face_marked = 1
-
- # Make merked faces BLUE. so to see them
- #for c in Q.col:
- # c.r = 0
- # c.g = 0
- # c.b = 255
- # c.a = 255
-
- print [f.smooth for f in facelist]
break
# Write P!
if split_done == 0 and face_marked == 0:
break
# Write P!
if split_done == 0 and face_marked == 0:
facelist.remove(P)
maplist.append(P)
progress.update()
facelist.remove(P)
maplist.append(P)
progress.update()
- #if progress.progressModel.getProgress() == 100:
- # break
- if steps == 2:
- """
- for c in Q.col:
- c.r = 0
- c.g = 0
- c.b = 255
- c.a = 255
- for c in P.col:
- c.r = 0
- c.g = 0
- c.b = 255
- c.a = 255
- """
- print steps
- #maplist.append(P)
- #maplist.append(Q)
-
- # for f in facelist:
- # if f not in old_facelist:
- # print "splitted?"
- # maplist.append(f)
-
- break
- """
- """
+ # end of while len(facelist)
for f in nmesh.faces:
f.sel = 1
nmesh.update()
for f in nmesh.faces:
f.sel = 1
nmesh.update()
def _doHiddenSurfaceRemoval(self, mesh):
"""Do HSR for the given mesh.
def _doHiddenSurfaceRemoval(self, mesh):
"""Do HSR for the given mesh.
projects / vrm.git / commitdiff