[Bf-extensions-cvs] [2f1f82e2] master: xoffsets: cleanup, better variable names
NBurn
noreply at git.blender.org
Fri Nov 10 04:26:53 CET 2017
Commit: 2f1f82e24a3e8adc8cc8a30feaf1694afb0fbafa
Author: NBurn
Date: Thu Nov 9 22:25:40 2017 -0500
Branches: master
https://developer.blender.org/rBAC2f1f82e24a3e8adc8cc8a30feaf1694afb0fbafa
xoffsets: cleanup, better variable names
===================================================================
M mesh_xoffsets.py
===================================================================
diff --git a/mesh_xoffsets.py b/mesh_xoffsets.py
index b5ebb1c4..7a1a2d54 100644
--- a/mesh_xoffsets.py
+++ b/mesh_xoffsets.py
@@ -1,4 +1,4 @@
-'''
+"""
BEGIN GPL LICENSE BLOCK
This program is free software; you can redistribute it and/or
@@ -46,7 +46,7 @@ todo:
[ ]
#============================================================================
-'''
+"""
bl_info = {
"name": "Exact Offsets",
@@ -74,15 +74,15 @@ from bpy_extras.view3d_utils import location_3d_to_region_2d
print("Exact Offsets loaded")
(
- XO_CLICK_CHECK,
- XO_CHECK_POPUP_INFO,
- XO_DO_TRANSFORM,
- XO_GET_0_OR_180,
- XO_MOVE,
- XO_SCALE,
- XO_ROTATE,
- XO_SLOW3DTO2D,
- XO_GRABONLY
+ CLICK_CHECK,
+ CHECK_POPUP_INFO,
+ DO_TRANSFORM,
+ GET_0_OR_180,
+ MOVE,
+ SCALE,
+ ROTATE,
+ SLOW3DTO2D,
+ GRABONLY
) = range(9)
curr_meas_stor = 0.0
@@ -147,7 +147,7 @@ class SceneSelectionInfo:
if hasattr(bm.verts, "ensure_lookup_table"):
bm.verts.ensure_lookup_table()
for ind in range(len(bm.verts)):
- if bm.verts[ind].select == True:
+ if bm.verts[ind].select is True:
tmp.append(ind)
self.sel_msh_vts = tmp.copy()
@@ -191,37 +191,37 @@ def restore_snap_settings(backup):
# vertex storage class, stores reference point info
class VertObj:
- def __init__(self, obj_idx=-1, vert_idx=-1, co3D=(), co2D=(), dist2D=4000, ref_idx=-1):
+ def __init__(self, obj_idx=-1, vert_idx=-1, co3d=(), co2d=(), dist2d=4000, ref_idx=-1):
self.obj_idx = obj_idx
self.vert_idx = vert_idx
- self.co3D = co3D
- self.co2D = co2D
- self.dist2D = dist2D
+ self.co3d = co3d
+ self.co2d = co2d
+ self.dist2d = dist2d
self.ref_idx = ref_idx
self.obj = bpy.context.scene.objects # short hand, for internal use
# Have to use deepcopy for co's as tuples are the default init
# value and tuples don't have a ".copy()" method.
def copy(self): # returns independent copy of VertObj
- return VertObj(self.obj_idx, self.vert_idx, deepcopy(self.co3D),
- deepcopy(self.co2D), self.dist2D, self.ref_idx)
+ return VertObj(self.obj_idx, self.vert_idx, deepcopy(self.co3d),
+ deepcopy(self.co2d), self.dist2d, self.ref_idx)
- def set2D(self):
+ def set2d(self):
global reg_rv3d
region, rv3d = reg_rv3d[0], reg_rv3d[1]
- self.co2D = location_3d_to_region_2d(region, rv3d, self.co3D)
+ self.co2d = location_3d_to_region_2d(region, rv3d, self.co3d)
- def update3D(self):
+ def update3d(self):
tmp_co_local = self.obj[self.obj_idx].data.vertices[self.vert_idx].co
- self.co3D = self.obj[self.obj_idx].matrix_world * tmp_co_local
+ self.co3d = self.obj[self.obj_idx].matrix_world * tmp_co_local
# Stores the reference points and ref pt related info.
class ReferencePoints:
def __init__(self):
self.cnt = 0 # count
- self.rp_ls = [(),(),()] # ref pt list
- self.lp_ls = [(),(),()] # lock pt list
+ self.rp_ls = [(), (), ()] # ref pt list
+ self.lp_ls = [(), (), ()] # lock pt list
self.ax_lock = '' # axis lock
self.colr_ls = Colr.red, Colr.green
@@ -244,7 +244,7 @@ class ReferencePoints:
def try_add(self, found_pt):
if self.cnt > 0:
for rp in range(self.cnt):
- if self.rp_ls[rp].co3D == found_pt.co3D:
+ if self.rp_ls[rp].co3d == found_pt.co3d:
self.ax_lock = ''
self.remove_pt(self.rp_ls[rp].ref_idx)
self.lp_ls = self.rp_ls
@@ -255,7 +255,7 @@ class ReferencePoints:
self.rp_ls[self.cnt] = found_pt.copy()
self.rp_ls[self.cnt].ref_idx = self.cnt
''' Begin Debug
- pt_fnd_str = str(self.rp_ls[self.cnt].co3D)
+ pt_fnd_str = str(self.rp_ls[self.cnt].co3d)
pt_fnd_str = pt_fnd_str.replace("<Vector ", "Vector(")
pt_fnd_str = pt_fnd_str.replace(">", ")")
print("ref_pt_" + str(self.cnt) + ' =', pt_fnd_str)
@@ -277,7 +277,7 @@ class RotationData:
self.ang_diff_r = 0.0
self.axis_lk = ''
self.piv_norm = [] # pivot normal
- #self.angleEq_0_180 = False
+ #self.angle_eq_0_180 = False
#self.obj = bpy.context.scene.objects[self.obj_idx] # short hand
@@ -314,25 +314,25 @@ def slope_check(pt1, pt2):
# Finds 3D location that shares same slope of line connecting Anchor and
# Free or that is on axis line going through Anchor.
-def get_new_3D_co(self, lock, rp_ls, old_dis, new_dis):
- pt_anc, pt_fr = rp_ls[0].co3D, rp_ls[1].co3D
+def get_new_3d_co(self, lock, rp_ls, old_dis, new_dis):
+ pt_anc, pt_fr = rp_ls[0].co3d, rp_ls[1].co3d
if lock == '':
if new_dis == 0:
return pt_anc
- origSlope = slope_check(pt_anc, pt_fr)
+ orig_slope = slope_check(pt_anc, pt_fr)
scale = new_dis / old_dis
pt_pos = pt_anc.lerp(pt_fr, scale)
pt_neg = pt_anc.lerp(pt_fr, -scale)
pt_pos_slp = slope_check(pt_anc, pt_pos)
pt_neg_slp = slope_check(pt_anc, pt_neg)
- if origSlope == pt_pos_slp:
+ if orig_slope == pt_pos_slp:
#print("pt_pos !") # debug
if new_dis > 0:
return pt_pos
else:
# for negative distances
return pt_neg
- elif origSlope == pt_neg_slp:
+ elif orig_slope == pt_neg_slp:
#print("pt_neg !") # debug
if new_dis > 0:
return pt_neg
@@ -357,7 +357,7 @@ def get_new_3D_co(self, lock, rp_ls, old_dis, new_dis):
# co1, co2, and co3 are Vector based 3D coordinates
# coordinates must share a common center "pivot" point (co2)
-def get_line_ang_3D(co1, co2, co3):
+def get_line_ang_3d(co1, co2, co3):
algn_co1 = co1 - co2
algn_co3 = co3 - co2
return algn_co1.angle(algn_co3)
@@ -366,8 +366,8 @@ def get_line_ang_3D(co1, co2, co3):
# Checks if the 3 coordinates arguments (pt1, pt2, pt3) will create
# an angle with a measurement matching the value in the argument
# exp_ang (expected angle measurement).
-def ang_match3D(pt1, pt2, pt3, exp_ang):
- ang_meas = get_line_ang_3D(pt1, pt2, pt3)
+def ang_match3d(pt1, pt2, pt3, exp_ang):
+ ang_meas = get_line_ang_3d(pt1, pt2, pt3)
'''
print("pt1", pt1) # debug
print("pt2", pt2) # debug
@@ -414,53 +414,53 @@ def set_lock_pts(ref_pts):
else:
ref_pts.lp_ls = []
new0, new1 = VertObj(), VertObj()
- ptls = [ref_pts.rp_ls[i].co3D for i in range(ref_pts.cnt)] # shorthand
+ ptls = [ref_pts.rp_ls[i].co3d for i in range(ref_pts.cnt)] # shorthand
# finds 3D midpoint between 2 supplied coordinates
# axis determines which coordinates are assigned midpoint values
# if X, Anchor is [AncX, MidY, MidZ] and Free is [FreeX, MidY, MidZ]
if ref_pts.cnt == 2: # translate
- mid3D = get_midpoint(ptls[0], ptls[1])
+ mid3d = get_midpoint(ptls[0], ptls[1])
if ref_pts.ax_lock == 'X':
- new0.co3D = Vector([ ptls[0][0], mid3D[1], mid3D[2] ])
- new1.co3D = Vector([ ptls[1][0], mid3D[1], mid3D[2] ])
+ new0.co3d = Vector([ ptls[0][0], mid3d[1], mid3d[2] ])
+ new1.co3d = Vector([ ptls[1][0], mid3d[1], mid3d[2] ])
elif ref_pts.ax_lock == 'Y':
- new0.co3D = Vector([ mid3D[0], ptls[0][1], mid3D[2] ])
- new1.co3D = Vector([ mid3D[0], ptls[1][1], mid3D[2] ])
+ new0.co3d = Vector([ mid3d[0], ptls[0][1], mid3d[2] ])
+ new1.co3d = Vector([ mid3d[0], ptls[1][1], mid3d[2] ])
elif ref_pts.ax_lock == 'Z':
- new0.co3D = Vector([ mid3D[0], mid3D[1], ptls[0][2] ])
- new1.co3D = Vector([ mid3D[0], mid3D[1], ptls[1][2] ])
- if new0.co3D != new1.co3D:
+ new0.co3d = Vector([ mid3d[0], mid3d[1], ptls[0][2] ])
+ new1.co3d = Vector([ mid3d[0], mid3d[1], ptls[1][2] ])
+ if new0.co3d != new1.co3d:
ref_pts.lp_ls = [new0, new1]
# axis determines which of the Free's coordinates are assigned
# to Anchor and Pivot coordinates eg:
# if X, Anchor is [FreeX, AncY, AncZ] and Pivot is [FreeX, PivY, PivZ]
elif ref_pts.cnt == 3: # rotate
- mov_co = ref_pts.rp_ls[2].co3D.copy()
+ mov_co = ref_pts.rp_ls[2].co3d.copy()
if ref_pts.ax_lock == 'X':
- new0.co3D = Vector([ mov_co[0], ptls[0][1], ptls[0][2] ])
- new1.co3D = Vector([ mov_co[0], ptls[1][1], ptls[1][2] ])
+ new0.co3d = Vector([ mov_co[0], ptls[0][1], ptls[0][2] ])
+ new1.co3d = Vector([ mov_co[0], ptls[1][1], ptls[1][2] ])
elif ref_pts.ax_lock == 'Y':
- new0.co3D = Vector([ ptls[0][0], mov_co[1], ptls[0][2] ])
- new1.co3D = Vector([ ptls[1][0], mov_co[1], ptls[1][2] ])
+ new0.co3d = Vector([ ptls[0][0], mov_co[1], ptls[0][2] ])
+ new1.co3d = Vector([ ptls[1][0], mov_co[1], ptls[1][2] ])
elif ref_pts.ax_lock == 'Z':
- new0.co3D = Vector([ ptls[0][0], ptls[0][1], mov_co[2] ])
- new1.co3D = Vector([ ptls[1][0], ptls[1][1], mov_co[2] ])
- if new0.co3D != new1.co3D and \
- new0.co3D != mov_co and \
- new1.co3D != mov_co:
+ new0.co3d = Vector([ ptls[0][0], ptls[0][1], mov_co[2] ])
+ new1.co3d = Vector([ ptls[1][0], ptls[1][1], mov_co[2] ])
+ if new0.co3d != new1.co3d and \
+ new0.co3d != mov_co and \
+ new1.co3d != mov_co:
new2 = VertObj(-1, -1, mov_co, [], -1, -1)
ref_pts.lp_ls = [new0, new1, new2]
if ref_pts.lp_ls != []:
- for itm in ref_pts.lp_ls: itm.set2D()
+ for itm in ref_pts.lp_ls: itm.set2d()
# Finds out whethe
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list