diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 07:28:46 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-11-11 07:28:46 +0400 |
commit | 11947f1a67ab6fb26cc36e8f9c421d7e464a70c9 (patch) | |
tree | af649270ea51d5f399bcafac2e0b92b9305be112 /release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py | |
parent | 4e5c03f06ea0834bc6575b653924a1749891bf5f (diff) |
pep/style edits & quiet some warnings
Diffstat (limited to 'release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py')
-rw-r--r-- | release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py | 220 |
1 files changed, 118 insertions, 102 deletions
diff --git a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py index f4bea3b4a52..f03d4793be0 100644 --- a/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py +++ b/release/scripts/startup/bl_ui/properties_physics_dynamicpaint.py @@ -17,13 +17,16 @@ # ##### END GPL LICENSE BLOCK ##### # <pep8 compliant> + import bpy +from bpy.types import Panel -from bl_ui.properties_physics_common import ( +from .properties_physics_common import ( point_cache_ui, effector_weights_ui, ) + class PhysicButtonsPanel(): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' @@ -33,10 +36,10 @@ class PhysicButtonsPanel(): def poll(cls, context): ob = context.object rd = context.scene.render - return (ob and ob.type == 'MESH') and (not rd.use_game_engine) and (context.dynamic_paint) + return (ob and ob.type == 'MESH') and (not rd.use_game_engine) and context.dynamic_paint -class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, bpy.types.Panel): +class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint" def draw(self, context): @@ -47,14 +50,14 @@ class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, bpy.types.Panel): layout.prop(md, "ui_type", expand=True) - if (md.ui_type == "CANVAS"): + if md.ui_type == 'CANVAS': canvas = md.canvas_settings - - if (not canvas): + + if canvas is None: layout.operator("dpaint.type_toggle", text="Add Canvas").type = 'CANVAS' else: layout.operator("dpaint.type_toggle", text="Remove Canvas", icon='X').type = 'CANVAS' - + surface = canvas.canvas_surfaces.active row = layout.row() @@ -63,32 +66,32 @@ class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, bpy.types.Panel): col = row.column(align=True) col.operator("dpaint.surface_slot_add", icon='ZOOMIN', text="") col.operator("dpaint.surface_slot_remove", icon='ZOOMOUT', text="") - + if surface: layout.prop(surface, "name") layout.prop(surface, "surface_format") - + col = layout.column() - if surface.surface_format != "VERTEX": + if surface.surface_format != 'VERTEX': col.label(text="Quality:") col.prop(surface, "image_resolution") col.prop(surface, "use_antialiasing") - + col = layout.column() col.label(text="Frames:") split = col.split() - + col = split.column(align=True) col.prop(surface, "frame_start", text="Start") col.prop(surface, "frame_end", text="End") - + split.prop(surface, "frame_substeps") - elif (md.ui_type == "BRUSH"): + elif md.ui_type == 'BRUSH': brush = md.brush_settings engine = context.scene.render.engine - - if (not brush): + + if brush is None: layout.operator("dpaint.type_toggle", text="Add Brush").type = 'BRUSH' else: layout.operator("dpaint.type_toggle", text="Remove Brush", icon='X').type = 'BRUSH' @@ -99,13 +102,13 @@ class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, bpy.types.Panel): col.prop(brush, "absolute_alpha") col.prop(brush, "paint_erase") col.prop(brush, "paint_wetness", text="Wetness") - + col = split.column() - if (engine == 'BLENDER_RENDER'): + if engine == 'BLENDER_RENDER': sub = col.column() - sub.active = (brush.paint_source != "PARTICLE_SYSTEM"); + sub.active = (brush.paint_source != 'PARTICLE_SYSTEM') sub.prop(brush, "use_material") - if brush.use_material and brush.paint_source != "PARTICLE_SYSTEM" and (engine == 'BLENDER_RENDER'): + if brush.use_material and brush.paint_source != 'PARTICLE_SYSTEM' and engine == 'BLENDER_RENDER': col.prop(brush, "material", text="") col.prop(brush, "paint_alpha", text="Alpha Factor") else: @@ -113,13 +116,13 @@ class PHYSICS_PT_dynamic_paint(PhysicButtonsPanel, bpy.types.Panel): col.prop(brush, "paint_alpha", text="Alpha") -class PHYSICS_PT_dp_advanced_canvas(PhysicButtonsPanel, bpy.types.Panel): +class PHYSICS_PT_dp_advanced_canvas(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint Advanced" @classmethod def poll(cls, context): md = context.dynamic_paint - return md and (md.ui_type == "CANVAS") and (md.canvas_settings) and (md.canvas_settings.canvas_surfaces.active) + return md and md.ui_type == 'CANVAS' and md.canvas_settings and md.canvas_settings.canvas_surfaces.active def draw(self, context): layout = self.layout @@ -128,23 +131,25 @@ class PHYSICS_PT_dp_advanced_canvas(PhysicButtonsPanel, bpy.types.Panel): surface = canvas.canvas_surfaces.active ob = context.object + surface_type = surface.surface_type + layout.prop(surface, "surface_type") layout.separator() # dissolve - if (surface.surface_type == "PAINT"): + if surface_type == 'PAINT': split = layout.split(percentage=0.35) split.label(text="Wetmap drying:") - + col = split.column() split = col.split(percentage=0.7) split.prop(surface, "dry_speed", text="Time") split.prop(surface, "use_dry_log", text="Slow") - - if (surface.surface_type != "WAVE"): + + if surface_type != 'WAVE': split = layout.split(percentage=0.35) col = split.column() - if (surface.surface_type == "WEIGHT"): + if surface_type == 'WEIGHT': col.prop(surface, "use_dissolve", text="Fade:") else: col.prop(surface, "use_dissolve", text="Dissolve:") @@ -153,42 +158,43 @@ class PHYSICS_PT_dp_advanced_canvas(PhysicButtonsPanel, bpy.types.Panel): split = col.split(percentage=0.7) split.prop(surface, "dissolve_speed", text="Time") split.prop(surface, "use_dissolve_log", text="Slow") - + # per type settings - if (surface.surface_type == "DISPLACE"): + if surface_type == 'DISPLACE': layout.prop(surface, "use_incremental_displace") - if (surface.surface_format == "VERTEX"): + if surface.surface_format == 'VERTEX': row = layout.row() row.prop(surface, "depth_clamp") row.prop(surface, "displace_factor") - - if (surface.surface_type == "WAVE"): + + elif surface_type == 'WAVE': layout.prop(surface, "wave_open_borders") - + split = layout.split() - + col = split.column(align=True) col.prop(surface, "wave_timescale") col.prop(surface, "wave_speed") - + col = split.column(align=True) col.prop(surface, "wave_damping") col.prop(surface, "wave_spring") - + layout.separator() layout.prop(surface, "brush_group", text="Brush Group") -class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, bpy.types.Panel): + +class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint Output" bl_options = {'DEFAULT_CLOSED'} @classmethod def poll(cls, context): md = context.dynamic_paint - if (not (md and (md.ui_type == "CANVAS") and (md.canvas_settings))): + if not (md and md.ui_type == 'CANVAS' and md.canvas_settings): return 0 surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active - return (surface and not (surface.surface_format=="VERTEX" and (surface.surface_type=="DISPLACE" or surface.surface_type=="WAVE"))) + return surface and not (surface.surface_format == 'VERTEX' and (surface.surface_type in {'DISPLACE', 'WAVE'})) def draw(self, context): layout = self.layout @@ -196,37 +202,39 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, bpy.types.Panel): canvas = context.dynamic_paint.canvas_settings surface = canvas.canvas_surfaces.active ob = context.object - + + surface_type = surface.surface_type + # vertex format outputs - if (surface.surface_format == "VERTEX"): - if (surface.surface_type == "PAINT"): + if surface.surface_format == 'VERTEX': + if surface_type == 'PAINT': # toggle active preview layout.prop(surface, "preview_id") - + # paintmap output row = layout.row() row.prop_search(surface, "output_name", ob.data, "vertex_colors", text="Paintmap layer: ") - if (surface.output_exists(object=ob, index=0)): + if surface.output_exists(object=ob, index=0): ic = 'ZOOMOUT' else: ic = 'ZOOMIN' - + row.operator("dpaint.output_toggle", icon=ic, text="").index = 0 - + # wetmap output row = layout.row() row.prop_search(surface, "output_name2", ob.data, "vertex_colors", text="Wetmap layer: ") - if (surface.output_exists(object=ob, index=1)): + if surface.output_exists(object=ob, index=1): ic = 'ZOOMOUT' else: ic = 'ZOOMIN' - + row.operator("dpaint.output_toggle", icon=ic, text="").index = 1 - - elif (surface.surface_type == "WEIGHT"): + + elif surface_type == 'WEIGHT': row = layout.row() row.prop_search(surface, "output_name", ob, "vertex_groups", text="Vertex Group: ") - if (surface.output_exists(object=ob, index=0)): + if surface.output_exists(object=ob, index=0): ic = 'ZOOMOUT' else: ic = 'ZOOMIN' @@ -234,23 +242,23 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, bpy.types.Panel): row.operator("dpaint.output_toggle", icon=ic, text="").index = 0 # image format outputs - if (surface.surface_format == "IMAGE"): + if surface.surface_format == 'IMAGE': layout.operator("dpaint.bake", text="Bake Image Sequence", icon='MOD_DYNAMICPAINT') layout.prop_search(surface, "uv_layer", ob.data, "uv_textures", text="UV layer:") layout.separator() - + layout.prop(surface, "image_output_path", text="") row = layout.row() row.prop(surface, "image_fileformat", text="") row.prop(surface, "premultiply", text="Premultiply alpha") - - if (surface.surface_type == "PAINT"): + + if surface_type == 'PAINT': split = layout.split(percentage=0.4) split.prop(surface, "do_output1", text="Paintmaps:") sub = split.row() sub.active = surface.do_output1 sub.prop(surface, "output_name", text="") - + split = layout.split(percentage=0.4) split.prop(surface, "do_output2", text="Wetmaps:") sub = split.row() @@ -259,23 +267,24 @@ class PHYSICS_PT_dp_canvas_output(PhysicButtonsPanel, bpy.types.Panel): else: col = layout.column() col.prop(surface, "output_name", text="Filename: ") - if (surface.surface_type == "DISPLACE"): + if surface_type == 'DISPLACE': col.prop(surface, "displace_type", text="Displace Type") col.prop(surface, "depth_clamp") - elif (surface.surface_type == "WAVE"): + elif surface_type == 'WAVE': col.prop(surface, "depth_clamp", text="Wave Clamp") -class PHYSICS_PT_dp_canvas_initial_color(PhysicButtonsPanel, bpy.types.Panel): + +class PHYSICS_PT_dp_canvas_initial_color(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint Initial Color" bl_options = {'DEFAULT_CLOSED'} @classmethod def poll(cls, context): md = context.dynamic_paint - if (not (md and (md.ui_type == "CANVAS") and (md.canvas_settings))): + if not (md and md.ui_type == 'CANVAS' and md.canvas_settings): return 0 surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active - return (surface and surface.surface_type=="PAINT") + return (surface and surface.surface_type == 'PAINT') def draw(self, context): layout = self.layout @@ -288,27 +297,28 @@ class PHYSICS_PT_dp_canvas_initial_color(PhysicButtonsPanel, bpy.types.Panel): layout.separator() # dissolve - if (surface.init_color_type == "COLOR"): + if surface.init_color_type == 'COLOR': layout.prop(surface, "init_color") - - elif (surface.init_color_type == "TEXTURE"): + + elif surface.init_color_type == 'TEXTURE': layout.prop(surface, "init_texture") layout.prop_search(surface, "init_layername", ob.data, "uv_textures", text="UV Layer:") - - elif (surface.init_color_type == "VERTEX_COLOR"): + + elif surface.init_color_type == 'VERTEX_COLOR': layout.prop_search(surface, "init_layername", ob.data, "vertex_colors", text="Color Layer: ") -class PHYSICS_PT_dp_effects(PhysicButtonsPanel, bpy.types.Panel): + +class PHYSICS_PT_dp_effects(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint Effects" bl_options = {'DEFAULT_CLOSED'} @classmethod def poll(cls, context): md = context.dynamic_paint - if (not (md and (md.ui_type == "CANVAS") and (md.canvas_settings))): - return False; + if not (md and md.ui_type == 'CANVAS' and md.canvas_settings): + return False surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active - return surface and (surface.surface_type == "PAINT") + return (surface and surface.surface_type == 'PAINT') def draw(self, context): layout = self.layout @@ -318,17 +328,17 @@ class PHYSICS_PT_dp_effects(PhysicButtonsPanel, bpy.types.Panel): layout.prop(surface, "effect_ui", expand=True) - if surface.effect_ui == "SPREAD": + if surface.effect_ui == 'SPREAD': layout.prop(surface, "use_spread") - + row = layout.row() row.active = surface.use_spread row.prop(surface, "spread_speed") row.prop(surface, "color_spread_speed") - elif surface.effect_ui == "DRIP": + elif surface.effect_ui == 'DRIP': layout.prop(surface, "use_drip") - + col = layout.column() col.active = surface.use_drip effector_weights_ui(self, context, surface.effector_weights) @@ -338,52 +348,55 @@ class PHYSICS_PT_dp_effects(PhysicButtonsPanel, bpy.types.Panel): row.prop(surface, "drip_velocity", slider=True) row.prop(surface, "drip_acceleration", slider=True) - elif surface.effect_ui == "SHRINK": + elif surface.effect_ui == 'SHRINK': layout.prop(surface, "use_shrink") - + row = layout.row() row.active = surface.use_shrink row.prop(surface, "shrink_speed") - -class PHYSICS_PT_dp_cache(PhysicButtonsPanel, bpy.types.Panel): + +class PHYSICS_PT_dp_cache(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint Cache" bl_options = {'DEFAULT_CLOSED'} @classmethod def poll(cls, context): md = context.dynamic_paint - return md and (md.ui_type == "CANVAS") and (md.canvas_settings) and \ - (md.canvas_settings.canvas_surfaces.active) and (md.canvas_settings.canvas_surfaces.active.uses_cache) + return (md and + md.ui_type == 'CANVAS' and + md.canvas_settings and + md.canvas_settings.canvas_surfaces.active and + md.canvas_settings.canvas_surfaces.active.uses_cache) def draw(self, context): layout = self.layout surface = context.dynamic_paint.canvas_settings.canvas_surfaces.active cache = surface.point_cache - + point_cache_ui(self, context, cache, (cache.is_baked is False), 'DYNAMIC_PAINT') -class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, bpy.types.Panel): +class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint Source" @classmethod def poll(cls, context): md = context.dynamic_paint - return md and (md.ui_type == "BRUSH") and (md.brush_settings) + return md and md.ui_type == 'BRUSH' and md.brush_settings def draw(self, context): layout = self.layout brush = context.dynamic_paint.brush_settings ob = context.object - + split = layout.split() col = split.column() col.prop(brush, "paint_source") - if brush.paint_source == "PARTICLE_SYSTEM": + if brush.paint_source == 'PARTICLE_SYSTEM': col.prop_search(brush, "particle_system", ob, "particle_systems", text="") if brush.particle_system: col.label(text="Particle effect:") @@ -392,84 +405,87 @@ class PHYSICS_PT_dp_brush_source(PhysicButtonsPanel, bpy.types.Panel): sub.prop(brush, "solid_radius", text="Solid Radius") col.prop(brush, "use_particle_radius", text="Use Particle's Radius") col.prop(brush, "smooth_radius", text="Smooth radius") - + if brush.paint_source in {'DISTANCE', 'VOLUME_DISTANCE', 'POINT'}: col.prop(brush, "paint_distance", text="Paint Distance") split = layout.row().split(percentage=0.4) sub = split.column() if brush.paint_source == 'DISTANCE': sub.prop(brush, "proximity_project") - elif brush.paint_source == "VOLUME_DISTANCE": + elif brush.paint_source == 'VOLUME_DISTANCE': sub.prop(brush, "proximity_inverse") - + sub = split.column() if brush.paint_source == 'DISTANCE': column = sub.column() column.active = brush.proximity_project column.prop(brush, "ray_direction") sub.prop(brush, "proximity_falloff") - if brush.proximity_falloff == "RAMP": + if brush.proximity_falloff == 'RAMP': col = layout.row().column() col.separator() col.prop(brush, "proximity_ramp_alpha", text="Only Use Alpha") col.template_color_ramp(brush, "paint_ramp", expand=True) - -class PHYSICS_PT_dp_brush_velocity(PhysicButtonsPanel, bpy.types.Panel): + + +class PHYSICS_PT_dp_brush_velocity(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint Velocity" bl_options = {'DEFAULT_CLOSED'} @classmethod def poll(cls, context): md = context.dynamic_paint - return md and (md.ui_type == "BRUSH") and (md.brush_settings) + return md and md.ui_type == 'BRUSH' and md.brush_settings def draw(self, context): layout = self.layout brush = context.dynamic_paint.brush_settings ob = context.object - + split = layout.split() - + col = split.column() col.prop(brush, "velocity_alpha") col.prop(brush, "velocity_color") - + split.prop(brush, "velocity_depth") - + col = layout.column() col.active = (brush.velocity_alpha or brush.velocity_color or brush.velocity_depth) col.prop(brush, "max_velocity") col.template_color_ramp(brush, "velocity_ramp", expand=True) layout.separator() - + row = layout.row() row.prop(brush, "do_smudge") sub = row.row() sub.active = brush.do_smudge sub.prop(brush, "smudge_strength") - -class PHYSICS_PT_dp_brush_wave(PhysicButtonsPanel, bpy.types.Panel): + + +class PHYSICS_PT_dp_brush_wave(PhysicButtonsPanel, Panel): bl_label = "Dynamic Paint Waves" bl_options = {'DEFAULT_CLOSED'} @classmethod def poll(cls, context): md = context.dynamic_paint - return md and (md.ui_type == "BRUSH") and (md.brush_settings) + return md and md.ui_type == 'BRUSH' and md.brush_settings def draw(self, context): layout = self.layout brush = context.dynamic_paint.brush_settings ob = context.object - + layout.prop(brush, "wave_type") - if (brush.wave_type != "REFLECT"): + if brush.wave_type != 'REFLECT': row = layout.row() row.prop(brush, "wave_factor") row.prop(brush, "wave_clamp") + def register(): bpy.utils.register_module(__name__) |