diff options
author | Campbell Barton <campbell@blender.org> | 2022-09-07 08:14:35 +0300 |
---|---|---|
committer | Campbell Barton <campbell@blender.org> | 2022-09-07 08:14:50 +0300 |
commit | adb746415f620756cb8f42cee5f6e706d43825b3 (patch) | |
tree | 025d03692b803fe682f5c535096bf858a8ead52e /release | |
parent | bd2b50dfa8880c5d525a9940ab18c7f26b266bf9 (diff) |
Cleanup: add sections, use float literals
Diffstat (limited to 'release')
-rw-r--r-- | release/scripts/startup/bl_operators/uvcalc_transform.py | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/release/scripts/startup/bl_operators/uvcalc_transform.py b/release/scripts/startup/bl_operators/uvcalc_transform.py index 066752b5f64..a638ba2c070 100644 --- a/release/scripts/startup/bl_operators/uvcalc_transform.py +++ b/release/scripts/startup/bl_operators/uvcalc_transform.py @@ -1,10 +1,10 @@ # SPDX-License-Identifier: GPL-2.0-or-later +import math + from bpy.types import Operator from mathutils import Matrix, Vector -import math - from bpy.props import ( BoolProperty, EnumProperty, @@ -14,6 +14,9 @@ from bpy.props import ( ) +# ------------------------------------------------------------------------------ +# Local Utility Functions + def is_face_uv_selected(face, uv_layer, any_edge): """ Returns True if the face is UV selected. @@ -66,6 +69,9 @@ def is_island_uv_selected(island, uv_layer, any_edge): return False +# ------------------------------------------------------------------------------ +# Align UV Rotation Operator + def find_rotation_auto(bm, uv_layer, faces): sum_u = 0.0 sum_v = 0.0 @@ -251,6 +257,9 @@ class AlignUVRotation(Operator): return context.mode == 'EDIT_MESH' +# ------------------------------------------------------------------------------ +# Randomize UV Operator + def get_random_transform(transform_params, entropy): from random import uniform from random import seed as random_seed @@ -261,31 +270,31 @@ def get_random_transform(transform_params, entropy): random_seed(seed + entropy) # Next, call uniform a known number of times. - offset_u = uniform(0, 1) - offset_v = uniform(0, 1) - angle = uniform(0, 1) - scale_u = uniform(0, 1) - scale_v = uniform(0, 1) + offset_u = uniform(0.0, 1.0) + offset_v = uniform(0.0, 1.0) + angle = uniform(0.0, 1.0) + scale_u = uniform(0.0, 1.0) + scale_v = uniform(0.0, 1.0) # Apply the transform_params. if loc: offset_u *= loc[0] offset_v *= loc[1] else: - offset_u = 0 - offset_v = 0 + offset_u = 0.0 + offset_v = 0.0 if rot: angle *= rot else: - angle = 0 + angle = 0.0 if scale: - scale_u = scale_u * (2 * scale[0] - 2.0) + 2.0 - scale[0] - scale_v = scale_v * (2 * scale[1] - 2.0) + 2.0 - scale[1] + scale_u = scale_u * (2.0 * scale[0] - 2.0) + 2.0 - scale[0] + scale_v = scale_v * (2.0 * scale[1] - 2.0) + 2.0 - scale[1] else: - scale_u = 1 - scale_v = 1 + scale_u = 1.0 + scale_v = 1.0 if scale_even: scale_v = scale_u @@ -311,8 +320,8 @@ def randomize_uv_transform_island(bm, uv_layer, faces, transform_params): minmax[2] = max(minmax[2], u) minmax[3] = max(minmax[3], v) - mid_u = (minmax[0] + minmax[2]) / 2 - mid_v = (minmax[1] + minmax[3]) / 2 + mid_u = (minmax[0] + minmax[2]) / 2.0 + mid_v = (minmax[1] + minmax[3]) / 2.0 del_u = transform[0][2] + mid_u - transform[0][0] * mid_u - transform[0][1] * mid_v del_v = transform[1][2] + mid_v - transform[1][0] * mid_u - transform[1][1] * mid_v @@ -389,8 +398,8 @@ class RandomizeUVTransform(Operator): rot: FloatProperty( name="Rotation", description="Maximum rotation", - min=-2 * math.pi, - max=2 * math.pi, + min=-2.0 * math.pi, + max=2.0 * math.pi, subtype='ANGLE', default=0.0, ) @@ -421,8 +430,8 @@ class RandomizeUVTransform(Operator): def execute(self, context): seed = self.random_seed - loc = [0, 0] if not self.use_loc else self.loc - rot = 0 if not self.use_rot else self.rot + loc = [0.0, 0.0] if not self.use_loc else self.loc + rot = 0.0 if not self.use_rot else self.rot scale = None if not self.use_scale else self.scale scale_even = self.scale_even |