[Bf-blender-cvs] [b2ce1b07582] blender-v2.92-release: Cleanup: rename variables for gizmo templates
Campbell Barton
noreply at git.blender.org
Fri Jan 29 01:43:33 CET 2021
Commit: b2ce1b07582d7a5916d0cf0b987fce92f1a1f0b6
Author: Campbell Barton
Date: Fri Jan 29 11:33:54 2021 +1100
Branches: blender-v2.92-release
https://developer.blender.org/rBb2ce1b07582d7a5916d0cf0b987fce92f1a1f0b6
Cleanup: rename variables for gizmo templates
The abbreviation was from 'manipulator',
which was changed to gizmo during development.
Also correct operator description.
===================================================================
M release/scripts/templates_py/gizmo_custom_geometry.py
M release/scripts/templates_py/gizmo_operator.py
M release/scripts/templates_py/gizmo_operator_target.py
M release/scripts/templates_py/gizmo_simple.py
===================================================================
diff --git a/release/scripts/templates_py/gizmo_custom_geometry.py b/release/scripts/templates_py/gizmo_custom_geometry.py
index b8621c834ab..4105a99c633 100644
--- a/release/scripts/templates_py/gizmo_custom_geometry.py
+++ b/release/scripts/templates_py/gizmo_custom_geometry.py
@@ -127,25 +127,25 @@ class MyCustomShapeWidgetGroup(GizmoGroup):
def setup(self, context):
# Assign the 'offset' target property to the light energy.
ob = context.object
- mpr = self.gizmos.new(MyCustomShapeWidget.bl_idname)
- mpr.target_set_prop("offset", ob.data, "energy")
+ gz = self.gizmos.new(MyCustomShapeWidget.bl_idname)
+ gz.target_set_prop("offset", ob.data, "energy")
- mpr.color = 1.0, 0.5, 1.0
- mpr.alpha = 0.5
+ gz.color = 1.0, 0.5, 1.0
+ gz.alpha = 0.5
- mpr.color_highlight = 1.0, 1.0, 1.0
- mpr.alpha_highlight = 0.5
+ gz.color_highlight = 1.0, 1.0, 1.0
+ gz.alpha_highlight = 0.5
# units are large, so shrink to something more reasonable.
- mpr.scale_basis = 0.1
- mpr.use_draw_modal = True
+ gz.scale_basis = 0.1
+ gz.use_draw_modal = True
- self.energy_widget = mpr
+ self.energy_gizmo = gz
def refresh(self, context):
ob = context.object
- mpr = self.energy_widget
- mpr.matrix_basis = ob.matrix_world.normalized()
+ gz = self.energy_gizmo
+ gz.matrix_basis = ob.matrix_world.normalized()
classes = (
diff --git a/release/scripts/templates_py/gizmo_operator.py b/release/scripts/templates_py/gizmo_operator.py
index 7ab694c1619..450f67ba3a4 100644
--- a/release/scripts/templates_py/gizmo_operator.py
+++ b/release/scripts/templates_py/gizmo_operator.py
@@ -34,7 +34,7 @@ def main(context, plane_co, plane_no):
class SelectSideOfPlane(Operator):
- """UV Operator description"""
+ """Select all vertices on one side of a plane defined by a location and a direction"""
bl_idname = "mesh.select_side_of_plane"
bl_label = "Select Side of Plane"
bl_options = {'REGISTER', 'UNDO'}
@@ -126,20 +126,20 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
# XXX, this may change!
op.execute(context)
- mpr = self.gizmos.new("GIZMO_GT_move_3d")
- mpr.target_set_handler("offset", get=move_get_cb, set=move_set_cb)
+ gz = self.gizmos.new("GIZMO_GT_move_3d")
+ gz.target_set_handler("offset", get=move_get_cb, set=move_set_cb)
- mpr.use_draw_value = True
+ gz.use_draw_value = True
- mpr.color = 0.8, 0.8, 0.8
- mpr.alpha = 0.5
+ gz.color = 0.8, 0.8, 0.8
+ gz.alpha = 0.5
- mpr.color_highlight = 1.0, 1.0, 1.0
- mpr.alpha_highlight = 1.0
+ gz.color_highlight = 1.0, 1.0, 1.0
+ gz.alpha_highlight = 1.0
- mpr.scale_basis = 0.2
+ gz.scale_basis = 0.2
- self.widget_move = mpr
+ self.gizmo_move = gz
# ----
# Dial
@@ -147,7 +147,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
def direction_get_cb():
op = SelectSideOfPlaneGizmoGroup.my_target_operator(context)
- no_a = self.widget_dial.matrix_basis.col[1].xyz
+ no_a = self.gizmo_dial.matrix_basis.col[1].xyz
no_b = Vector(op.plane_no)
no_a = (no_a @ self.view_inv).xy.normalized()
@@ -157,23 +157,23 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
def direction_set_cb(value):
op = SelectSideOfPlaneGizmoGroup.my_target_operator(context)
matrix_rotate = Matrix.Rotation(-value, 3, self.rotate_axis)
- no = matrix_rotate @ self.widget_dial.matrix_basis.col[1].xyz
+ no = matrix_rotate @ self.gizmo_dial.matrix_basis.col[1].xyz
op.plane_no = no
op.execute(context)
- mpr = self.gizmos.new("GIZMO_GT_dial_3d")
- mpr.target_set_handler("offset", get=direction_get_cb, set=direction_set_cb)
- mpr.draw_options = {'ANGLE_START_Y'}
+ gz = self.gizmos.new("GIZMO_GT_dial_3d")
+ gz.target_set_handler("offset", get=direction_get_cb, set=direction_set_cb)
+ gz.draw_options = {'ANGLE_START_Y'}
- mpr.use_draw_value = True
+ gz.use_draw_value = True
- mpr.color = 0.8, 0.8, 0.8
- mpr.alpha = 0.5
+ gz.color = 0.8, 0.8, 0.8
+ gz.alpha = 0.5
- mpr.color_highlight = 1.0, 1.0, 1.0
- mpr.alpha_highlight = 1.0
+ gz.color_highlight = 1.0, 1.0, 1.0
+ gz.alpha_highlight = 1.0
- self.widget_dial = mpr
+ self.gizmo_dial = gz
def draw_prepare(self, context):
from mathutils import Vector
@@ -194,7 +194,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
no_y = no_z.orthogonal()
no_x = no_z.cross(no_y)
- matrix = self.widget_move.matrix_basis
+ matrix = self.gizmo_move.matrix_basis
matrix.identity()
matrix.col[0].xyz = no_x
matrix.col[1].xyz = no_y
@@ -206,7 +206,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
no_y = (no - (no.project(no_z))).normalized()
no_x = self.rotate_axis.cross(no_y)
- matrix = self.widget_dial.matrix_basis
+ matrix = self.gizmo_dial.matrix_basis
matrix.identity()
matrix.col[0].xyz = no_x
matrix.col[1].xyz = no_y
diff --git a/release/scripts/templates_py/gizmo_operator_target.py b/release/scripts/templates_py/gizmo_operator_target.py
index efb6a70489a..30126763daf 100644
--- a/release/scripts/templates_py/gizmo_operator_target.py
+++ b/release/scripts/templates_py/gizmo_operator_target.py
@@ -24,27 +24,27 @@ class MyCameraWidgetGroup(GizmoGroup):
def setup(self, context):
# Run an operator using the dial gizmo
ob = context.object
- mpr = self.gizmos.new("GIZMO_GT_dial_3d")
- props = mpr.target_set_operator("transform.rotate")
+ gz = self.gizmos.new("GIZMO_GT_dial_3d")
+ props = gz.target_set_operator("transform.rotate")
props.constraint_axis = False, False, True
props.orient_type = 'LOCAL'
props.release_confirm = True
- mpr.matrix_basis = ob.matrix_world.normalized()
- mpr.line_width = 3
+ gz.matrix_basis = ob.matrix_world.normalized()
+ gz.line_width = 3
- mpr.color = 0.8, 0.8, 0.8
- mpr.alpha = 0.5
+ gz.color = 0.8, 0.8, 0.8
+ gz.alpha = 0.5
- mpr.color_highlight = 1.0, 1.0, 1.0
- mpr.alpha_highlight = 1.0
+ gz.color_highlight = 1.0, 1.0, 1.0
+ gz.alpha_highlight = 1.0
- self.roll_widget = mpr
+ self.roll_gizmo = gz
def refresh(self, context):
ob = context.object
- mpr = self.roll_widget
- mpr.matrix_basis = ob.matrix_world.normalized()
+ gz = self.roll_gizmo
+ gz.matrix_basis = ob.matrix_world.normalized()
bpy.utils.register_class(MyCameraWidgetGroup)
diff --git a/release/scripts/templates_py/gizmo_simple.py b/release/scripts/templates_py/gizmo_simple.py
index 396378da04c..65d125adecc 100644
--- a/release/scripts/templates_py/gizmo_simple.py
+++ b/release/scripts/templates_py/gizmo_simple.py
@@ -25,23 +25,23 @@ class MyLightWidgetGroup(GizmoGroup):
def setup(self, context):
# Arrow gizmo has one 'offset' property we can assign to the light energy.
ob = context.object
- mpr = self.gizmos.new("GIZMO_GT_arrow_3d")
- mpr.target_set_prop("offset", ob.data, "energy")
- mpr.matrix_basis = ob.matrix_world.normalized()
- mpr.draw_style = 'BOX'
+ gz = self.gizmos.new("GIZMO_GT_arrow_3d")
+ gz.target_set_prop("offset", ob.data, "energy")
+ gz.matrix_basis = ob.matrix_world.normalized()
+ gz.draw_style = 'BOX'
- mpr.color = 1.0, 0.5, 0.0
- mpr.alpha = 0.5
+ gz.color = 1.0, 0.5, 0.0
+ gz.alpha = 0.5
- mpr.color_highlight = 1.0, 0.5, 1.0
- mpr.alpha_highlight = 0.5
+ gz.color_highlight = 1.0, 0.5, 1.0
+ gz.alpha_highlight = 0.5
- self.energy_widget = mpr
+ self.energy_gizmo = gz
def refresh(self, context):
ob = context.object
- mpr = self.energy_widget
- mpr.matrix_basis = ob.matrix_world.normalized()
+ gz = self.energy_gizmo
+ gz.matrix_basis = ob.matrix_world.normalized()
bpy.utils.register_class(MyLightWidgetGroup)
More information about the Bf-blender-cvs
mailing list