diff options
author | Campbell Barton <ideasman42@gmail.com> | 2009-05-22 07:45:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2009-05-22 07:45:46 +0400 |
commit | 612f3b326662498207e6e051feeceaac81e09343 (patch) | |
tree | cc2da1784826266a9cf16cf29df03f14c117d81a /release/scripts/uvcalc_smart_project.py | |
parent | e191618cb5906ad50c7b6a75f52ad54cc6a812f7 (diff) |
Removed use of CrossVecs, DotVecs, CrossQuats and DotQuats
for all scripts except import_dxf and colladaImEx/translator.py
Diffstat (limited to 'release/scripts/uvcalc_smart_project.py')
-rw-r--r-- | release/scripts/uvcalc_smart_project.py | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/release/scripts/uvcalc_smart_project.py b/release/scripts/uvcalc_smart_project.py index 55d6ebfaa6f..9d9bd2aaefd 100644 --- a/release/scripts/uvcalc_smart_project.py +++ b/release/scripts/uvcalc_smart_project.py @@ -43,7 +43,7 @@ selected faces, or all faces. from Blender import Object, Draw, Window, sys, Mesh, Geometry -from Blender.Mathutils import CrossVecs, Matrix, Vector, RotationMatrix, DotVecs +from Blender.Mathutils import Matrix, Vector, RotationMatrix import bpy from math import cos @@ -96,7 +96,7 @@ def pointInTri2D(v, v1, v2, v3): side1 = v2 - v1 side2 = v3 - v1 - nor = CrossVecs(side1, side2) + nor = side1.cross(side2) l1 = [side1[0], side1[1], side1[2]] l2 = [side2[0], side2[1], side2[2]] @@ -804,11 +804,11 @@ def VectoMat(vec): a3 = vec.__copy__().normalize() up = Vector(0,0,1) - if abs(DotVecs(a3, up)) == 1.0: + if abs(a3.dot(up)) == 1.0: up = Vector(0,1,0) - a1 = CrossVecs(a3, up).normalize() - a2 = CrossVecs(a3, a1) + a1 = a3.cross(up).normalize() + a2 = a3.cross(a1) return Matrix([a1[0], a1[1], a1[2]], [a2[0], a2[1], a2[2]], [a3[0], a3[1], a3[2]]) @@ -1001,7 +1001,7 @@ def main(): for fIdx in xrange(len(tempMeshFaces)-1, -1, -1): # Use half the angle limit so we dont overweight faces towards this # normal and hog all the faces. - if DotVecs(newProjectVec, tempMeshFaces[fIdx].no) > USER_PROJECTION_LIMIT_HALF_CONVERTED: + if newProjectVec.dot(tempMeshFaces[fIdx].no) > USER_PROJECTION_LIMIT_HALF_CONVERTED: newProjectMeshFaces.append(tempMeshFaces.pop(fIdx)) # Add the average of all these faces normals as a projectionVec @@ -1027,7 +1027,7 @@ def main(): # Get the closest vec angle we are to. for p in projectVecs: - temp_angle_diff= DotVecs(p, tempMeshFaces[fIdx].no) + temp_angle_diff= p.dot(tempMeshFaces[fIdx].no) if angleDifference < temp_angle_diff: angleDifference= temp_angle_diff @@ -1066,14 +1066,14 @@ def main(): i = len(projectVecs) # Initialize first - bestAng = DotVecs(fvec, projectVecs[0]) + bestAng = fvec.dot(projectVecs[0]) bestAngIdx = 0 # Cycle through the remaining, first alredy done while i-1: i-=1 - newAng = DotVecs(fvec, projectVecs[i]) + newAng = fvec.dot(projectVecs[i]) if newAng > bestAng: # Reverse logic for dotvecs bestAng = newAng bestAngIdx = i |