[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52901] branches/soc-2008-mxcurioni: Further fix for svn:eol-style.

Tamito Kajiyama rd6t-kjym at asahi-net.or.jp
Tue Dec 11 23:56:01 CET 2012


Revision: 52901
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52901
Author:   kjym3
Date:     2012-12-11 22:56:00 +0000 (Tue, 11 Dec 2012)
Log Message:
-----------
Further fix for svn:eol-style.

Modified Paths:
--------------
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU1D.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/shaders.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/freestyle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render_layer.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_linestyle_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c

Property Changed:
----------------
    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/Functions1D.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesB1D.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU0D.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/apriori_and_causal_density.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/apriori_density.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/backbone_stretcher.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/blueprint_circles.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/blueprint_ellipses.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/blueprint_squares.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/cartoon.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/contour.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/curvature2d.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/external_contour.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/external_contour_sketchy.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/external_contour_smooth.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/extra-lines.sml
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/freestyle_init.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/haloing.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/ignore_small_occlusions.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/invisible_lines.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/japanese_bigbrush.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/logical_operators.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/long_anisotropically_dense.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/multiple_parameterization.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/nature.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/near_lines.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/occluded_by_specific_object.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/parameter_editor.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/polygonalize.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/qi0.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/qi0_not_external_contour.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/qi1.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/qi2.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/sequentialsplit_sketchy.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/shaders.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/sketchy_multiple_parameterization.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/sketchy_topology_broken.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/sketchy_topology_preserved.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/split_at_highest_2d_curvatures.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/split_at_tvertices.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/stroke_texture.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/suggestive.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/thickness_fof_depth_discontinuity.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/tipremover.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/tvertex_remover.py
    branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/uniformpruning_zsort.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_operators/freestyle.py
    branches/soc-2008-mxcurioni/release/scripts/startup/bl_ui/properties_render_layer.py
    branches/soc-2008-mxcurioni/source/blender/blenkernel/BKE_linestyle.h
    branches/soc-2008-mxcurioni/source/blender/blenkernel/intern/linestyle.c
    branches/soc-2008-mxcurioni/source/blender/makesdna/DNA_linestyle_types.h
    branches/soc-2008-mxcurioni/source/blender/makesrna/intern/rna_linestyle.c


Property changes on: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/ChainingIterators.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/Functions0D.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/Functions1D.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesB1D.py
___________________________________________________________________
Added: svn:eol-style
   + native


Property changes on: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU0D.py
___________________________________________________________________
Added: svn:eol-style
   + native

