[Bf-extensions-cvs] [ca2d64cc] master: Cleanup: run autopep8 on mesh_snap_utilities_line
Germano Cavalcante
noreply at git.blender.org
Tue Dec 20 16:03:07 CET 2022
Commit: ca2d64cc301db04f0fc80dea539a7400bcab0678
Author: Germano Cavalcante
Date: Tue Dec 20 11:58:03 2022 -0300
Branches: master
https://developer.blender.org/rBAca2d64cc301db04f0fc80dea539a7400bcab0678
Cleanup: run autopep8 on mesh_snap_utilities_line
===================================================================
M mesh_snap_utilities_line/__init__.py
M mesh_snap_utilities_line/common_classes.py
M mesh_snap_utilities_line/common_utilities.py
M mesh_snap_utilities_line/drawing_utilities.py
M mesh_snap_utilities_line/preferences.py
M mesh_snap_utilities_line/snap_context_l/__init__.py
M mesh_snap_utilities_line/snap_context_l/utils_projection.py
M mesh_snap_utilities_line/widgets.py
===================================================================
diff --git a/mesh_snap_utilities_line/__init__.py b/mesh_snap_utilities_line/__init__.py
index 1456ef0f..7a4653fc 100644
--- a/mesh_snap_utilities_line/__init__.py
+++ b/mesh_snap_utilities_line/__init__.py
@@ -50,8 +50,8 @@ def tool_line():
layout.prop(addon_prefs, "create_face")
if context.mode == 'EDIT_MESH':
layout.prop(addon_prefs, "outer_verts")
- #props = tool.operator_properties("mesh.snap_utilities_line")
- #layout.prop(props, "radius")
+ # props = tool.operator_properties("mesh.snap_utilities_line")
+ # layout.prop(props, "radius")
icons_dir = os.path.join(os.path.dirname(__file__), "icons")
@@ -118,7 +118,7 @@ def register_keymaps():
keyconfig_init_from_data(
kc_addonconf, keys.generate_snap_utilities_keymaps())
- #snap_modalkeymap = kc_addonconf.keymaps.find(keys.km_snap_utilities_modal_keymap)
+ # snap_modalkeymap = kc_addonconf.keymaps.find(keys.km_snap_utilities_modal_keymap)
# snap_modalkeymap.assign("MESH_OT_snap_utilities_line")
diff --git a/mesh_snap_utilities_line/common_classes.py b/mesh_snap_utilities_line/common_classes.py
index 990f1e46..0c540566 100644
--- a/mesh_snap_utilities_line/common_classes.py
+++ b/mesh_snap_utilities_line/common_classes.py
@@ -193,7 +193,7 @@ class CharMap:
self.unit_system, 'LENGTH', self.length_entered)
except: # ValueError:
self.length_entered_value = 0.0 # invalid
- #self.report({'INFO'}, "Operation not supported yet")
+ # self.report({'INFO'}, "Operation not supported yet")
else:
self.length_entered_value = 0.0
diff --git a/mesh_snap_utilities_line/common_utilities.py b/mesh_snap_utilities_line/common_utilities.py
index 7336eadb..c6682572 100644
--- a/mesh_snap_utilities_line/common_utilities.py
+++ b/mesh_snap_utilities_line/common_utilities.py
@@ -71,10 +71,8 @@ def location_3d_to_region_2d(region, rv3d, coord):
def out_Location(rv3d, orig, vector):
view_matrix = rv3d.view_matrix
- v1 = (int(view_matrix[0][0]*1.5), int(view_matrix[0]
- [1]*1.5), int(view_matrix[0][2]*1.5))
- v2 = (int(view_matrix[1][0]*1.5), int(view_matrix[1]
- [1]*1.5), int(view_matrix[1][2]*1.5))
+ v1 = (int(view_matrix[0][0] * 1.5), int(view_matrix[0][1] * 1.5), int(view_matrix[0][2] * 1.5))
+ v2 = (int(view_matrix[1][0] * 1.5), int(view_matrix[1][1] * 1.5), int(view_matrix[1][2] * 1.5))
hit = intersect_ray_tri((1, 0, 0), (0, 1, 0),
(0, 0, 0), (vector), (orig), False)
@@ -221,7 +219,7 @@ def snap_utilities(
pvert_co = main_snap_obj.mat @ previous_vert.co
perp_point = intersect_point_line(pvert_co, v0, v1)
_snap_cache.edge.vperp = perp_point[0]
- #factor = point_perpendicular[1]
+ # factor = point_perpendicular[1]
_snap_cache.edge.v2dperp = location_3d_to_region_2d(
sctx.region, sctx.rv3d, perp_point[0])
_snap_cache.edge.is_increment = False
diff --git a/mesh_snap_utilities_line/drawing_utilities.py b/mesh_snap_utilities_line/drawing_utilities.py
index ee37dac2..e7eaa4ff 100644
--- a/mesh_snap_utilities_line/drawing_utilities.py
+++ b/mesh_snap_utilities_line/drawing_utilities.py
@@ -243,7 +243,7 @@ class SnapDrawn():
def draw_elem(self, snap_obj, bm, elem):
# TODO: Cache coords (because antialiasing)
import gpu
- from bmesh.types import(
+ from bmesh.types import (
BMVert,
BMEdge,
BMFace,
diff --git a/mesh_snap_utilities_line/preferences.py b/mesh_snap_utilities_line/preferences.py
index 3552ca95..3b04b9da 100644
--- a/mesh_snap_utilities_line/preferences.py
+++ b/mesh_snap_utilities_line/preferences.py
@@ -21,9 +21,10 @@ class SnapUtilitiesPreferences(bpy.types.AddonPreferences):
# when defining this in a submodule of a python package.
bl_idname = __package__
- intersect: BoolProperty(name="Intersect",
- description="intersects created line with the existing edges, even if the lines do not intersect",
- default=True)
+ intersect: BoolProperty(
+ name="Intersect",
+ description="intersects created line with the existing edges, even if the lines do not intersect",
+ default=True)
create_face: BoolProperty(name="Create faces",
description="Create faces defined by enclosed edges",
@@ -164,8 +165,8 @@ class SnapUtilitiesPreferences(bpy.types.AddonPreferences):
flow.prop(self, "perpendicular_color")
def draw_snap_utilities_help(self, layout):
- #layout.operator("wm.url_open", text="Gumroad Page", icon='HELP',).url = "https://gum.co/IaqQf"
- #layout.operator("wm.url_open", text="Blender Market Page", icon='HELP',).url = "https://blendermarket.com/products/snap-utilities"
+ # layout.operator("wm.url_open", text="Gumroad Page", icon='HELP',).url = "https://gum.co/IaqQf"
+ # layout.operator("wm.url_open", text="Blender Market Page", icon='HELP',).url = "https://blendermarket.com/products/snap-utilities"
layout.operator("wm.url_open", text="Wiki", icon='HELP',
).url = "https://github.com/Mano-Wii/Addon-Snap-Utilities-Line/wiki"
layout.operator("wm.url_open", text="Forum", icon='HELP',
@@ -178,7 +179,7 @@ class SnapUtilitiesPreferences(bpy.types.AddonPreferences):
)
wm = context.window_manager
- #kc = wm.keyconfigs.addon
+ # kc = wm.keyconfigs.addon
kc = wm.keyconfigs.user
layout.label(text="Global:")
diff --git a/mesh_snap_utilities_line/snap_context_l/__init__.py b/mesh_snap_utilities_line/snap_context_l/__init__.py
index ad8df061..08850f4f 100644
--- a/mesh_snap_utilities_line/snap_context_l/__init__.py
+++ b/mesh_snap_utilities_line/snap_context_l/__init__.py
@@ -9,12 +9,13 @@ VERT = 1
EDGE = 2
FACE = 4
+
class _Internal:
global_snap_context = None
@classmethod
def snap_context_free(cls):
- if cls.global_snap_context != None:
+ if cls.global_snap_context is not None:
cls.global_snap_context.free()
del cls
@@ -23,20 +24,21 @@ class _Internal:
gpu_Indices_restore_state,
gpu_Indices_use_clip_planes,
gpu_Indices_mesh_cache_clear,
- )
+ )
from .utils_projection import (
region_2d_to_orig_and_view_vector,
intersect_boundbox_threshold,
intersect_ray_segment_fac,
project_co_v3,
- )
+ )
from mathutils.geometry import intersect_line_plane
class _SnapObjectData():
__slots__ = ('data', 'mat')
+
def __init__(self, data, omat):
self.data = data
self.mat = omat
@@ -44,6 +46,7 @@ class _SnapObjectData():
class _SnapOffscreen():
bound = None
+
def __init__(self, width, height):
self._fbo = None
@@ -66,7 +69,7 @@ class _SnapOffscreen():
return self._fbo.bind()
def clear(self):
- #self._fbo.clear(color=(0.0, 0.0, 0.0, 0.0), depth=1.0)
+ # self._fbo.clear(color=(0.0, 0.0, 0.0, 0.0), depth=1.0)
self._tex_color.clear(format='UINT', value=(0,))
self._tex_depth.clear(format='FLOAT', value=(1.0,))
@@ -95,7 +98,7 @@ class SnapContext():
:type space: :class:`bpy.types.SpaceView3D`
"""
- __slots__ = (\
+ __slots__ = (
'_dist_px',
'_dist_px_sq',
'_offscreen',
@@ -119,7 +122,7 @@ class SnapContext():
self.freed = False
self.snap_objects = []
self.drawn_count = 0
- self._offset_cur = 1 # Starts with index 1
+ self._offset_cur = 1 # Starts with index 1
self.proj_mat = None
self.mval = Vector((0.0, 0.0))
@@ -148,7 +151,6 @@ class SnapContext():
self.winsize = Vector((self._offscreen.width, self._offscreen.height))
-
## PRIVATE ##
def _get_snap_obj_by_index(self, index):
@@ -167,8 +169,13 @@ class SnapContext():
r_value = 0
loc_curr = [int(mval[1]), int(mval[0])]
- rect = ((max(0, loc_curr[0] - self.threshold), min(self._snap_buffer.dimensions[0], loc_curr[0] + self.threshold)),
- (max(0, loc_curr[1] - self.threshold), min(self._snap_buffer.dimensions[1], loc_curr[1] + self.threshold)))
+ rect = ((
+ max(0, loc_curr[0] - self.threshold),
+ min(self._snap_buffer.dimensions[0], loc_curr[0] + self.threshold)
+ ), (
+ max(0, loc_curr[1] - self.threshold),
+ min(self._snap_buffer.dimensions[1], loc_curr[1] + self.threshold)
+ ))
if loc_curr[0] < rect[0][0] or loc_curr[0] >= rect[0][1] or loc_curr[1] < rect[1][0] or loc_curr[1] >= rect[1][1]:
return r_snap_obj, r_value
@@ -203,13 +210,13 @@ class SnapContext():
# Next spiral step.
if (spiral_direction == 0):
- loc_curr[1] += 1 # right
+ loc_curr[1] += 1 # right
elif (spiral_direction == 1):
- loc_curr[0] -= 1 # down
+ loc_curr[0] -= 1 # down
elif (spiral_direction == 2):
- loc_curr[1] -= 1 # left
+ loc_curr[1] -= 1 # left
else:
- loc_curr[0] += 1 # up
+ loc_curr[0] += 1 # up
if (loc_curr[not a] < rect[not a][0] or loc_curr[not a] >= rect[not a][1]):
return r_snap_obj, r_value
@@ -226,10 +233,11 @@ class SnapContext():
if index < num_tris:
tri_verts = gpu_data.get_tri_verts(index)
tri_co = [snap_obj.mat @ Vector(v) for v in gpu_data.get_tri_co(index)]
- #loc = _Internal.intersect_ray_tri(*tri_co, self.last_ray[0],
- #self.last_ray[1], False)
+
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list