[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2865] contrib/py/scripts/addons: tabs -> spaces

Campbell Barton ideasman42 at gmail.com
Wed Jan 4 05:30:32 CET 2012


Revision: 2865
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2865
Author:   campbellbarton
Date:     2012-01-04 04:30:31 +0000 (Wed, 04 Jan 2012)
Log Message:
-----------
tabs -> spaces

Modified Paths:
--------------
    contrib/py/scripts/addons/curve_tools.py
    contrib/py/scripts/addons/mesh_seam_from_uv_isles.py

Modified: contrib/py/scripts/addons/curve_tools.py
===================================================================
--- contrib/py/scripts/addons/curve_tools.py	2012-01-04 04:27:00 UTC (rev 2864)
+++ contrib/py/scripts/addons/curve_tools.py	2012-01-04 04:30:31 UTC (rev 2865)
@@ -17,21 +17,21 @@
 # #####END GPL LICENSE BLOCK #####
 
 bl_info = {
-	"name": "Curve Tools",
-	"author": "Zak",
-	"version": (0, 1, 5),
-	"blender": (2, 5, 9),
-	"api": 39685,
-	"location": "Properties > Object data",
-	"description": "Creates driven Lofts or Birails between curves",
-	"warning": "",
+    "name": "Curve Tools",
+    "author": "Zak",
+    "version": (0, 1, 5),
+    "blender": (2, 5, 9),
+    "api": 39685,
+    "location": "Properties > Object data",
+    "description": "Creates driven Lofts or Birails between curves",
+    "warning": "",
     "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\
         "Scripts/Curve/Curve_Tools",
     "tracker_url": "https://projects.blender.org/tracker/index.php?"\
         "func=detail&aid=27720",
-	"category": "Add Curve"}
+    "category": "Add Curve"}
 
-### UPDATES 
+### UPDATES
 #1.5
 
 #-Fixed birail function
@@ -60,7 +60,7 @@
 
 ### PROPERTIES
 class sprops(bpy.types.PropertyGroup):
-	pass
+    pass
 
 
 bpy.utils.register_class(sprops)
@@ -70,7 +70,7 @@
 
 
 #dodriver a simple checker to chosse whether  you want a driven mesh or not.
-bpy.types.Scene.dodriver = BoolProperty(name = "dodriver",										default=False)
+bpy.types.Scene.dodriver = BoolProperty(name = "dodriver",                                      default=False)
 
 #interpolation types
 myitems = (('0','Linear', ''),('1','Cubic',''),('2','Catmull',''), ('3','Hermite',''))
@@ -84,278 +84,278 @@
 bpy.types.Scene.tension = FloatProperty(name = "tension", min=0.0, default=0.0)
 bpy.types.Scene.bias = FloatProperty(name = "bias", min=0.0, default = 0.5)
 
-#proportional birail 
+#proportional birail
 bpy.types.Scene.proportional = BoolProperty(name="proportional", default=False)
 
 #this stores the result of calculating the curve length
 bpy.types.Scene.clen = FloatProperty(name="clen", default=0.0, precision=5)
 
 #minimun distance for merge curve tool
-bpy.types.Scene.limit = FloatProperty(name="limit",	default=0.1, precision=3)
-								
+bpy.types.Scene.limit = FloatProperty(name="limit", default=0.1, precision=3)
 
+
 ### SELECT BY ORDER BLOCK
 
 #i dont know what to do with this. Im not using it yet.
 def selected_points(curve):
-	
-	selp = []
-	for spl in curve.splines:
-		if spl.type=="BEZIER":
-			points = spl.bezier_points
-			for p in points:
-				if p.select_control_point:
-					selp.append(p)
-					
-		elif spl.type=="NURBS":
-			points = spl.points
-			for p in points:
-				if p.select:
-					selp.append(p)
-	return selp
-			
+
+    selp = []
+    for spl in curve.splines:
+        if spl.type=="BEZIER":
+            points = spl.bezier_points
+            for p in points:
+                if p.select_control_point:
+                    selp.append(p)
+
+        elif spl.type=="NURBS":
+            points = spl.points
+            for p in points:
+                if p.select:
+                    selp.append(p)
+    return selp
+
 #writes bpy.selection when a new object is selected or deselected
 #it compares bpy.selection with bpy.context.selected_objects
-	
+
 def select():
