forked from bartvdbraak/blender
Made standard style modules compatible with Python 3.
This commit is contained in:
Tamito Kajiyama
parent
069d21dddf
commit
1ff038397f
@ -156,7 +156,7 @@ class pyExternalContourChainingIterator(ChainingIterator):
|
||||
if(self._isExternalContour(ave)):
|
||||
return 1
|
||||
it.increment()
|
||||
print "pyExternlContourChainingIterator : didn't find next edge"
|
||||
print("pyExternlContourChainingIterator : didn't find next edge")
|
||||
return 0
|
||||
def traverse(self, iter):
|
||||
winner = None
|
||||
@ -290,7 +290,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
|
||||
def traverse(self, iter):
|
||||
winner = None
|
||||
winnerOrientation = 0
|
||||
print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
|
||||
print(self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond())
|
||||
it = AdjacencyIterator(iter)
|
||||
tvertex = self.getVertex()
|
||||
if type(tvertex) is TVertex:
|
||||
@ -303,7 +303,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
|
||||
winnerOrientation = 1
|
||||
else:
|
||||
winnerOrientation = 0
|
||||
break
|
||||
break
|
||||
it.increment()
|
||||
else:
|
||||
## case of NonTVertex
|
||||
@ -327,7 +327,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
|
||||
if(winner != None):
|
||||
# check whether this edge was part of the selection
|
||||
if(winner.getTimeStamp() != GetTimeStampCF()):
|
||||
#print "---", winner.getId().getFirst(), winner.getId().getSecond()
|
||||
#print("---", winner.getId().getFirst(), winner.getId().getSecond())
|
||||
# if not, let's check whether it's short enough with
|
||||
# respect to the chain made without staying in the selection
|
||||
#------------------------------------------------------------
|
||||
@ -341,7 +341,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
|
||||
_it.init()
|
||||
while(_it.isEnd() == 0):
|
||||
ve = _it.getObject()
|
||||
#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("--------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
self._length = self._length + ve.getLength2D()
|
||||
_it.increment()
|
||||
if(_it.isBegin() != 0):
|
||||
@ -353,7 +353,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
|
||||
_it.decrement()
|
||||
while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
|
||||
ve = _it.getObject()
|
||||
#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("--------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
self._length = self._length + ve.getLength2D()
|
||||
_it.decrement()
|
||||
|
||||
@ -367,7 +367,7 @@ class pyFillOcclusionsRelativeChainingIterator(ChainingIterator):
|
||||
_cit.init()
|
||||
while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
|
||||
ve = _cit.getObject()
|
||||
#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("-------- --------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
connexl = connexl + ve.getLength2D()
|
||||
_cit.increment()
|
||||
if(connexl > self._percent * self._length):
|
||||
@ -389,7 +389,7 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
|
||||
def traverse(self, iter):
|
||||
winner = None
|
||||
winnerOrientation = 0
|
||||
#print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
|
||||
#print(self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond())
|
||||
it = AdjacencyIterator(iter)
|
||||
tvertex = self.getVertex()
|
||||
if type(tvertex) is TVertex:
|
||||
@ -402,7 +402,7 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
|
||||
winnerOrientation = 1
|
||||
else:
|
||||
winnerOrientation = 0
|
||||
break
|
||||
break
|
||||
it.increment()
|
||||
else:
|
||||
## case of NonTVertex
|
||||
@ -426,7 +426,7 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
|
||||
if(winner != None):
|
||||
# check whether this edge was part of the selection
|
||||
if(winner.getTimeStamp() != GetTimeStampCF()):
|
||||
#print "---", winner.getId().getFirst(), winner.getId().getSecond()
|
||||
#print("---", winner.getId().getFirst(), winner.getId().getSecond())
|
||||
# nw let's compute the length of this connex non selected part:
|
||||
connexl = 0
|
||||
_cit = pyChainSilhouetteGenericIterator(0,0)
|
||||
@ -436,7 +436,7 @@ class pyFillOcclusionsAbsoluteChainingIterator(ChainingIterator):
|
||||
_cit.init()
|
||||
while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
|
||||
ve = _cit.getObject()
|
||||
#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("-------- --------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
connexl = connexl + ve.getLength2D()
|
||||
_cit.increment()
|
||||
if(connexl > self._length):
|
||||
@ -464,7 +464,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
def traverse(self, iter):
|
||||
winner = None
|
||||
winnerOrientation = 0
|
||||
print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
|
||||
print(self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond())
|
||||
it = AdjacencyIterator(iter)
|
||||
tvertex = self.getVertex()
|
||||
if type(tvertex) is TVertex:
|
||||
@ -477,7 +477,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
winnerOrientation = 1
|
||||
else:
|
||||
winnerOrientation = 0
|
||||
break
|
||||
break
|
||||
it.increment()
|
||||
else:
|
||||
## case of NonTVertex
|
||||
@ -501,7 +501,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
if(winner != None):
|
||||
# check whether this edge was part of the selection
|
||||
if(winner.getTimeStamp() != GetTimeStampCF()):
|
||||
#print "---", winner.getId().getFirst(), winner.getId().getSecond()
|
||||
#print("---", winner.getId().getFirst(), winner.getId().getSecond())
|
||||
# if not, let's check whether it's short enough with
|
||||
# respect to the chain made without staying in the selection
|
||||
#------------------------------------------------------------
|
||||
@ -515,7 +515,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
_it.init()
|
||||
while(_it.isEnd() == 0):
|
||||
ve = _it.getObject()
|
||||
#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("--------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
self._length = self._length + ve.getLength2D()
|
||||
_it.increment()
|
||||
if(_it.isBegin() != 0):
|
||||
@ -527,7 +527,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
_it.decrement()
|
||||
while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
|
||||
ve = _it.getObject()
|
||||
#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("--------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
self._length = self._length + ve.getLength2D()
|
||||
_it.decrement()
|
||||
|
||||
@ -541,7 +541,7 @@ class pyFillOcclusionsAbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
_cit.init()
|
||||
while((_cit.isEnd() == 0) and (_cit.getObject().getTimeStamp() != GetTimeStampCF())):
|
||||
ve = _cit.getObject()
|
||||
#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("-------- --------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
connexl = connexl + ve.getLength2D()
|
||||
_cit.increment()
|
||||
if((connexl > self._percent * self._length) or (connexl > self._absLength)):
|
||||
@ -569,7 +569,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
def traverse(self, iter):
|
||||
winner = None
|
||||
winnerOrientation = 0
|
||||
print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
|
||||
print(self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond())
|
||||
it = AdjacencyIterator(iter)
|
||||
tvertex = self.getVertex()
|
||||
if type(tvertex) is TVertex:
|
||||
@ -582,7 +582,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
winnerOrientation = 1
|
||||
else:
|
||||
winnerOrientation = 0
|
||||
break
|
||||
break
|
||||
it.increment()
|
||||
else:
|
||||
## case of NonTVertex
|
||||
@ -606,7 +606,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
if(winner != None):
|
||||
# check whether this edge was part of the selection
|
||||
if(winner.qi() != 0):
|
||||
#print "---", winner.getId().getFirst(), winner.getId().getSecond()
|
||||
#print("---", winner.getId().getFirst(), winner.getId().getSecond())
|
||||
# if not, let's check whether it's short enough with
|
||||
# respect to the chain made without staying in the selection
|
||||
#------------------------------------------------------------
|
||||
@ -620,7 +620,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
_it.init()
|
||||
while(_it.isEnd() == 0):
|
||||
ve = _it.getObject()
|
||||
#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("--------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
self._length = self._length + ve.getLength2D()
|
||||
_it.increment()
|
||||
if(_it.isBegin() != 0):
|
||||
@ -632,7 +632,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
_it.decrement()
|
||||
while ((_it.isEnd() == 0) and (_it.isBegin() == 0)):
|
||||
ve = _it.getObject()
|
||||
#print "--------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("--------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
self._length = self._length + ve.getLength2D()
|
||||
_it.decrement()
|
||||
|
||||
@ -646,7 +646,7 @@ class pyFillQi0AbsoluteAndRelativeChainingIterator(ChainingIterator):
|
||||
_cit.init()
|
||||
while((_cit.isEnd() == 0) and (_cit.getObject().qi() != 0)):
|
||||
ve = _cit.getObject()
|
||||
#print "-------- --------", ve.getId().getFirst(), ve.getId().getSecond()
|
||||
#print("-------- --------", ve.getId().getFirst(), ve.getId().getSecond())
|
||||
connexl = connexl + ve.getLength2D()
|
||||
_cit.increment()
|
||||
if((connexl > self._percent * self._length) or (connexl > self._absLength)):
|
||||
|
||||
@ -18,7 +18,7 @@ class pyCurvilinearLengthF0D(UnaryFunction0DDouble):
|
||||
i0d = inter.getObject()
|
||||
s = i0d.getExactTypeName()
|
||||
if (string.find(s, "CurvePoint") == -1):
|
||||
print "CurvilinearLengthF0D: not implemented yet for %s" % (s)
|
||||
print("CurvilinearLengthF0D: not implemented yet for", s)
|
||||
return -1
|
||||
cp = castToCurvePoint(i0d)
|
||||
return cp.t2d()
|
||||
|
||||
@ -6,7 +6,7 @@ class pyZBP1D(BinaryPredicate1D):
|
||||
def getName(self):
|
||||
return "pyZBP1D"
|
||||
|
||||
def __call__(self, i1, i2):
|
||||
def __call__(self, i1, i2):
|
||||
func = GetZF1D()
|
||||
return (func(i1) > func(i2))
|
||||
|
||||
@ -18,21 +18,21 @@ class pyZDiscontinuityBP1D(BinaryPredicate1D):
|
||||
def getName(self):
|
||||
return "pyZDiscontinuityBP1D"
|
||||
|
||||
def __call__(self, i1, i2):
|
||||
def __call__(self, i1, i2):
|
||||
return (self._GetZDiscontinuity(i1) > self._GetZDiscontinuity(i2))
|
||||
|
||||
class pyLengthBP1D(BinaryPredicate1D):
|
||||
def getName(self):
|
||||
return "LengthBP1D"
|
||||
|
||||
def __call__(self, i1, i2):
|
||||
def __call__(self, i1, i2):
|
||||
return (i1.getLength2D() > i2.getLength2D())
|
||||
|
||||
class pySilhouetteFirstBP1D(BinaryPredicate1D):
|
||||
def getName(self):
|
||||
return "SilhouetteFirstBP1D"
|
||||
|
||||
def __call__(self, inter1, inter2):
|
||||
def __call__(self, inter1, inter2):
|
||||
bpred = SameShapeIdBP1D()
|
||||
if (bpred(inter1, inter2) != 1):
|
||||
return 0
|
||||
@ -44,7 +44,7 @@ class pyNatureBP1D(BinaryPredicate1D):
|
||||
def getName(self):
|
||||
return "NatureBP1D"
|
||||
|
||||
def __call__(self, inter1, inter2):
|
||||
def __call__(self, inter1, inter2):
|
||||
return (inter1.getNature() & inter2.getNature())
|
||||
|
||||
class pyViewMapGradientNormBP1D(BinaryPredicate1D):
|
||||
@ -54,7 +54,7 @@ class pyViewMapGradientNormBP1D(BinaryPredicate1D):
|
||||
def getName(self):
|
||||
return "pyViewMapGradientNormBP1D"
|
||||
def __call__(self, i1,i2):
|
||||
print "compare gradient"
|
||||
print("compare gradient")
|
||||
return (self._GetGradient(i1) > self._GetGradient(i2))
|
||||
|
||||
class pyShuffleBP1D(BinaryPredicate1D):
|
||||
@ -64,7 +64,7 @@ class pyShuffleBP1D(BinaryPredicate1D):
|
||||
def getName(self):
|
||||
return "pyNearAndContourFirstBP1D"
|
||||
|
||||
def __call__(self, inter1, inter2):
|
||||
def __call__(self, inter1, inter2):
|
||||
r1 = uniform(0,1)
|
||||
r2 = uniform(0,1)
|
||||
return (r1<r2)
|
||||
|
||||
@ -77,7 +77,7 @@ class pyParameterUP0DGoodOne(UnaryPredicate0D):
|
||||
def __call__(self, inter):
|
||||
#s = self.getCurvilinearAbscissa(inter)
|
||||
u = inter.u()
|
||||
#print u
|
||||
#print(u)
|
||||
return ((u>=self._m) and (u<=self._M))
|
||||
|
||||
class pyParameterUP0D(UnaryPredicate0D):
|
||||
@ -96,7 +96,7 @@ class pyParameterUP0D(UnaryPredicate0D):
|
||||
b1 = (c>0.1)
|
||||
#s = self.getCurvilinearAbscissa(inter)
|
||||
u = inter.u()
|
||||
#print u
|
||||
#print(u)
|
||||
b = ((u>=self._m) and (u<=self._M))
|
||||
return b and b1
|
||||
|
||||
|
||||
@ -88,7 +88,7 @@ class pyLowSteerableViewMapDensityUP1D(UnaryPredicate1D):
|
||||
def __call__(self, inter):
|
||||
func = GetSteerableViewMapDensityF1D(self._level, self._integration)
|
||||
v = func(inter)
|
||||
print v
|
||||
print(v)
|
||||
if(v < self._threshold):
|
||||
return 1
|
||||
return 0
|
||||
@ -107,7 +107,7 @@ class pyLowDirectionalViewMapDensityUP1D(UnaryPredicate1D):
|
||||
def __call__(self, inter):
|
||||
func = GetDirectionalViewMapDensityF1D(self._orientation, self._level, self._integration)
|
||||
v = func(inter)
|
||||
#print v
|
||||
#print(v)
|
||||
if(v < self._threshold):
|
||||
return 1
|
||||
return 0
|
||||
@ -160,9 +160,9 @@ class pyHighViewMapDensityUP1D(UnaryPredicate1D):
|
||||
return "pyHighViewMapDensityUP1D"
|
||||
|
||||
def __call__(self, inter):
|
||||
#print "toto"
|
||||
#print func.getName()
|
||||
#print inter.getExactTypeName()
|
||||
#print("toto")
|
||||
#print(func.getName())
|
||||
#print(inter.getExactTypeName())
|
||||
v= self._func(inter)
|
||||
if(v > self._threshold):
|
||||
return 1
|
||||
@ -222,23 +222,23 @@ class pyIsOccludedByUP1D(UnaryPredicate1D):
|
||||
vlast = itlast.getObject()
|
||||
tvertex = v.viewvertex()
|
||||
if type(tvertex) is TVertex:
|
||||
print "TVertex: [ ", tvertex.getId().getFirst(), ",", tvertex.getId().getSecond()," ]"
|
||||
print("TVertex: [ ", tvertex.getId().getFirst(), ",", tvertex.getId().getSecond()," ]")
|
||||
eit = tvertex.edgesBegin()
|
||||
while(eit.isEnd() == 0):
|
||||
ve, incoming = eit.getObject()
|
||||
if(ve.getId() == self._id):
|
||||
return 1
|
||||
print "-------", ve.getId().getFirst(), "-", ve.getId().getSecond()
|
||||
print("-------", ve.getId().getFirst(), "-", ve.getId().getSecond())
|
||||
eit.increment()
|
||||
tvertex = vlast.viewvertex()
|
||||
if type(tvertex) is TVertex:
|
||||
print "TVertex: [ ", tvertex.getId().getFirst(), ",", tvertex.getId().getSecond()," ]"
|
||||
print("TVertex: [ ", tvertex.getId().getFirst(), ",", tvertex.getId().getSecond()," ]")
|
||||
eit = tvertex.edgesBegin()
|
||||
while(eit.isEnd() == 0):
|
||||
ve, incoming = eit.getObject()
|
||||
if(ve.getId() == self._id):
|
||||
return 1
|
||||
print "-------", ve.getId().getFirst(), "-", ve.getId().getSecond()
|
||||
print("-------", ve.getId().getFirst(), "-", ve.getId().getSecond())
|
||||
eit.increment()
|
||||
return 0
|
||||
|
||||
@ -337,7 +337,7 @@ class pyHighViewMapGradientNormUP1D(UnaryPredicate1D):
|
||||
return "pyHighViewMapGradientNormUP1D"
|
||||
def __call__(self, inter):
|
||||
gn = self._GetGradient(inter)
|
||||
#print gn
|
||||
#print(gn)
|
||||
return (gn > self._threshold)
|
||||
|
||||
class pyDensityVariableSigmaUP1D(UnaryPredicate1D):
|
||||
@ -374,8 +374,8 @@ class pyClosedCurveUP1D(UnaryPredicate1D):
|
||||
itlast.decrement()
|
||||
vlast = itlast.getObject()
|
||||
v = it.getObject()
|
||||
print v.getId().getFirst(), v.getId().getSecond()
|
||||
print vlast.getId().getFirst(), vlast.getId().getSecond()
|
||||
print(v.getId().getFirst(), v.getId().getSecond())
|
||||
print(vlast.getId().getFirst(), vlast.getId().getSecond())
|
||||
if(v.getId() == vlast.getId()):
|
||||
return 1
|
||||
return 0
|
||||
|
||||
@ -45,7 +45,7 @@ class py2DCurvatureColorShader(StrokeShader):
|
||||
att = sv.attribute()
|
||||
c = func(it0D)
|
||||
if (c<0):
|
||||
print "negative 2D curvature"
|
||||
print("negative 2D curvature")
|
||||
color = 10.0 * c/3.1415
|
||||
att.setColor(color,color,color);
|
||||
it.increment()
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
from Blender.Freestyle import *
|
||||
from Blender.Mathutils import Vector
|
||||
from Freestyle import *
|
||||
from Mathutils import Vector
|
||||
|
||||
@ -522,7 +522,7 @@ class pyRandomColorShader(StrokeShader):
|
||||
c0 = float(uniform(15,75))/100.0
|
||||
c1 = float(uniform(15,75))/100.0
|
||||
c2 = float(uniform(15,75))/100.0
|
||||
print c0, c1, c2
|
||||
print(c0, c1, c2)
|
||||
it = stroke.strokeVerticesBegin()
|
||||
while(it.isEnd() == 0):
|
||||
it.getObject().attribute().setColor(c0,c1,c2)
|
||||
@ -542,9 +542,9 @@ class py2DCurvatureColorShader(StrokeShader):
|
||||
att = sv.attribute()
|
||||
c = func(toto)
|
||||
if (c<0):
|
||||
print "negative 2D curvature"
|
||||
print("negative 2D curvature")
|
||||
color = 10.0 * c/3.1415
|
||||
print color
|
||||
print(color)
|
||||
att.setColor(color,color,color);
|
||||
it.increment()
|
||||
|
||||
@ -750,7 +750,7 @@ class pyTipRemoverShader(StrokeShader):
|
||||
stroke.RemoveVertex(sv)
|
||||
stroke.Resample(originalSize)
|
||||
if(stroke.strokeVerticesSize() != originalSize):
|
||||
print "pyTipRemover: Warning: resampling problem"
|
||||
print("pyTipRemover: Warning: resampling problem")
|
||||
it = stroke.strokeVerticesBegin()
|
||||
for a in oldAttributes:
|
||||
if(it.isEnd() == 1):
|
||||
@ -765,14 +765,14 @@ class pyTVertexRemoverShader(StrokeShader):
|
||||
def shade(self, stroke):
|
||||
if(stroke.strokeVerticesSize() <= 3 ):
|
||||
return
|
||||
predTVertex = pyVertexNatureUP0D(Nature.T_VERTEX)
|
||||
predTVertex = pyVertexNatureUP0D(Nature.T_VERTEX)
|
||||
it = stroke.strokeVerticesBegin()
|
||||
itlast = stroke.strokeVerticesEnd()
|
||||
itlast.decrement()
|
||||
if(predTVertex(it) == 1):
|
||||
stroke.RemoveVertex(it.getObject())
|
||||
stroke.RemoveVertex(it.getObject())
|
||||
if(predTVertex(itlast) == 1):
|
||||
stroke.RemoveVertex(itlast.getObject())
|
||||
stroke.RemoveVertex(itlast.getObject())
|
||||
|
||||
class pyExtremitiesOrientationShader(StrokeShader):
|
||||
def __init__(self, x1,y1,x2=0,y2=0):
|
||||
@ -782,7 +782,7 @@ class pyExtremitiesOrientationShader(StrokeShader):
|
||||
def getName(self):
|
||||
return "pyExtremitiesOrientationShader"
|
||||
def shade(self, stroke):
|
||||
print self._v1.x,self._v1.y
|
||||
print(self._v1.x,self._v1.y)
|
||||
stroke.setBeginningOrientation(self._v1.x,self._v1.y)
|
||||
stroke.setEndingOrientation(self._v2.x,self._v2.y)
|
||||
|
||||
@ -858,7 +858,7 @@ class pyTVertexOrientationShader(StrokeShader):
|
||||
ve = getFEdge(v, it2.getObject()).viewedge()
|
||||
if(tv != None):
|
||||
dir = self.findOrientation(tv, ve)
|
||||
#print dir.x, dir.y
|
||||
#print(dir.x, dir.y)
|
||||
v.attribute().setAttributeVec2f("orientation", dir)
|
||||
while(it2.isEnd() == 0):
|
||||
vprevious = it.getObject()
|
||||
@ -868,7 +868,7 @@ class pyTVertexOrientationShader(StrokeShader):
|
||||
ve = getFEdge(vprevious, v).viewedge()
|
||||
if(tv != None):
|
||||
dir = self.findOrientation(tv, ve)
|
||||
#print dir.x, dir.y
|
||||
#print(dir.x, dir.y)
|
||||
v.attribute().setAttributeVec2f("orientation", dir)
|
||||
it.increment()
|
||||
it2.increment()
|
||||
@ -881,7 +881,7 @@ class pyTVertexOrientationShader(StrokeShader):
|
||||
ve = getFEdge(itPrevious.getObject(), v).viewedge()
|
||||
if(tv != None):
|
||||
dir = self.findOrientation(tv, ve)
|
||||
#print dir.x, dir.y
|
||||
#print(dir.x, dir.y)
|
||||
v.attribute().setAttributeVec2f("orientation", dir)
|
||||
|
||||
class pySinusDisplacementShader(StrokeShader):
|
||||
@ -897,13 +897,13 @@ class pySinusDisplacementShader(StrokeShader):
|
||||
it = stroke.strokeVerticesBegin()
|
||||
while it.isEnd() == 0:
|
||||
v = it.getObject()
|
||||
#print self._getNormal.getName()
|
||||
#print(self._getNormal.getName())
|
||||
n = self._getNormal(it.castToInterface0DIterator())
|
||||
p = v.getPoint()
|
||||
u = v.u()
|
||||
a = self._a*(1-2*(fabs(u-0.5)))
|
||||
n = n*a*cos(self._f*u*6.28)
|
||||
#print n.x, n.y
|
||||
#print(n.x, n.y)
|
||||
v.setPoint(p+n)
|
||||
#v.setPoint(v.getPoint()+n*a*cos(f*v.u()))
|
||||
it.increment()
|
||||
@ -968,10 +968,10 @@ class pyBluePrintCirclesShader(StrokeShader):
|
||||
it.increment()
|
||||
stroke.Resample(32 * self.__turns)
|
||||
sv_nb = stroke.strokeVerticesSize()
|
||||
# print "min :", p_min.x, p_min.y # DEBUG
|
||||
# print "mean :", p_sum.x, p_sum.y # DEBUG
|
||||
# print "max :", p_max.x, p_max.y # DEBUG
|
||||
# print "----------------------" # DEBUG
|
||||
# print("min :", p_min.x, p_min.y) # DEBUG
|
||||
# print("mean :", p_sum.x, p_sum.y) # DEBUG
|
||||
# print("max :", p_max.x, p_max.y) # DEBUG
|
||||
# print("----------------------") # DEBUG
|
||||
#######################################################
|
||||
sv_nb = sv_nb / self.__turns
|
||||
center = (p_min + p_max) / 2
|
||||
@ -986,7 +986,7 @@ class pyBluePrintCirclesShader(StrokeShader):
|
||||
i = 0
|
||||
while i < sv_nb:
|
||||
p_new.x = center.x + radius * cos(2 * pi * float(i) / float(sv_nb - 1))
|
||||
p_new.y = center.y + radius * sin(2 * pi * float(i) / float(sv_nb - 1))
|
||||
p_new.y = center.y + radius * sin(2 * pi * float(i) / float(sv_nb - 1))
|
||||
it.getObject().setPoint(p_new)
|
||||
i = i + 1
|
||||
it.increment()
|
||||
@ -1018,10 +1018,10 @@ class pyBluePrintEllipsesShader(StrokeShader):
|
||||
it.increment()
|
||||
stroke.Resample(32 * self.__turns)
|
||||
sv_nb = stroke.strokeVerticesSize()
|
||||
# print "min :", p_min.x, p_min.y # DEBUG
|
||||
# print "mean :", p_sum.x, p_sum.y # DEBUG
|
||||
# print "max :", p_max.x, p_max.y # DEBUG
|
||||
# print "----------------------" # DEBUG
|
||||
# print("min :", p_min.x, p_min.y) # DEBUG
|
||||
# print("mean :", p_sum.x, p_sum.y) # DEBUG
|
||||
# print("max :", p_max.x, p_max.y) # DEBUG
|
||||
# print("----------------------") # DEBUG
|
||||
#######################################################
|
||||
sv_nb = sv_nb / self.__turns
|
||||
center = (p_min + p_max) / 2
|
||||
@ -1038,7 +1038,7 @@ class pyBluePrintEllipsesShader(StrokeShader):
|
||||
i = 0
|
||||
while i < sv_nb:
|
||||
p_new.x = center.x + radius_x * cos(2 * pi * float(i) / float(sv_nb - 1))
|
||||
p_new.y = center.y + radius_y * sin(2 * pi * float(i) / float(sv_nb - 1))
|
||||
p_new.y = center.y + radius_y * sin(2 * pi * float(i) / float(sv_nb - 1))
|
||||
it.getObject().setPoint(p_new)
|
||||
i = i + 1
|
||||
it.increment()
|
||||
@ -1159,15 +1159,15 @@ class pyBluePrintDirectedSquaresShader(StrokeShader):
|
||||
p_var_xx = p_var_xx / sv_nb
|
||||
p_var_yy = p_var_yy / sv_nb
|
||||
p_var_xy = p_var_xy / sv_nb
|
||||
## print p_var_xx, p_var_yy, p_var_xy
|
||||
## print(p_var_xx, p_var_yy, p_var_xy)
|
||||
trace = p_var_xx + p_var_yy
|
||||
det = p_var_xx * p_var_yy - p_var_xy * p_var_xy
|
||||
sqrt_coeff = sqrt(trace * trace - 4 * det)
|
||||
lambda1 = (trace + sqrt_coeff) / 2
|
||||
lambda2 = (trace - sqrt_coeff) / 2
|
||||
## print lambda1, lambda2
|
||||
## print(lambda1, lambda2)
|
||||
theta = atan(2 * p_var_xy / (p_var_xx - p_var_yy)) / 2
|
||||
## print theta
|
||||
## print(theta)
|
||||
if p_var_yy > p_var_xx:
|
||||
e1 = Vector(cos(theta + pi / 2), sin(theta + pi / 2)) * sqrt(lambda1) * self.__mult
|
||||
e2 = Vector(cos(theta + pi), sin(theta + pi)) * sqrt(lambda2) * self.__mult
|
||||
@ -1261,12 +1261,12 @@ class pyDebugShader(StrokeShader):
|
||||
def getName(self):
|
||||
return "pyDebugShader"
|
||||
|
||||
def shade(self, stroke):
|
||||
def shade(self, stroke):
|
||||
fe = GetSelectedFEdgeCF()
|
||||
id1=fe.vertexA().getId()
|
||||
id2=fe.vertexB().getId()
|
||||
#print id1.getFirst(), id1.getSecond()
|
||||
#print id2.getFirst(), id2.getSecond()
|
||||
#print(id1.getFirst(), id1.getSecond())
|
||||
#print(id2.getFirst(), id2.getSecond())
|
||||
it = stroke.strokeVerticesBegin()
|
||||
found = 0
|
||||
foundfirst = 0
|
||||
@ -1282,5 +1282,4 @@ class pyDebugShader(StrokeShader):
|
||||
break
|
||||
it.increment()
|
||||
if(found != 0):
|
||||
print "The selected Stroke id is: ", stroke.getId().getFirst(), stroke.getId().getSecond()
|
||||
|
||||
print("The selected Stroke id is: ", stroke.getId().getFirst(), stroke.getId().getSecond())
|
||||
|
||||
@ -57,7 +57,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
|
||||
newFirst = p0+d1*float(self._l)
|
||||
v0.setPoint(newFirst)
|
||||
else:
|
||||
print "got a v0 cusp"
|
||||
print("got a v0 cusp")
|
||||
vn_1 = itn_1.getObject()
|
||||
vn = itn.getObject()
|
||||
if((vn.getNature() & Nature.CUSP == 0) and (vn_1.getNature() & Nature.CUSP == 0)):
|
||||
@ -68,7 +68,7 @@ class pyBackboneStretcherNoCuspShader(StrokeShader):
|
||||
newLast = pn+dn*float(self._l)
|
||||
vn.setPoint(newLast)
|
||||
else:
|
||||
print "got a vn cusp"
|
||||
print("got a vn cusp")
|
||||
|
||||
|
||||
Operators.select(QuantitativeInvisibilityUP1D(0))
|
||||
|
||||
@ -20,7 +20,7 @@ class pyDensityUP1D(UnaryPredicate1D):
|
||||
|
||||
def __call__(self, inter):
|
||||
d = self._func(inter)
|
||||
print "For Chain ", inter.getId().getFirst(), inter.getId().getSecond(), "density is ", d
|
||||
print("For Chain ", inter.getId().getFirst(), inter.getId().getSecond(), "density is ", d)
|
||||
if(d < self._threshold):
|
||||
return 1
|
||||
return 0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user