Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: rename variables for gizmo templates

Browse Source 
The abbreviation was from 'manipulator',
which was changed to gizmo during development.

Also correct operator description.
This commit is contained in:
Campbell Barton
2021-01-29 11:33:54 +11:00
parent 82b06f3112
commit b2ce1b0758
4 changed files with 56 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
release/scripts/templates_py/gizmo_custom_geometry.py
View File

@@ -127,25 +127,25 @@ class MyCustomShapeWidgetGroup(GizmoGroup):
def setup(self, context): def setup(self, context):
# Assign the 'offset' target property to the light energy. # Assign the 'offset' target property to the light energy.
ob = context.object ob = context.object
mpr = self.gizmos.new(MyCustomShapeWidget.bl_idname) gz = self.gizmos.new(MyCustomShapeWidget.bl_idname)
mpr.target_set_prop("offset", ob.data, "energy") gz.target_set_prop("offset", ob.data, "energy")
mpr.color = 1.0, 0.5, 1.0 gz.color = 1.0, 0.5, 1.0
mpr.alpha = 0.5 gz.alpha = 0.5
mpr.color_highlight = 1.0, 1.0, 1.0 gz.color_highlight = 1.0, 1.0, 1.0
mpr.alpha_highlight = 0.5 gz.alpha_highlight = 0.5
# units are large, so shrink to something more reasonable. # units are large, so shrink to something more reasonable.
mpr.scale_basis = 0.1 gz.scale_basis = 0.1
mpr.use_draw_modal = True gz.use_draw_modal = True
self.energy_widget = mpr self.energy_gizmo = gz
def refresh(self, context): def refresh(self, context):
ob = context.object ob = context.object
mpr = self.energy_widget gz = self.energy_gizmo
mpr.matrix_basis = ob.matrix_world.normalized() gz.matrix_basis = ob.matrix_world.normalized()
classes = ( classes = (

46
release/scripts/templates_py/gizmo_operator.py
View File

@@ -34,7 +34,7 @@ def main(context, plane_co, plane_no):
class SelectSideOfPlane(Operator): 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_idname = "mesh.select_side_of_plane"
bl_label = "Select Side of Plane" bl_label = "Select Side of Plane"
bl_options = {'REGISTER', 'UNDO'} bl_options = {'REGISTER', 'UNDO'}
@@ -126,20 +126,20 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
# XXX, this may change! # XXX, this may change!
op.execute(context) op.execute(context)
mpr = self.gizmos.new("GIZMO_GT_move_3d") gz = self.gizmos.new("GIZMO_GT_move_3d")
mpr.target_set_handler("offset", get=move_get_cb, set=move_set_cb) 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 gz.color = 0.8, 0.8, 0.8
mpr.alpha = 0.5 gz.alpha = 0.5
mpr.color_highlight = 1.0, 1.0, 1.0 gz.color_highlight = 1.0, 1.0, 1.0
mpr.alpha_highlight = 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 # Dial
@@ -147,7 +147,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
def direction_get_cb(): def direction_get_cb():
op = SelectSideOfPlaneGizmoGroup.my_target_operator(context) 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_b = Vector(op.plane_no)
no_a = (no_a @ self.view_inv).xy.normalized() no_a = (no_a @ self.view_inv).xy.normalized()
@@ -157,23 +157,23 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
def direction_set_cb(value): def direction_set_cb(value):
op = SelectSideOfPlaneGizmoGroup.my_target_operator(context) op = SelectSideOfPlaneGizmoGroup.my_target_operator(context)
matrix_rotate = Matrix.Rotation(-value, 3, self.rotate_axis) 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.plane_no = no
op.execute(context) op.execute(context)
mpr = self.gizmos.new("GIZMO_GT_dial_3d") gz = self.gizmos.new("GIZMO_GT_dial_3d")
mpr.target_set_handler("offset", get=direction_get_cb, set=direction_set_cb) gz.target_set_handler("offset", get=direction_get_cb, set=direction_set_cb)
mpr.draw_options = {'ANGLE_START_Y'} gz.draw_options = {'ANGLE_START_Y'}
mpr.use_draw_value = True gz.use_draw_value = True
mpr.color = 0.8, 0.8, 0.8 gz.color = 0.8, 0.8, 0.8
mpr.alpha = 0.5 gz.alpha = 0.5
mpr.color_highlight = 1.0, 1.0, 1.0 gz.color_highlight = 1.0, 1.0, 1.0
mpr.alpha_highlight = 1.0 gz.alpha_highlight = 1.0
self.widget_dial = mpr self.gizmo_dial = gz
def draw_prepare(self, context): def draw_prepare(self, context):
from mathutils import Vector from mathutils import Vector
@@ -194,7 +194,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
no_y = no_z.orthogonal() no_y = no_z.orthogonal()
no_x = no_z.cross(no_y) no_x = no_z.cross(no_y)
matrix = self.widget_move.matrix_basis matrix = self.gizmo_move.matrix_basis
matrix.identity() matrix.identity()
matrix.col[0].xyz = no_x matrix.col[0].xyz = no_x
matrix.col[1].xyz = no_y matrix.col[1].xyz = no_y
@@ -206,7 +206,7 @@ class SelectSideOfPlaneGizmoGroup(GizmoGroup):
no_y = (no - (no.project(no_z))).normalized() no_y = (no - (no.project(no_z))).normalized()
no_x = self.rotate_axis.cross(no_y) no_x = self.rotate_axis.cross(no_y)
matrix = self.widget_dial.matrix_basis matrix = self.gizmo_dial.matrix_basis
matrix.identity() matrix.identity()
matrix.col[0].xyz = no_x matrix.col[0].xyz = no_x
matrix.col[1].xyz = no_y matrix.col[1].xyz = no_y

22
release/scripts/templates_py/gizmo_operator_target.py
View File

@@ -24,27 +24,27 @@ class MyCameraWidgetGroup(GizmoGroup):
def setup(self, context): def setup(self, context):
# Run an operator using the dial gizmo # Run an operator using the dial gizmo
ob = context.object ob = context.object
mpr = self.gizmos.new("GIZMO_GT_dial_3d") gz = self.gizmos.new("GIZMO_GT_dial_3d")
props = mpr.target_set_operator("transform.rotate") props = gz.target_set_operator("transform.rotate")
props.constraint_axis = False, False, True props.constraint_axis = False, False, True
props.orient_type = 'LOCAL' props.orient_type = 'LOCAL'
props.release_confirm = True props.release_confirm = True
mpr.matrix_basis = ob.matrix_world.normalized() gz.matrix_basis = ob.matrix_world.normalized()
mpr.line_width = 3 gz.line_width = 3
mpr.color = 0.8, 0.8, 0.8 gz.color = 0.8, 0.8, 0.8
mpr.alpha = 0.5 gz.alpha = 0.5
mpr.color_highlight = 1.0, 1.0, 1.0 gz.color_highlight = 1.0, 1.0, 1.0
mpr.alpha_highlight = 1.0 gz.alpha_highlight = 1.0
self.roll_widget = mpr self.roll_gizmo = gz
def refresh(self, context): def refresh(self, context):
ob = context.object ob = context.object
mpr = self.roll_widget gz = self.roll_gizmo
mpr.matrix_basis = ob.matrix_world.normalized() gz.matrix_basis = ob.matrix_world.normalized()
bpy.utils.register_class(MyCameraWidgetGroup) bpy.utils.register_class(MyCameraWidgetGroup)

22
release/scripts/templates_py/gizmo_simple.py
View File

@@ -25,23 +25,23 @@ class MyLightWidgetGroup(GizmoGroup):
def setup(self, context): def setup(self, context):
# Arrow gizmo has one 'offset' property we can assign to the light energy. # Arrow gizmo has one 'offset' property we can assign to the light energy.
ob = context.object ob = context.object
mpr = self.gizmos.new("GIZMO_GT_arrow_3d") gz = self.gizmos.new("GIZMO_GT_arrow_3d")
mpr.target_set_prop("offset", ob.data, "energy") gz.target_set_prop("offset", ob.data, "energy")
mpr.matrix_basis = ob.matrix_world.normalized() gz.matrix_basis = ob.matrix_world.normalized()
mpr.draw_style = 'BOX' gz.draw_style = 'BOX'
mpr.color = 1.0, 0.5, 0.0 gz.color = 1.0, 0.5, 0.0
mpr.alpha = 0.5 gz.alpha = 0.5
mpr.color_highlight = 1.0, 0.5, 1.0 gz.color_highlight = 1.0, 0.5, 1.0
mpr.alpha_highlight = 0.5 gz.alpha_highlight = 0.5
self.energy_widget = mpr self.energy_gizmo = gz
def refresh(self, context): def refresh(self, context):
ob = context.object ob = context.object
mpr = self.energy_widget gz = self.energy_gizmo
mpr.matrix_basis = ob.matrix_world.normalized() gz.matrix_basis = ob.matrix_world.normalized()
bpy.utils.register_class(MyLightWidgetGroup) bpy.utils.register_class(MyLightWidgetGroup)