-	
-	#print(bpy.context.mode)
-	if bpy.context.mode=="OBJECT":
-		obj = bpy.context.object
-		sel = len(bpy.context.selected_objects)
-		
-		if sel==0:
-			bpy.selection=[]
-		else:
-			if sel==1:
-				bpy.selection=[]
-				bpy.selection.append(obj)
-			elif sel>len(bpy.selection):
-				for sobj in bpy.context.selected_objects:
-					if (sobj in bpy.selection)==False:
-						bpy.selection.append(sobj)
-			
-			elif sel<len(bpy.selection):
-				for it in bpy.selection:
-					if (it in bpy.context.selected_objects)==False:
-						bpy.selection.remove(it)		
 
-	#on edit mode doesnt work well
-	
+    #print(bpy.context.mode)
+    if bpy.context.mode=="OBJECT":
+        obj = bpy.context.object
+        sel = len(bpy.context.selected_objects)
 
+        if sel==0:
+            bpy.selection=[]
+        else:
+            if sel==1:
+                bpy.selection=[]
+                bpy.selection.append(obj)
+            elif sel>len(bpy.selection):
+                for sobj in bpy.context.selected_objects:
+                    if (sobj in bpy.selection)==False:
+                        bpy.selection.append(sobj)
+
+            elif sel<len(bpy.selection):
+                for it in bpy.selection:
+                    if (it in bpy.context.selected_objects)==False:
+                        bpy.selection.remove(it)
+
+    #on edit mode doesnt work well
+
+
 #executes selection by order at 3d view
 class Selection(bpy.types.Header):
-	bl_label = "Selection"
-	bl_space_type = "VIEW_3D"
-	
-	def __init__(self):
-		#print("hey")
-		select()
+    bl_label = "Selection"
+    bl_space_type = "VIEW_3D"
 
-	def draw(self, context):
-		layout = self.layout
-		row = layout.row()
-		row.label("Sel: "+str(len(bpy.selection)))
+    def __init__(self):
+        #print("hey")
+        select()
 
+    def draw(self, context):
+        layout = self.layout
+        row = layout.row()
+        row.label("Sel: "+str(len(bpy.selection)))
+
 ### GENERAL CURVE FUNCTIONS
 
 #distance between 2 points
 def dist(p1, p2):
-	return (p2-p1).magnitude
+    return (p2-p1).magnitude
 
-#sets cursors position for debugging porpuses 
+#sets cursors position for debugging porpuses
 def cursor(pos):
-	bpy.context.scene.cursor_location = pos
-	
+    bpy.context.scene.cursor_location = pos
+
 #cuadratic bezier value
 def quad(p, t):
-	return p[0]*(1.0-t)**2.0 + 2.0*t*p[1]*(1.0-t) + p[2]*t**2.0
+    return p[0]*(1.0-t)**2.0 + 2.0*t*p[1]*(1.0-t) + p[2]*t**2.0
 
 #cubic bezier value
 def cubic(p, t):
-	return p[0]*(1.0-t)**3.0 + 3.0*p[1]*t*(1.0-t)**2.0 + 3.0*p[2]*(t**2.0)*(1.0-t) + p[3]*t**3.0
+    return p[0]*(1.0-t)**3.0 + 3.0*p[1]*t*(1.0-t)**2.0 + 3.0*p[2]*(t**2.0)*(1.0-t) + p[3]*t**3.0
 
 #gets a bezier segment's control points on global coordinates
 def getbezpoints(spl, mt, seg=0):
-	points = spl.bezier_points
-	p0 = mt * points[seg].co
-	p1 = mt * points[seg].handle_right
-	p2 = mt * points[seg+1].handle_left
-	p3 = mt * points[seg+1].co
-	return p0, p1, p2, p3
+    points = spl.bezier_points
+    p0 = mt * points[seg].co
+    p1 = mt * points[seg].handle_right
+    p2 = mt * points[seg+1].handle_left
+    p3 = mt * points[seg+1].co
+    return p0, p1, p2, p3
 
 #gets nurbs polygon control points on global coordinates
 def getnurbspoints(spl, mw):
-	pts = []
-	ws = []
-	for p in spl.points:
-		v = Vector(p.co[0:3])*mw
-		pts.append(v)
-		ws.append(p.weight)
-	return pts , ws
+    pts = []
+    ws = []
+    for p in spl.points:
+        v = Vector(p.co[0:3])*mw
+        pts.append(v)
+        ws.append(p.weight)
+    return pts , ws
 
 #calcs a nurbs knot vector
 def knots(n, order, type=0):#0 uniform 1 endpoints 2 bezier
-	
-	kv = []
-	
-	t = n+order
-	if type==0:
-		for i in range(0, t):
-			kv.append(1.0*i)
 
