[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [21947] branches/soc-2008-mxcurioni/ release/scripts/freestyle/style_modules: * freestyle_init.py: Removed all classes for wrapping extension types.
Tamito Kajiyama
rd6t-kjym at asahi-net.or.jp
Mon Jul 27 22:13:47 CEST 2009
Revision: 21947
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=21947
Author: kjym3
Date: 2009-07-27 22:13:47 +0200 (Mon, 27 Jul 2009)
Log Message:
-----------
* freestyle_init.py: Removed all classes for wrapping extension types.
This allows users to test the types of those objects that are returned
by API functions, by means of usual Python idioms such as "type(I) is T"
and "isinstance(I, T)".
* Removed all occurrences of ViewVertex::castToTVertex() in the following
modules and rewrote the code segments using it by means of the "type(I)
is T" idiom mentioned above:
ChainingIterators.py
PredicatesU1D.py
* Replaced all occurrences of vector.Vec2, vector.Vec3, Vec2f and Vec3f
by Blender.Mathutils.Vector in the following modules:
anisotropic_diffusion.py
Functions0D.py
shaders.py
sketchy_topology_broken.py
* shaders.py: Fixed NameError's concerning math.pow().
* shaders.py: Added a Python equivalent of getFEdge function, defined
in source\blender\freestyle\intern\view_map\Functions0D.cpp as follows:
FEdge* Functions0D::getFEdge(Interface0D& it1, Interface0D& it2) {
return it1.getFEdge(it2);
}
* shaders.py: Replaced fe.qi() by fe.viewedge().qi().
* contour.py: Fixed the import statement for freestyle_init.py.
Modified Paths:
--------------
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/ChainingIterators.py
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/Functions0D.py
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU1D.py
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/anisotropic_diffusion.py
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/contour.py
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/freestyle_init.py
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/shaders.py
branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/sketchy_topology_broken.py
Modified: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/ChainingIterators.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/ChainingIterators.py 2009-07-27 19:34:52 UTC (rev 21946)
+++ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/ChainingIterators.py 2009-07-27 20:13:47 UTC (rev 21947)
@@ -42,9 +42,8 @@
def traverse(self, iter):
winner = None
it = AdjacencyIterator(iter)
- nextVertex = self.getVertex()
- if(nextVertex.getNature() & Nature.T_VERTEX != 0):
- tvertex = nextVertex.castToTVertex()
+ tvertex = self.getVertex()
+ if type(tvertex) is TVertex:
mateVE = tvertex.mate(self.getCurrentEdge())
while(it.isEnd() == 0):
ve = it.getObject()
@@ -95,9 +94,8 @@
def traverse(self, iter):
winner = None
it = AdjacencyIterator(iter)
- nextVertex = self.getVertex()
- if(nextVertex.getNature() & Nature.T_VERTEX != 0):
- tvertex = nextVertex.castToTVertex()
+ tvertex = self.getVertex()
+ if type(tvertex) is TVertex:
mateVE = tvertex.mate(self.getCurrentEdge())
while(it.isEnd() == 0):
ve = it.getObject()
@@ -198,9 +196,8 @@
def traverse(self, iter):
winner = None
it = AdjacencyIterator(iter)
- nextVertex = self.getVertex()
- if(nextVertex.getNature() & Nature.T_VERTEX != 0):
- tvertex = nextVertex.castToTVertex()
+ tvertex = self.getVertex()
+ if type(tvertex) is TVertex:
mateVE = tvertex.mate(self.getCurrentEdge())
while(it.isEnd() == 0):
ve = it.getObject()
@@ -295,9 +292,8 @@
winnerOrientation = 0
print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
it = AdjacencyIterator(iter)
- nextVertex = self.getVertex()
- if(nextVertex.getNature() & Nature.T_VERTEX != 0):
- tvertex = nextVertex.castToTVertex()
+ tvertex = self.getVertex()
+ if type(tvertex) is TVertex:
mateVE = tvertex.mate(self.getCurrentEdge())
while(it.isEnd() == 0):
ve = it.getObject()
@@ -395,9 +391,8 @@
winnerOrientation = 0
#print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
it = AdjacencyIterator(iter)
- nextVertex = self.getVertex()
- if(nextVertex.getNature() & Nature.T_VERTEX != 0):
- tvertex = nextVertex.castToTVertex()
+ tvertex = self.getVertex()
+ if type(tvertex) is TVertex:
mateVE = tvertex.mate(self.getCurrentEdge())
while(it.isEnd() == 0):
ve = it.getObject()
@@ -471,9 +466,8 @@
winnerOrientation = 0
print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
it = AdjacencyIterator(iter)
- nextVertex = self.getVertex()
- if(nextVertex.getNature() & Nature.T_VERTEX != 0):
- tvertex = nextVertex.castToTVertex()
+ tvertex = self.getVertex()
+ if type(tvertex) is TVertex:
mateVE = tvertex.mate(self.getCurrentEdge())
while(it.isEnd() == 0):
ve = it.getObject()
@@ -577,9 +571,8 @@
winnerOrientation = 0
print self.getCurrentEdge().getId().getFirst(), self.getCurrentEdge().getId().getSecond()
it = AdjacencyIterator(iter)
- nextVertex = self.getVertex()
- if(nextVertex.getNature() & Nature.T_VERTEX != 0):
- tvertex = nextVertex.castToTVertex()
+ tvertex = self.getVertex()
+ if type(tvertex) is TVertex:
mateVE = tvertex.mate(self.getCurrentEdge())
while(it.isEnd() == 0):
ve = it.getObject()
@@ -676,9 +669,8 @@
def traverse(self, iter):
winner = None
it = AdjacencyIterator(iter)
- nextVertex = self.getVertex()
- if(nextVertex.getNature() & Nature.T_VERTEX != 0):
- tvertex = nextVertex.castToTVertex()
+ tvertex = self.getVertex()
+ if type(tvertex) is TVertex:
mateVE = tvertex.mate(self.getCurrentEdge())
while(it.isEnd() == 0):
ve = it.getObject()
Modified: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/Functions0D.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/Functions0D.py 2009-07-27 19:34:52 UTC (rev 21946)
+++ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/Functions0D.py 2009-07-27 20:13:47 UTC (rev 21947)
@@ -62,7 +62,7 @@
p = iter.getObject().getPoint2D()
gx = ReadCompleteViewMapPixelCF(self._l, int(p.x()+self._step), int(p.y()))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
gy = ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()+self._step))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
- return Vec2f(gx, gy)
+ return Vector(gx, gy)
class pyViewMapGradientNormF0D(UnaryFunction0DDouble):
def __init__(self, l):
@@ -75,7 +75,7 @@
p = iter.getObject().getPoint2D()
gx = ReadCompleteViewMapPixelCF(self._l, int(p.x()+self._step), int(p.y()))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
gy = ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()+self._step))- ReadCompleteViewMapPixelCF(self._l, int(p.x()), int(p.y()))
- grad = Vec2f(gx, gy)
- return grad.norm()
+ grad = Vector(gx, gy)
+ return grad.length
Modified: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU1D.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU1D.py 2009-07-27 19:34:52 UTC (rev 21946)
+++ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU1D.py 2009-07-27 20:13:47 UTC (rev 21947)
@@ -220,25 +220,25 @@
itlast.decrement()
v = it.getObject()
vlast = itlast.getObject()
- tvertex = v.castToTVertex()
- if(tvertex != None):
- #print "TVertex: [ ", tvertex.getId().getFirst(), ",", tvertex.getId().getSecond()," ]"
+ tvertex = v.viewvertex()
+ if type(tvertex) is TVertex:
+ print "TVertex: [ ", tvertex.getId().getFirst(), ",", tvertex.getId().getSecond()," ]"
eit = tvertex.edgesBegin()
while(eit.isEnd() == 0):
- ve = eit.getObject().first
- if(ve.shape_id() == self._id):
+ 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.castToTVertex()
- if(tvertex != None):
- #print "TVertex: [ ", tvertex.getId().getFirst(), ",", tvertex.getId().getSecond()," ]"
+ tvertex = vlast.viewvertex()
+ if type(tvertex) is TVertex:
+ print "TVertex: [ ", tvertex.getId().getFirst(), ",", tvertex.getId().getSecond()," ]"
eit = tvertex.edgesBegin()
while(eit.isEnd() == 0):
- ve = eit.getObject().first
- if(ve.shape_id() == self._id):
+ 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
Modified: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/anisotropic_diffusion.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/anisotropic_diffusion.py 2009-07-27 19:34:52 UTC (rev 21946)
+++ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/anisotropic_diffusion.py 2009-07-27 20:13:47 UTC (rev 21947)
@@ -29,7 +29,6 @@
from logical_operators import *
from PredicatesB1D import *
from shaders import *
-from vector import *
from PredicatesU0D import *
from math import *
Modified: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/contour.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/contour.py 2009-07-27 19:34:52 UTC (rev 21946)
+++ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/contour.py 2009-07-27 20:13:47 UTC (rev 21947)
@@ -25,7 +25,7 @@
#
#############################################################################
-import freestyle_init
+from freestyle_init import *
from logical_operators import *
from PredicatesB1D import *
from PredicatesU1D import *
Modified: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/freestyle_init.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/freestyle_init.py 2009-07-27 19:34:52 UTC (rev 21946)
+++ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/freestyle_init.py 2009-07-27 20:13:47 UTC (rev 21947)
@@ -1,460 +1,2 @@
+from Blender.Freestyle import *
from Blender.Mathutils import Vector
-import Blender.Freestyle
-
-class BBox(Blender.Freestyle.BBox):
- pass
-
-class BinaryPredicate0D(Blender.Freestyle.BinaryPredicate0D):
- pass
-
-class BinaryPredicate1D(Blender.Freestyle.BinaryPredicate1D):
- pass
-
-class FrsMaterial(Blender.Freestyle.FrsMaterial):
- pass
-
-class Id(Blender.Freestyle.Id):
- pass
-
-class IntegrationType(Blender.Freestyle.IntegrationType):
- pass
-
-class Interface0D(Blender.Freestyle.Interface0D):
- pass
-
-class Interface1D(Blender.Freestyle.Interface1D):
- pass
-
-class Iterator(Blender.Freestyle.Iterator):
- pass
-
-class MediumType(Blender.Freestyle.MediumType):
- pass
-
-class Nature(Blender.Freestyle.Nature):
- pass
-
-class FrsNoise(Blender.Freestyle.FrsNoise):
- pass
-
-class Operators(Blender.Freestyle.Operators):
- pass
-
-class SShape(Blender.Freestyle.SShape):
- pass
-
-class StrokeAttribute(Blender.Freestyle.StrokeAttribute):
- pass
-
-class StrokeShader(Blender.Freestyle.StrokeShader):
- def getName(self):
- return self.__class__.__name__
-
-class UnaryFunction0D(Blender.Freestyle.UnaryFunction0D):
- pass
-
-class UnaryFunction1D(Blender.Freestyle.UnaryFunction1D):
- pass
-
-class UnaryPredicate0D(Blender.Freestyle.UnaryPredicate0D):
- pass
-
-class UnaryPredicate1D(Blender.Freestyle.UnaryPredicate1D):
- pass
-
-class ViewMap(Blender.Freestyle.ViewMap):
- pass
-
-class ViewShape(Blender.Freestyle.ViewShape):
- pass
-
-class FalseBP1D(Blender.Freestyle.FalseBP1D):
- pass
-
-class Length2DBP1D(Blender.Freestyle.Length2DBP1D):
- pass
-
-class SameShapeIdBP1D(Blender.Freestyle.SameShapeIdBP1D):
- pass
-
-class TrueBP1D(Blender.Freestyle.TrueBP1D):
- pass
-
-class ViewMapGradientNormBP1D(Blender.Freestyle.ViewMapGradientNormBP1D):
- pass
-
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list