Modified: branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU1D.py
===================================================================
--- branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU1D.py	2012-12-11 22:08:29 UTC (rev 52900)
+++ branches/soc-2008-mxcurioni/release/scripts/freestyle/style_modules/PredicatesU1D.py	2012-12-11 22:56:00 UTC (rev 52901)
@@ -1,381 +1,381 @@
-from freestyle_init import *
-from Functions1D import *
-
-count = 0
-class pyNFirstUP1D(UnaryPredicate1D):
-	def __init__(self, n):
-		UnaryPredicate1D.__init__(self)
-		self.__n = n
-	def __call__(self, inter):
-		global count
-		count = count + 1
-		if count <= self.__n:
-			return 1
-		return 0
-
-class pyHigherLengthUP1D(UnaryPredicate1D):
-	def __init__(self,l):
-		UnaryPredicate1D.__init__(self)
-		self._l = l
-			
-	def getName(self):
-		return "HigherLengthUP1D"
-
-	def __call__(self, inter):
-		return (inter.getLength2D() > self._l)
-
-class pyNatureUP1D(UnaryPredicate1D):
-	def __init__(self,nature):
-		UnaryPredicate1D.__init__(self)
-		self._nature = nature
-		self._getNature = CurveNatureF1D()
-			
-	def getName(self):
-		return "pyNatureUP1D"
-
-	def __call__(self, inter):
-		if(self._getNature(inter) & self._nature):
-			return 1
-		return 0
-
-class pyHigherNumberOfTurnsUP1D(UnaryPredicate1D):
-	def __init__(self,n,a):
-		UnaryPredicate1D.__init__(self)
-		self._n = n
-		self._a = a
-
-	def getName(self):
-		return "HigherNumberOfTurnsUP1D"
-
-	def __call__(self, inter):
-		count = 0
-		func = Curvature2DAngleF0D()
-		it = inter.verticesBegin()
-		while(it.isEnd() == 0):
-			if(func(it) > self._a):
-				count = count+1
-			if(count > self._n):
-				return 1
-			it.increment()
-		return 0
-
-class pyDensityUP1D(UnaryPredicate1D):
-	def __init__(self,wsize,threshold, integration = IntegrationType.MEAN, sampling=2.0):
-		UnaryPredicate1D.__init__(self)
-		self._wsize = wsize
-		self._threshold = threshold
-		self._integration = integration
-		self._func = DensityF1D(self._wsize, self._integration, sampling)
-			
-	def getName(self):
-		return "pyDensityUP1D"
-
-	def __call__(self, inter):
-		if(self._func(inter) < self._threshold):
-			return 1
-		return 0
-
-class pyLowSteerableViewMapDensityUP1D(UnaryPredicate1D):
-	def __init__(self,threshold, level,integration = IntegrationType.MEAN):
-		UnaryPredicate1D.__init__(self)
-		self._threshold = threshold
-		self._level = level
-		self._integration = integration
-			
-	def getName(self):
-		return "pyLowSteerableViewMapDensityUP1D"
-
-	def __call__(self, inter):
-		func = GetSteerableViewMapDensityF1D(self._level, self._integration)
-		v = func(inter)
-		print(v)
-		if(v < self._threshold):
-			return 1
-		return 0
-
-class pyLowDirectionalViewMapDensityUP1D(UnaryPredicate1D):
-	def __init__(self,threshold, orientation, level,integration = IntegrationType.MEAN):
-		UnaryPredicate1D.__init__(self)
-		self._threshold = threshold
-		self._orientation = orientation
-		self._level = level
-		self._integration = integration
-			
-	def getName(self):
-		return "pyLowDirectionalViewMapDensityUP1D"
-
-	def __call__(self, inter):
-		func = GetDirectionalViewMapDensityF1D(self._orientation, self._level, self._integration)
-		v = func(inter)
-		#print(v)
-		if(v < self._threshold):
-			return 1
-		return 0
-
-class pyHighSteerableViewMapDensityUP1D(UnaryPredicate1D):
-	def __init__(self,threshold, level,integration = IntegrationType.MEAN):
-		UnaryPredicate1D.__init__(self)
-		self._threshold = threshold
-		self._level = level
-		self._integration = integration
-		self._func = GetSteerableViewMapDensityF1D(self._level, self._integration)	
-	def getName(self):
-		return "pyHighSteerableViewMapDensityUP1D"
-
-	def __call__(self, inter):
-		
-		v = self._func(inter)
-		if(v > self._threshold):
-			return 1
-		return 0
-
-class pyHighDirectionalViewMapDensityUP1D(UnaryPredicate1D):
-	def __init__(self,threshold, orientation, level,integration = IntegrationType.MEAN, sampling=2.0):
-		UnaryPredicate1D.__init__(self)
-		self._threshold = threshold
-		self._orientation = orientation
-		self._level = level
-		self._integration = integration
-		self._sampling = sampling		
-	def getName(self):
-		return "pyLowDirectionalViewMapDensityUP1D"
-
-	def __call__(self, inter):
-		func = GetDirectionalViewMapDensityF1D(self._orientation, self._level, self._integration, self._sampling)
-		v = func(inter)
-		if(v > self._threshold):
-			return 1
-		return 0
-
-class pyHighViewMapDensityUP1D(UnaryPredicate1D):
-	def __init__(self,threshold, level,integration = IntegrationType.MEAN, sampling=2.0):
-		UnaryPredicate1D.__init__(self)
-		self._threshold = threshold
-		self._level = level
-		self._integration = integration
-		self._sampling = sampling
-		self._func = GetCompleteViewMapDensityF1D(self._level, self._integration, self._sampling) # 2.0 is the smpling
-			
-	def getName(self):
-		return "pyHighViewMapDensityUP1D"
-
-	def __call__(self, inter):
-		#print("toto")
-		#print(func.getName())
-		#print(inter.getExactTypeName())
-		v= self._func(inter)
-		if(v > self._threshold):
-			return 1
-		return 0
-
-class pyDensityFunctorUP1D(UnaryPredicate1D):
-	def __init__(self,wsize,threshold, functor, funcmin=0.0, funcmax=1.0, integration = IntegrationType.MEAN):
-		UnaryPredicate1D.__init__(self)
-		self._wsize = wsize
-		self._threshold = float(threshold)
-		self._functor = functor
-		self._funcmin = float(funcmin)
-		self._funcmax = float(funcmax)
-		self._integration = integration
-			
-	def getName(self):
-		return "pyDensityFunctorUP1D"
-
-	def __call__(self, inter):
-		func = DensityF1D(self._wsize, self._integration)
-		res = self._functor(inter)
-		k = (res-self._funcmin)/(self._funcmax-self._funcmin)
-		if(func(inter) < self._threshold*k):
-			return 1
-		return 0
-
-class pyZSmallerUP1D(UnaryPredicate1D):
-	def __init__(self,z, integration=IntegrationType.MEAN):
-		UnaryPredicate1D.__init__(self)
-		self._z = z
-		self._integration = integration
-	def getName(self):
-		return "pyZSmallerUP1D"
-
-	def __call__(self, inter):
-		func = GetProjectedZF1D(self._integration)
-		if(func(inter) < self._z):
-			return 1
-		return 0
-
-class pyIsOccludedByUP1D(UnaryPredicate1D):
-	def __init__(self,id):
-		UnaryPredicate1D.__init__(self)
-		self._id = id
-	def getName(self):
-		return "pyIsOccludedByUP1D"
-	def __call__(self, inter):
-		func = GetShapeF1D()
-		shapes = func(inter)
-		for s in shapes:
-			if(s.getId() == self._id):
-				return 0
-		it = inter.verticesBegin()
-		itlast = inter.verticesEnd()
-		itlast.decrement()
-		v =  it.getObject()
-		vlast = itlast.getObject()
-		tvertex = v.viewvertex()
-		if type(tvertex) is TVertex:
-			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())
-				eit.increment()
-		tvertex = vlast.viewvertex()
-		if type(tvertex) is TVertex:
-			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())
-				eit.increment()
-		return 0
-
-class pyIsInOccludersListUP1D(UnaryPredicate1D):
-	def __init__(self,id):
-		UnaryPredicate1D.__init__(self)
-		self._id = id
-	def getName(self):
-		return "pyIsInOccludersListUP1D"
-	def __call__(self, inter):
-		func = GetOccludersF1D()
-		occluders = func(inter)
-		for a in occluders:
-			if(a.getId() == self._id):
-				return 1
-		return 0
-
-class pyIsOccludedByItselfUP1D(UnaryPredicate1D):
-	def __init__(self):
-		UnaryPredicate1D.__init__(self)
-		self.__func1 = GetOccludersF1D()
-		self.__func2 = GetShapeF1D()
-	def getName(self):
-		return "pyIsOccludedByItselfUP1D"
-	def __call__(self, inter):
-		lst1 = self.__func1(inter)
-		lst2 = self.__func2(inter)
-		for vs1 in lst1:
-			for vs2 in lst2:
-				if vs1.getId() == vs2.getId():
-					return 1
-		return 0
-
-class pyIsOccludedByIdListUP1D(UnaryPredicate1D):
-	def __init__(self, idlist):
-		UnaryPredicate1D.__init__(self)
-		self._idlist = idlist
-		self.__func1 = GetOccludersF1D()
-	def getName(self):
-		return "pyIsOccludedByIdListUP1D"
-	def __call__(self, inter):
-		lst1 = self.__func1(inter)
-		for vs1 in lst1:
-			for id in self._idlist:
-				if vs1.getId() == id:
-					return 1
-		return 0
-
-class pyShapeIdListUP1D(UnaryPredicate1D):
-	def __init__(self,idlist):
-		UnaryPredicate1D.__init__(self)
-		self._idlist = idlist
-		self._funcs = []
-		for id in idlist :
-			self._funcs.append(ShapeUP1D(id.getFirst(), id.getSecond()))
-		
-	def getName(self):
-		return "pyShapeIdUP1D"
-	def __call__(self, inter):
-		for func in self._funcs :
-			if(func(inter) == 1) :
-				return 1
-		return 0
-
-## deprecated
-class pyShapeIdUP1D(UnaryPredicate1D):
-	def __init__(self,id):
-		UnaryPredicate1D.__init__(self)
-		self._id = id
-	def getName(self):
-		return "pyShapeIdUP1D"
-	def __call__(self, inter):
-		func = GetShapeF1D()
-		shapes = func(inter)
-		for a in shapes:
-			if(a.getId() == self._id):
-				return 1
-		return 0
-
-class pyHighDensityAnisotropyUP1D(UnaryPredicate1D):
-	def __init__(self,threshold, level, sampling=2.0):
-		UnaryPredicate1D.__init__(self)
-		self._l = threshold

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list