-	elif type==1:
-		k=0.0
-		for i in range(1, t+1):
-			kv.append(k)
-			if i>=order and i<=n:
-				k+=1.0
-	elif type==2:
-		if order==4:
-			k=0.34
-			for a in range(0,t):
-				if a>=order and a<=n: k+=0.5
-				kv.append(floor(k))
-				k+=1.0/3.0
-	
-		elif order==3:
-			k=0.6
-			for a in range(0, t):
-				if a >=order and a<=n: k+=0.5
-				kv.append(floor(k))	
-	
-	##normalize the knot vector
-	for i in range(0, len(kv)):
-		kv[i]=kv[i]/kv[-1]
-		
-	return kv
+    kv = []
 
+    t = n+order
+    if type==0:
+        for i in range(0, t):
+            kv.append(1.0*i)
+
+    elif type==1:
+        k=0.0
+        for i in range(1, t+1):
+            kv.append(k)
+            if i>=order and i<=n:
+                k+=1.0
+    elif type==2:
+        if order==4:
+            k=0.34
+            for a in range(0,t):
+                if a>=order and a<=n: k+=0.5
+                kv.append(floor(k))
+                k+=1.0/3.0
+
+        elif order==3:
+            k=0.6
+            for a in range(0, t):
+                if a >=order and a<=n: k+=0.5
+                kv.append(floor(k))
+
+    ##normalize the knot vector
+    for i in range(0, len(kv)):
+        kv[i]=kv[i]/kv[-1]
+
+    return kv
+
 #nurbs curve evaluation
 def C(t, order, points, weights, knots):
-	#c = Point([0,0,0])
-	c = Vector()
-	rational = 0
-	i = 0
-	while i < len(points):
-		b = B(i, order, t, knots)
-		p = points[i] * (b * weights[i])
-		c = c + p
-		rational = rational + b*weights[i]
-		i = i + 1
-		
-	return c * (1.0/rational)
+    #c = Point([0,0,0])
+    c = Vector()
+    rational = 0
+    i = 0
+    while i < len(points):
+        b = B(i, order, t, knots)
+        p = points[i] * (b * weights[i])
+        c = c + p
+        rational = rational + b*weights[i]
+        i = i + 1
 
+    return c * (1.0/rational)
+
 #nurbs basis function
 def B(i,k,t,knots):
-	ret = 0
-	if k>0:
-		n1 = (t-knots[i])*B(i,k-1,t,knots)
-		d1 = knots[i+k] - knots[i]
-		n2 = (knots[i+k+1] - t) * B(i+1,k-1,t,knots)
-		d2 = knots[i+k+1] - knots[i+1]
-		if d1 > 0.0001 or d1 < -0.0001:
-			a = n1 / d1
-		else:
-			a = 0
-		if d2 > 0.0001 or d2 < -0.0001:
-			b = n2 / d2
-		else:
-			b = 0
-		ret = a + b
-		#print "B i = %d, k = %d, ret = %g, a = %g, b = %g\n"%(i,k,ret,a,b)
-	else:
-		if knots[i] <= t and t <= knots[i+1]:
-			ret = 1
-		else:
-			ret = 0
-	return ret
+    ret = 0
+    if k>0:
+        n1 = (t-knots[i])*B(i,k-1,t,knots)
+        d1 = knots[i+k] - knots[i]
+        n2 = (knots[i+k+1] - t) * B(i+1,k-1,t,knots)
+        d2 = knots[i+k+1] - knots[i+1]
+        if d1 > 0.0001 or d1 < -0.0001:
+            a = n1 / d1
+        else:
+            a = 0
+        if d2 > 0.0001 or d2 < -0.0001:
+            b = n2 / d2
+        else:
+            b = 0
+        ret = a + b
+        #print "B i = %d, k = %d, ret = %g, a = %g, b = %g\n"%(i,k,ret,a,b)
+    else:
+        if knots[i] <= t and t <= knots[i+1]:
+            ret = 1
+        else:
+            ret = 0
+    return ret
 
 #calculates a global parameter t along all control points
 #t=0 begining of the curve
 #t=1 ending of the curve
 
 def calct(obj, t):
-	
-	spl=None
-	mw = obj.matrix_world
-	if obj.data.splines.active==None:
-		if len(obj.data.splines)>0:
-			spl=obj.data.splines[0]
-	else:
-		spl = obj.data.splines.active
-	
-	if spl==None:
-		return False
-	
-	if spl.type=="BEZIER":
-		points = spl.bezier_points
-		nsegs = len(points)-1
-		
-		d = 1.0/nsegs
-		seg = int(t/d)
-		t1 = t/d - int(t/d)
-		
-		if t==1:
-			seg-=1
-			t1 = 1.0
-		

@@ Diff output truncated at 10240 characters. @@


More information about the Bf-extensions-cvs mailing list