diff --git a/add_advanced_objects_menu/__init__.py b/add_advanced_objects_menu/__init__.py index 32bbbd7f79ba92cf92d93db761c0a95f99e83f2c..91ddcb18472c64b7c000b3eb13f3d2ab2dbea58b 100644 --- a/add_advanced_objects_menu/__init__.py +++ b/add_advanced_objects_menu/__init__.py @@ -202,12 +202,12 @@ def menu(self, context): class AdvancedObjPreferences(AddonPreferences): bl_idname = __name__ - show_menu_list = BoolProperty( + show_menu_list: BoolProperty( name="Menu List", description="Show/Hide the Add Menu items", default=False ) - show_panel_list = BoolProperty( + show_panel_list: BoolProperty( name="Panels List", description="Show/Hide the Panel items", default=False @@ -313,149 +313,149 @@ def adjust_selected_color_image(self, context): class AdvancedObjProperties(PropertyGroup): # cubester # main properties - cubester_check_audio = BoolProperty( + cubester_check_audio: BoolProperty( name="", default=False ) - cubester_audio_image = EnumProperty( + cubester_audio_image: EnumProperty( name="Input Type", items=(("image", "Image", "Use an Image as input for generating Geometry", "IMAGE_COL", 0), ("audio", "Audio", "Use a Sound Strip as input for generating Geometry", "FILE_SOUND", 1)) ) - cubester_audio_file_length = IntProperty( + cubester_audio_file_length: IntProperty( default=0 ) # audio - cubester_audio_path = StringProperty( + cubester_audio_path: StringProperty( default="", name="Audio File", subtype="FILE_PATH", update=find_audio_length ) - cubester_audio_min_freq = IntProperty( + cubester_audio_min_freq: IntProperty( name="Minimum Frequency", min=20, max=100000, default=20 ) - cubester_audio_max_freq = IntProperty( + cubester_audio_max_freq: IntProperty( name="Maximum Frequency", min=21, max=999999, default=5000 ) - cubester_audio_offset_type = EnumProperty( + cubester_audio_offset_type: EnumProperty( name="Offset Type", items=(("freq", "Frequency Offset", ""), ("frame", "Frame Offset", "")), description="Type of offset per row of mesh" ) - cubester_audio_frame_offset = IntProperty( + cubester_audio_frame_offset: IntProperty( name="Frame Offset", min=0, max=10, default=2 ) - cubester_audio_block_layout = EnumProperty( + cubester_audio_block_layout: EnumProperty( name="Block Layout", items=(("rectangle", "Rectangular", ""), ("radial", "Radial", "")) ) - cubester_audio_width_blocks = IntProperty( + cubester_audio_width_blocks: IntProperty( name="Width Block Count", min=1, max=10000, default=5 ) - cubester_audio_length_blocks = IntProperty( + cubester_audio_length_blocks: IntProperty( name="Length Block Count", min=1, max=10000, default=50 ) # image - cubester_load_type = EnumProperty( + cubester_load_type: EnumProperty( name="Image Input Type", items=(("single", "Single Image", ""), ("multiple", "Image Sequence", "")) ) - cubester_image = StringProperty( + cubester_image: StringProperty( default="", name="" ) - cubester_load_image = StringProperty( + cubester_load_image: StringProperty( default="", name="Load Image", subtype="FILE_PATH", update=adjust_selected_image ) - cubester_skip_images = IntProperty( + cubester_skip_images: IntProperty( name="Image Step", min=1, max=30, default=1, description="Step from image to image by this number" ) - cubester_max_images = IntProperty( + cubester_max_images: IntProperty( name="Max Number Of Images", min=2, max=1000, default=10, description="Maximum number of images to be used" ) - cubester_frame_step = IntProperty( + cubester_frame_step: IntProperty( name="Frame Step Size", min=1, max=10, default=4, description="The number of frames each picture is used" ) - cubester_skip_pixels = IntProperty( + cubester_skip_pixels: IntProperty( name="Skip # Pixels", min=0, max=256, default=64, description="Skip this number of pixels before placing the next" ) - cubester_mesh_style = EnumProperty( + cubester_mesh_style: EnumProperty( name="Mesh Type", items=(("blocks", "Blocks", ""), ("plane", "Plane", "")), description="Compose mesh of multiple blocks or of a single plane" ) - cubester_block_style = EnumProperty( + cubester_block_style: EnumProperty( name="Block Style", items=(("size", "Vary Size", ""), ("position", "Vary Position", "")), description="Vary Z-size of block, or vary Z-position" ) - cubester_height_scale = FloatProperty( + cubester_height_scale: FloatProperty( name="Height Scale", subtype="DISTANCE", min=0.1, max=2, default=0.2 ) - cubester_invert = BoolProperty( + cubester_invert: BoolProperty( name="Invert Height", default=False ) # general adjustments - cubester_size_per_hundred_pixels = FloatProperty( + cubester_size_per_hundred_pixels: FloatProperty( name="Size Per 100 Blocks/Points", subtype="DISTANCE", min=0.001, max=5, default=1 ) # material based stuff - cubester_materials = EnumProperty( + cubester_materials: EnumProperty( name="Material", items=(("vertex", "Vertex Colors", ""), ("image", "Image", "")), description="Color with vertex colors, or uv unwrap and use an image" ) - cubester_use_image_color = BoolProperty( + cubester_use_image_color: BoolProperty( name="Use Original Image Colors'?", default=True, description="Use original image colors, or replace with an another one" ) - cubester_color_image = StringProperty( + cubester_color_image: StringProperty( default="", name="" ) - cubester_load_color_image = StringProperty( + cubester_load_color_image: StringProperty( default="", name="Load Color Image", subtype="FILE_PATH", @@ -463,33 +463,33 @@ class AdvancedObjProperties(PropertyGroup): ) cubester_vertex_colors = {} # advanced - cubester_advanced = BoolProperty( + cubester_advanced: BoolProperty( name="Advanced Options", default=False ) - cubester_random_weights = BoolProperty( + cubester_random_weights: BoolProperty( name="Random Weights", default=False ) - cubester_weight_r = FloatProperty( + cubester_weight_r: FloatProperty( name="Red", subtype="FACTOR", min=0.01, max=1.0, default=0.25 ) - cubester_weight_g = FloatProperty( + cubester_weight_g: FloatProperty( name="Green", subtype="FACTOR", min=0.01, max=1.0, default=0.25 ) - cubester_weight_b = FloatProperty( + cubester_weight_b: FloatProperty( name="Blue", subtype="FACTOR", min=0.01, max=1.0, default=0.25 ) - cubester_weight_a = FloatProperty( + cubester_weight_a: FloatProperty( name="Alpha", subtype="FACTOR", min=0.01, max=1.0, @@ -497,15 +497,15 @@ class AdvancedObjProperties(PropertyGroup): ) # arrange_on_curve - arrange_c_use_selected = BoolProperty( + arrange_c_use_selected: BoolProperty( name="Use Selected", description="Use the selected objects to duplicate", default=True, ) - arrange_c_obj_arranjar = StringProperty( + arrange_c_obj_arranjar: StringProperty( name="" ) - arrange_c_select_type = EnumProperty( + arrange_c_select_type: EnumProperty( name="Type", description="Select object or group", items=[ diff --git a/add_advanced_objects_menu/add_light_template.py b/add_advanced_objects_menu/add_light_template.py index 5b4fbc864aae89f7f629587fc2d2eaca0b0d26fd..2ca87c3bc7377f41b76ccfd9abe2df60b3b1cfd8 100644 --- a/add_advanced_objects_menu/add_light_template.py +++ b/add_advanced_objects_menu/add_light_template.py @@ -73,22 +73,22 @@ class OBJECT_OT_add_light_template(Operator): camera = None target = None - bKeyLight = BoolProperty( + bKeyLight: BoolProperty( name="Key Light", description="Enable Key Light in the Scene", default=True ) - bFillLight = BoolProperty( + bFillLight: BoolProperty( name="Fill Light", description="Enable Fill Light in the Scene", default=True ) - bBackLight = BoolProperty( + bBackLight: BoolProperty( name="Back Light", description="Enable Back Light in the Scene", default=True ) - camera_constraint = BoolProperty( + camera_constraint: BoolProperty( name="Camera Constraint", description="Add a Constraint to the Camera Object", default=False diff --git a/add_advanced_objects_menu/add_mesh_aggregate.py b/add_advanced_objects_menu/add_mesh_aggregate.py index 6072cb9c447c5b972c9e25ad403d816c5fd3df50..b2ea399efa066a3db80c0b6a77b6f6b72b64606b 100644 --- a/add_advanced_objects_menu/add_mesh_aggregate.py +++ b/add_advanced_objects_menu/add_mesh_aggregate.py @@ -71,92 +71,92 @@ class OBJECT_OT_agregate_mesh(Operator): "Needs at least two selected Mesh objects") bl_options = {'REGISTER', 'UNDO', 'PRESET'} - volX = FloatProperty( + volX: FloatProperty( name="Volume X", min=0.1, max=25, default=3, description="The cloud around cursor" ) - volY = FloatProperty( + volY: FloatProperty( name="Volume Y", min=0.1, max=25, default=3, description="The cloud around cursor" ) - volZ = FloatProperty( + volZ: FloatProperty( name="Volume Z", min=0.1, max=25, default=3, description="The cloud around cursor" ) - baseSca = FloatProperty( + baseSca: FloatProperty( name="Scale", min=0.01, max=5, default=.25, description="Particle Scale" ) - varSca = FloatProperty( + varSca: FloatProperty( name="Var", min=0, max=1, default=0, description="Particle Scale Variation" ) - rotX = FloatProperty( + rotX: FloatProperty( name="Rot Var X", min=0, max=2, default=0, description="X Rotation Variation" ) - rotY = FloatProperty( + rotY: FloatProperty( name="Rot Var Y", min=0, max=2, default=0, description="Y Rotation Variation" ) - rotZ = FloatProperty( + rotZ: FloatProperty( name="Rot Var Z", min=0, max=2, default=1, description="Z Rotation Variation" ) - rSeed = IntProperty( + rSeed: IntProperty( name="Random seed", min=0, max=999999, default=1, description="Seed to feed random values" ) - numP = IntProperty( + numP: IntProperty( name="Number", min=1, max=9999, soft_max=500, default=50, description="Number of particles" ) - nor = BoolProperty( + nor: BoolProperty( name="Normal Oriented", default=False, description="Align Z axis with Faces normals" ) - cent = BoolProperty( + cent: BoolProperty( name="Use Face Center", default=False, description="Center on Faces" ) - track = BoolProperty( + track: BoolProperty( name="Cursor Follows", default=False, description="Cursor moves as structure grows / more compact results" ) - anim = BoolProperty( + anim: BoolProperty( name="Animatable", default=False, description="Sort faces so you can regrow with Build Modifier, materials are lost" ) - refresh = BoolProperty( + refresh: BoolProperty( name="Update", default=False ) - auto_refresh = BoolProperty( + auto_refresh: BoolProperty( name="Auto", description="Auto update spline", default=False diff --git a/add_advanced_objects_menu/arrange_on_curve.py b/add_advanced_objects_menu/arrange_on_curve.py index bfed37a75d3fa37f3cb9536a5a26e3ee0f92bee7..17c14b5756f00dce8a56ce533d92d7e624dc6ad9 100644 --- a/add_advanced_objects_menu/arrange_on_curve.py +++ b/add_advanced_objects_menu/arrange_on_curve.py @@ -71,7 +71,7 @@ class DupliCurve(Operator): bl_description = "Arange chosen / selected objects along the Active Curve" bl_options = {'REGISTER', 'UNDO'} - use_distance = EnumProperty( + use_distance: EnumProperty( name="Arrangement", items=[ ("D", "Distance", "Objects are arranged depending on the distance", 0), @@ -79,7 +79,7 @@ class DupliCurve(Operator): ("R", "Range", "Objects are arranged uniformly between the corners", 2) ] ) - distance = FloatProperty( + distance: FloatProperty( name="Distance", description="Distance between Objects", default=1.0, @@ -87,44 +87,44 @@ class DupliCurve(Operator): soft_min=0.1, unit='LENGTH', ) - object_qt = IntProperty( + object_qt: IntProperty( name="Quantity", description="Object amount", default=2, min=0, ) - scale = FloatProperty( + scale: FloatProperty( name="Scale", description="Object Scale", default=1.0, min=FLT_MIN, unit='LENGTH', ) - Yaw = FloatProperty( + Yaw: FloatProperty( name="X", description="Rotate around the X axis (Yaw)", default=0.0, unit='ROTATION' ) - Pitch = FloatProperty( + Pitch: FloatProperty( default=0.0, description="Rotate around the Y axis (Pitch)", name="Y", unit='ROTATION' ) - Roll = FloatProperty( + Roll: FloatProperty( default=0.0, description="Rotate around the Z axis (Roll)", name="Z", unit='ROTATION' ) - max_angle = FloatProperty( + max_angle: FloatProperty( default=1.57079, max=3.141592, name="Angle", unit='ROTATION' ) - offset = FloatProperty( + offset: FloatProperty( default=0.0, name="Offset", unit='LENGTH' diff --git a/add_advanced_objects_menu/copy2.py b/add_advanced_objects_menu/copy2.py index 9a94ac1d85e878606fc08c3f9c439fabe90b3c1d..9806ad0d0f8222f41c537174f3172e9875012504 100644 --- a/add_advanced_objects_menu/copy2.py +++ b/add_advanced_objects_menu/copy2.py @@ -67,7 +67,7 @@ class Copy2(Operator): ('Y', "Y", "Secondary axis Y")] return sec_list - copytype = EnumProperty( + copytype: EnumProperty( items=(('V', "Vertex", "Paste the Copied Geometry to Vertices of the Active Object", 'VERTEXSEL', 0), ('E', "Edge", @@ -75,27 +75,27 @@ class Copy2(Operator): ('F', "Face", "Paste the Copied Geometry to Faces of the Active Object", 'FACESEL', 2)), ) - copyfromobject = EnumProperty( + copyfromobject: EnumProperty( name="Copy from", description="Copy an Object from the list", items=obj_list_cb ) - priaxes = EnumProperty( + priaxes: EnumProperty( description="Primary axes used for Copied Object orientation", items=(('X', "X", "Along X"), ('Y', "Y", "Along Y"), ('Z', "Z", "Along Z")), ) - edgescale = BoolProperty( + edgescale: BoolProperty( name="Scale to fill edge", default=False ) - secaxes = EnumProperty( + secaxes: EnumProperty( name="Secondary Axis", description="Secondary axis used for Copied Object orientation", items=sec_axes_list_cb ) - scale = FloatProperty( + scale: FloatProperty( name="Scale", default=1.0, min=0.0, diff --git a/add_advanced_objects_menu/make_struts.py b/add_advanced_objects_menu/make_struts.py index 76496237a6be9584e2f2e29b40c9109fb6b10583..91e794a2f234ef2cf5b6a346a6fd816ba7041e9b 100644 --- a/add_advanced_objects_menu/make_struts.py +++ b/add_advanced_objects_menu/make_struts.py @@ -506,36 +506,36 @@ class Struts(Operator): "Needs an existing Active Mesh Object") bl_options = {'REGISTER', 'UNDO'} - ind = FloatProperty( + ind: FloatProperty( name="Inside Diameter", description="Diameter of inner surface", min=0.0, soft_min=0.0, max=100, soft_max=100, default=0.04 ) - od = FloatProperty( + od: FloatProperty( name="Outside Diameter", description="Diameter of outer surface", min=0.001, soft_min=0.001, max=100, soft_max=100, default=0.05 ) - manifold = BoolProperty( + manifold: BoolProperty( name="Manifold", description="Connect struts to form a single solid", default=False ) - solid = BoolProperty( + solid: BoolProperty( name="Solid", description="Create inner surface", default=False ) - loops = BoolProperty( + loops: BoolProperty( name="Loops", description="Create sub-surf friendly loops", default=False ) - segments = IntProperty( + segments: IntProperty( name="Segments", description="Number of segments around strut", min=3, soft_min=3, diff --git a/add_advanced_objects_menu/mesh_easylattice.py b/add_advanced_objects_menu/mesh_easylattice.py index d2e608e9e3c95a2ec74c8a3a891c5d08f9f5fc4e..585a343f7ec0d4b8fbed76d8bc1a55f0be039692 100644 --- a/add_advanced_objects_menu/mesh_easylattice.py +++ b/add_advanced_objects_menu/mesh_easylattice.py @@ -268,22 +268,22 @@ class EasyLattice(Operator): bl_description = ("Create a Lattice modifier ready to edit\n" "Needs an existing Active Mesh Object\n") - lat_u = IntProperty( + lat_u: IntProperty( name="Lattice u", description="Points in u direction", default=3 ) - lat_v = IntProperty( + lat_v: IntProperty( name="Lattice v", description="Points in v direction", default=3 ) - lat_w = IntProperty( + lat_w: IntProperty( name="Lattice w", description="Points in w direction", default=3 ) - lat_scale_factor = FloatProperty( + lat_scale_factor: FloatProperty( name="Lattice scale factor", description="Adjustment to the lattice scale", default=1, @@ -296,7 +296,7 @@ class EasyLattice(Operator): ('KEY_CATMULL_ROM', "Catmull-Rom", "Catmull-Rom Interpolation type"), ('KEY_BSPLINE', "BSpline", "Key BSpline Interpolation Type") ) - lat_type = EnumProperty( + lat_type: EnumProperty( name="Lattice Type", description="Choose Lattice Type", items=lat_types, diff --git a/add_advanced_objects_menu/oscurart_chain_maker.py b/add_advanced_objects_menu/oscurart_chain_maker.py index 6dcd6f808e8f2d9f8a2807c3566e1e66f559ac4c..8624dea54d53157e11f9d209c0998f4a56c9a672 100644 --- a/add_advanced_objects_menu/oscurart_chain_maker.py +++ b/add_advanced_objects_menu/oscurart_chain_maker.py @@ -245,11 +245,11 @@ class MESH_OT_primitive_oscurart_chain_add(Operator): "The Active/Last Selected Object must be an Armature") bl_options = {'REGISTER', 'UNDO'} - curverig = BoolProperty( + curverig: BoolProperty( name="Curve Rig", default=False ) - multiplier = FloatProperty( + multiplier: FloatProperty( name="Scale", default=1, min=0.01, max=100.0 diff --git a/add_advanced_objects_menu/pixelate_3d.py b/add_advanced_objects_menu/pixelate_3d.py index 567e882ab5dfcb9e5b45d53d56605f50f2f916fe..10032e62b82374e14a35c8aa09cf2f5c55f879b0 100644 --- a/add_advanced_objects_menu/pixelate_3d.py +++ b/add_advanced_objects_menu/pixelate_3d.py @@ -73,21 +73,21 @@ class Pixelate(Operator): "Needs an existing Active Mesh Object") bl_options = {'REGISTER', 'UNDO'} - size = FloatProperty( + size: FloatProperty( name="Size", min=.05, max=5, default=.25, description="Size of the cube / grid \n" "Small values (below 0.1) can create a high polygon count" ) - gap = IntProperty( + gap: IntProperty( name="Gap", min=0, max=90, default=10, subtype='PERCENTAGE', description="Separation - percent of size" ) - smooth = FloatProperty( + smooth: FloatProperty( name="Smooth", min=0, max=1, default=.0, diff --git a/add_advanced_objects_menu/random_box_structure.py b/add_advanced_objects_menu/random_box_structure.py index ead19bd1f2100bcaa07818f368412751c452a055..7d6edbdd2007b4e3d09c610571222eeac94ddcba 100644 --- a/add_advanced_objects_menu/random_box_structure.py +++ b/add_advanced_objects_menu/random_box_structure.py @@ -30,40 +30,40 @@ class makestructure(Operator): "Needs an existing Active Mesh Object") bl_options = {'REGISTER', 'UNDO'} - dc = BoolProperty( + dc: BoolProperty( name="Delete Base Mesh(es)", default=True ) - wh = BoolProperty( + wh: BoolProperty( name="Stay Within Bounds", description="Keeps cubes from exceeding base mesh bounds", default=True ) - uf = BoolProperty( + uf: BoolProperty( name="Uniform Cube Quantity", default=False ) - qn = IntProperty( + qn: IntProperty( name="Cube Quantity", default=10, min=1, max=1500 ) - mn = FloatVectorProperty( + mn: FloatVectorProperty( name="Min Scales", default=(0.1, 0.1, 0.1), subtype='XYZ' ) - mx = FloatVectorProperty( + mx: FloatVectorProperty( name="Max Scales", default=(2.0, 2.0, 2.0), subtype='XYZ' ) - lo = FloatVectorProperty( + lo: FloatVectorProperty( name="XYZ Offset", default=(0.0, 0.0, 0.0), subtype='XYZ' ) - rsd = FloatProperty( + rsd: FloatProperty( name="Random Seed", default=1 ) diff --git a/add_advanced_objects_menu/rope_alpha.py b/add_advanced_objects_menu/rope_alpha.py index f0bd5dd7115d26d5700af43373ab48e9cfd4ef47..036924122abaae3bb129b7b0c72e039aff52fe1f 100644 --- a/add_advanced_objects_menu/rope_alpha.py +++ b/add_advanced_objects_menu/rope_alpha.py @@ -204,40 +204,40 @@ class ClothRope(Operator): bl_description = ("Create a new Scene with a Cloth modifier\n" "Rope Simulation with hooked Helper Objects") - ropelength = IntProperty( + ropelength: IntProperty( name="Rope Length", description="Length of the generated Rope", default=5 ) - ropesegments = IntProperty( + ropesegments: IntProperty( name="Rope Segments", description="Number of the Rope Segments", default=5 ) - qcr = IntProperty( + qcr: IntProperty( name="Collision Quality", description="Rope's Cloth modifier collsion quality", min=1, max=20, default=20 ) - substeps = IntProperty( + substeps: IntProperty( name="Rope Substeps", description="Rope's Cloth modifier quality", min=4, max=80, default=50 ) - resrope = IntProperty( + resrope: IntProperty( name="Rope Resolution", description="Rope's Bevel resolution", default=5 ) - radiusrope = FloatProperty( + radiusrope: FloatProperty( name="Radius", description="Rope's Radius", min=0.04, max=1, default=0.04 ) - hide_emptys = BoolProperty( + hide_emptys: BoolProperty( name="Hide Empties", description="Hide Helper Objects", default=False @@ -502,60 +502,60 @@ class BallRope(Operator): "Wrecking Ball on a rope") # defaults rope ball - ropelength2 = IntProperty( + ropelength2: IntProperty( name="Rope Length", description="Length of the Wrecking Ball rope", default=10 ) - ropesegments2 = IntProperty( + ropesegments2: IntProperty( name="Rope Segments", description="Number of the Wrecking Ball rope segments", min=0, max=999, default=6 ) - radiuscubes = FloatProperty( + radiuscubes: FloatProperty( name="Cube Radius", description="Size of the Linked Cubes helpers", default=0.5 ) - radiusrope = FloatProperty( + radiusrope: FloatProperty( name="Rope Radius", description="Radius of the Rope", default=0.4 ) - worldsteps = IntProperty( + worldsteps: IntProperty( name="World Steps", description="Rigid Body Solver world steps per second (update)", min=60, max=1000, default=250 ) - solveriterations = IntProperty( + solveriterations: IntProperty( name="Solver Iterations", description="How many times the Rigid Body Solver should run", min=10, max=100, default=50 ) - massball = IntProperty( + massball: IntProperty( name="Ball Mass", description="Mass of the Wrecking Ball", default=1 ) - resrope = IntProperty( + resrope: IntProperty( name="Resolution", description="Rope resolution", default=4 ) - grados = FloatProperty( + grados: FloatProperty( name="Degrees", description="Angle of the Wrecking Ball compared to the Ground Plane", default=45 ) - separacion = FloatProperty( + separacion: FloatProperty( name="Link Cubes Gap", description="Space between the Rope's Linked Cubes", default=0.1 ) - hidecubes = BoolProperty( + hidecubes: BoolProperty( name="Hide Link Cubes", description="Hide helper geometry for the Rope", default=False diff --git a/add_advanced_objects_menu/trilighting.py b/add_advanced_objects_menu/trilighting.py index c163a8943a9dcbe571d7a48950157671c9a3cb5d..e14ec0e1ef2e298bec51e1d0fcf22c7c48dd12df 100644 --- a/add_advanced_objects_menu/trilighting.py +++ b/add_advanced_objects_menu/trilighting.py @@ -21,40 +21,40 @@ class TriLighting(Operator): "Needs an existing Active Object") bl_options = {'REGISTER', 'UNDO'} - height = FloatProperty( + height: FloatProperty( name="Height", default=5 ) - distance = FloatProperty( + distance: FloatProperty( name="Distance", default=5, min=0.1, subtype="DISTANCE" ) - energy = IntProperty( + energy: IntProperty( name="Base Energy", default=3, min=1 ) - contrast = IntProperty( + contrast: IntProperty( name="Contrast", default=50, min=-100, max=100, subtype="PERCENTAGE" ) - leftangle = IntProperty( + leftangle: IntProperty( name="Left Angle", default=26, min=1, max=90, subtype="ANGLE" ) - rightangle = IntProperty( + rightangle: IntProperty( name="Right Angle", default=45, min=1, max=90, subtype="ANGLE" ) - backangle = IntProperty( + backangle: IntProperty( name="Back Angle", default=235, min=90, max=270, @@ -67,14 +67,14 @@ class TriLighting(Operator): ('HEMI', "Hemi", "Hemi Light"), ('AREA', "Area", "Area Light") ] - primarytype = EnumProperty( + primarytype: EnumProperty( attr='tl_type', name="Key Type", description="Choose the types of Key Lights you would like", items=Light_Type_List, default='HEMI' ) - secondarytype = EnumProperty( + secondarytype: EnumProperty( attr='tl_type', name="Fill + Back Type", description="Choose the types of secondary Lights you would like", diff --git a/add_advanced_objects_panels/__init__.py b/add_advanced_objects_panels/__init__.py index 1c453226bdc6a0908183e8c5c8f5eb83db899edf..8acf398eaed6896d0d5c8a0d128345411bba23bf 100644 --- a/add_advanced_objects_panels/__init__.py +++ b/add_advanced_objects_panels/__init__.py @@ -145,13 +145,13 @@ def disable_all_modules(self, context): class AdvancedObjPreferences1(AddonPreferences): bl_idname = __name__ - enable_all = BoolProperty( + enable_all: BoolProperty( name="Enable all", description="Enable all Advanced Objects' Panels", default=False, update=enable_all_modules ) - disable_all = BoolProperty( + disable_all: BoolProperty( name="Disable all", description="Disable all Advanced Objects' Panels", default=False, @@ -280,100 +280,100 @@ for mod in sub_modules: class AdvancedObjProperties1(PropertyGroup): # object_laplace_lighting props - ORIGIN = FloatVectorProperty( + ORIGIN: FloatVectorProperty( name="Origin charge" ) - GROUNDZ = IntProperty( + GROUNDZ: IntProperty( name="Ground Z coordinate" ) - HORDER = IntProperty( + HORDER: IntProperty( name="Secondary paths orders", default=1 ) # object_laplace_lighting UI props - TSTEPS = IntProperty( + TSTEPS: IntProperty( name="Iterations", default=350, description="Number of cells to create\n" "Will end early if hits ground plane or cloud" ) - GSCALE = FloatProperty( + GSCALE: FloatProperty( name="Grid unit size", default=0.12, description="scale of cells, .25 = 4 cells per blenderUnit" ) - BIGVAR = FloatProperty( + BIGVAR: FloatProperty( name="Straightness", default=6.3, description="Straightness/branchiness of bolt, \n" "<2 is mush, >12 is staight line, 6.3 is good" ) - GROUNDBOOL = BoolProperty( + GROUNDBOOL: BoolProperty( name="Use Ground object", description="Use ground plane or not", default=True ) - GROUNDC = IntProperty( + GROUNDC: IntProperty( name="Ground charge", default=-250, description="Charge of the ground plane" ) - CLOUDBOOL = BoolProperty( + CLOUDBOOL: BoolProperty( name="Use Cloud object", default=False, description="Use cloud object - attracts and terminates like ground but\n" "any obj instead of z plane\n" "Can slow down loop if obj is large, overrides ground" ) - CLOUDC = IntProperty( + CLOUDC: IntProperty( name="Cloud charge", default=-1, description="Charge of a cell in cloud object\n" "(so total charge also depends on obj size)" ) - VMMESH = BoolProperty( + VMMESH: BoolProperty( name="Multi mesh", default=True, description="Output to multi-meshes for different materials on main/sec/side branches" ) - VSMESH = BoolProperty( + VSMESH: BoolProperty( name="Single mesh", default=False, description="Output to single mesh for using build modifier and particles for effects" ) - VCUBE = BoolProperty( + VCUBE: BoolProperty( name="Cubes", default=False, description="CTRL-J after run to JOIN\n" "Outputs a bunch of cube objects, mostly for testing" ) - VVOX = BoolProperty( + VVOX: BoolProperty( name="Voxel (experimental)", default=False, description="Output to a voxel file to bpy.data.filepath\FSLGvoxels.raw\n" "(doesn't work well right now)" ) - IBOOL = BoolProperty( + IBOOL: BoolProperty( name="Use Insulator object", default=False, description="Use insulator mesh object to prevent growth of bolt in areas" ) - OOB = StringProperty( + OOB: StringProperty( name="Select", default="", description="Origin of bolt, can be an Empty\n" "if object is a mesh will use all verts as charges") - GOB = StringProperty( + GOB: StringProperty( name="Select", default="", description="Object to use as ground plane, uses z coord only" ) - COB = StringProperty( + COB: StringProperty( name="Select", default="", description="Object to use as cloud, best to use a cube" ) - IOB = StringProperty( + IOB: StringProperty( name="Select", default="", description="Object to use as insulator, 'voxelized'\n" @@ -386,88 +386,88 @@ class AdvancedObjProperties1(PropertyGroup): subtype='XYZ', description="Constrains Mangle Direction" ) - mangle_random_magnitude = IntProperty( + mangle_random_magnitude: IntProperty( name="Mangle Severity", default=5, min=1, max=30, description="Severity of mangling" ) - mangle_name = StringProperty( + mangle_name: StringProperty( name="Shape Key Name", default="mangle", description="Name given for mangled shape keys" ) # unfold_transition properties - unfold_arm_name = StringProperty( + unfold_arm_name: StringProperty( default="" ) - unfold_modo = EnumProperty( + unfold_modo: EnumProperty( name="", items=[("cursor", "3D Cursor", "Use the Distance to 3D Cursor"), ("weight", "Weight Map", "Use a Painted Weight map"), ("index", "Mesh Indices", "Use Faces and Vertices index")], description="How to Sort Bones for animation", default="cursor" ) - unfold_flip = BoolProperty( + unfold_flip: BoolProperty( name="Flipping Faces", default=False, description="Rotate faces around the Center and skip Scaling - " "keep checked for both operators" ) - unfold_fold_duration = IntProperty( + unfold_fold_duration: IntProperty( name="Total Time", min=5, soft_min=25, max=10000, soft_max=2500, default=200, description="Total animation length" ) - unfold_sca_time = IntProperty( + unfold_sca_time: IntProperty( name="Scale Time", min=1, max=5000, soft_max=500, default=10, description="Faces scaling time" ) - unfold_rot_time = IntProperty( + unfold_rot_time: IntProperty( name="Rotation Time", min=1, soft_min=5, max=5000, soft_max=500, default=15, description="Faces rotation time" ) - unfold_rot_max = IntProperty( + unfold_rot_max: IntProperty( name="Angle", min=-180, max=180, default=135, description="Faces rotation angle" ) - unfold_fold_noise = IntProperty( + unfold_fold_noise: IntProperty( name="Noise", min=0, max=500, soft_max=50, default=0, description="Offset some faces animation" ) - unfold_bounce = FloatProperty( + unfold_bounce: FloatProperty( name="Bounce", min=0, max=10, soft_max=2.5, default=0, description="Add some bounce to rotation" ) - unfold_from_point = BoolProperty( + unfold_from_point: BoolProperty( name="Point", default=False, description="Scale faces from a Point instead of from an Edge" ) - unfold_wiggle_rot = BoolProperty( + unfold_wiggle_rot: BoolProperty( name="Wiggle", default=False, description="Use all Axis + Random Rotation instead of X Aligned" ) # oscurart_constellation - constellation_limit = FloatProperty( + constellation_limit: FloatProperty( name="Initial Threshold", description="Edges will be created only if the distance\n" "between vertices is smaller than this value\n" diff --git a/add_advanced_objects_panels/delaunay_voronoi.py b/add_advanced_objects_panels/delaunay_voronoi.py index 44e746dfc1f28aba4fe69da21ac9f740bb3f6ea7..1219a2ab18219cb645adbf578d445d9af2ec8a7d 100644 --- a/add_advanced_objects_panels/delaunay_voronoi.py +++ b/add_advanced_objects_panels/delaunay_voronoi.py @@ -228,7 +228,7 @@ class OBJECT_OT_VoronoiButton(Operator): "Needs an existing Active Mesh Object") bl_options = {"REGISTER", "UNDO"} - meshType = EnumProperty( + meshType: EnumProperty( items=[('Edges', "Edges", "Edges Only - do not fill Faces"), ('Faces', "Faces", "Fill Faces in the new Object")], name="Mesh type", diff --git a/add_advanced_objects_panels/drop_to_ground.py b/add_advanced_objects_panels/drop_to_ground.py index 8c66fb46ce4038b543e532663470faec0219bfc2..0735f242c7dde2540886d55a029677950e354c4b 100644 --- a/add_advanced_objects_panels/drop_to_ground.py +++ b/add_advanced_objects_panels/drop_to_ground.py @@ -224,11 +224,11 @@ def drop_objects(self, context): # define base dummy class for inheritance class DropBaseAtributes: - align = BoolProperty( + align: BoolProperty( name="Align to ground", description="Aligns the objects' rotation to the ground", default=True) - use_origin = BoolProperty( + use_origin: BoolProperty( name="Use Origins", description="Drop to objects' origins\n" "Use this option for dropping all types of Objects", @@ -300,7 +300,7 @@ class Drop_help(Operator): bl_description = "Clik for some information about Drop to Ground" bl_options = {"REGISTER", "INTERNAL"} - is_all = BoolProperty( + is_all: BoolProperty( default=True, options={"HIDDEN"} ) diff --git a/add_advanced_objects_panels/oscurart_constellation.py b/add_advanced_objects_panels/oscurart_constellation.py index 4e477a3568c831cefc22c11abe97769ea45e9066..dfa33269a37fbd8c708173b1320f8e98fc545b52 100644 --- a/add_advanced_objects_panels/oscurart_constellation.py +++ b/add_advanced_objects_panels/oscurart_constellation.py @@ -73,7 +73,7 @@ class Oscurart_Constellation(Operator): "Needs an existing Active Mesh Object") bl_options = {'REGISTER', 'UNDO'} - limit = FloatProperty( + limit: FloatProperty( name="Threshold", description="Edges will be created only if the distance\n" "between vertices is smaller than this value", diff --git a/add_curve_extra_objects/add_curve_spirals.py b/add_curve_extra_objects/add_curve_spirals.py index c8c11789437a4032b48c7ebc879dff98a6d4a02c..7bb225d03e2e9b37f5ebb5b683371df9bc6ecaa4 100644 --- a/add_curve_extra_objects/add_curve_spirals.py +++ b/add_curve_extra_objects/add_curve_spirals.py @@ -291,7 +291,7 @@ class CURVE_OT_spirals(Operator): min=1, max=400, description="Number of curves of spiral" ) - touch = BoolProperty( + touch: BoolProperty( default=False, description="No empty spaces between cycles" ) diff --git a/add_mesh_BoltFactory/Boltfactory.py b/add_mesh_BoltFactory/Boltfactory.py index 0b405f3cd696ad93a8fad6f36c9254c64a6f5c95..c021f1113cc536b9fb18028f1fcef4bcd305c160 100644 --- a/add_mesh_BoltFactory/Boltfactory.py +++ b/add_mesh_BoltFactory/Boltfactory.py @@ -46,7 +46,7 @@ class add_mesh_bolt(Operator, AddObjectHelper): # Model Types Model_Type_List = [('bf_Model_Bolt', 'BOLT', 'Bolt Model'), ('bf_Model_Nut', 'NUT', 'Nut Model')] - bf_Model_Type = EnumProperty( + bf_Model_Type: EnumProperty( attr='bf_Model_Type', name='Model', description='Choose the type off model you would like', @@ -58,7 +58,7 @@ class add_mesh_bolt(Operator, AddObjectHelper): ('bf_Head_Dome', 'DOME', 'Dome Head'), ('bf_Head_Pan', 'PAN', 'Pan Head'), ('bf_Head_CounterSink', 'COUNTER SINK', 'Counter Sink Head')] - bf_Head_Type = EnumProperty( + bf_Head_Type: EnumProperty( attr='bf_Head_Type', name='Head', description='Choose the type off Head you would like', @@ -68,7 +68,7 @@ class add_mesh_bolt(Operator, AddObjectHelper): Bit_Type_List = [('bf_Bit_None', 'NONE', 'No Bit Type'), ('bf_Bit_Allen', 'ALLEN', 'Allen Bit Type'), ('bf_Bit_Philips', 'PHILLIPS', 'Phillips Bit Type')] - bf_Bit_Type = EnumProperty( + bf_Bit_Type: EnumProperty( attr='bf_Bit_Type', name='Bit Type', description='Choose the type of bit to you would like', @@ -77,159 +77,159 @@ class add_mesh_bolt(Operator, AddObjectHelper): # Nut Types Nut_Type_List = [('bf_Nut_Hex', 'HEX', 'Hex Nut'), ('bf_Nut_Lock', 'LOCK', 'Lock Nut')] - bf_Nut_Type = EnumProperty( + bf_Nut_Type: EnumProperty( attr='bf_Nut_Type', name='Nut Type', description='Choose the type of nut you would like', items=Nut_Type_List, default='bf_Nut_Hex' ) # Shank Types - bf_Shank_Length = FloatProperty( + bf_Shank_Length: FloatProperty( attr='bf_Shank_Length', name='Shank Length', default=0, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Length of the unthreaded shank' ) - bf_Shank_Dia = FloatProperty( + bf_Shank_Dia: FloatProperty( attr='bf_Shank_Dia', name='Shank Dia', default=3, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Diameter of the shank' ) - bf_Phillips_Bit_Depth = FloatProperty( + bf_Phillips_Bit_Depth: FloatProperty( attr='bf_Phillips_Bit_Depth', name='Bit Depth', default=1.1431535482406616, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Depth of the Phillips Bit' ) - bf_Allen_Bit_Depth = FloatProperty( + bf_Allen_Bit_Depth: FloatProperty( attr='bf_Allen_Bit_Depth', name='Bit Depth', default=1.5, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Depth of the Allen Bit' ) - bf_Allen_Bit_Flat_Distance = FloatProperty( + bf_Allen_Bit_Flat_Distance: FloatProperty( attr='bf_Allen_Bit_Flat_Distance', name='Flat Dist', default=2.5, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Flat Distance of the Allen Bit' ) - bf_Hex_Head_Height = FloatProperty( + bf_Hex_Head_Height: FloatProperty( attr='bf_Hex_Head_Height', name='Head Height', default=2, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Height of the Hex Head' ) - bf_Hex_Head_Flat_Distance = FloatProperty( + bf_Hex_Head_Flat_Distance: FloatProperty( attr='bf_Hex_Head_Flat_Distance', name='Flat Dist', default=5.5, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Flat Distance of the Hex Head' ) - bf_CounterSink_Head_Dia = FloatProperty( + bf_CounterSink_Head_Dia: FloatProperty( attr='bf_CounterSink_Head_Dia', name='Head Dia', default=6.300000190734863, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Diameter of the Counter Sink Head' ) - bf_Cap_Head_Height = FloatProperty( + bf_Cap_Head_Height: FloatProperty( attr='bf_Cap_Head_Height', name='Head Height', default=3, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Height of the Cap Head' ) - bf_Cap_Head_Dia = FloatProperty( + bf_Cap_Head_Dia: FloatProperty( attr='bf_Cap_Head_Dia', name='Head Dia', default=5.5, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Diameter of the Cap Head' ) - bf_Dome_Head_Dia = FloatProperty( + bf_Dome_Head_Dia: FloatProperty( attr='bf_Dome_Head_Dia', name='Dome Head Dia', default=5.599999904632568, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Length of the unthreaded shank' ) - bf_Pan_Head_Dia = FloatProperty( + bf_Pan_Head_Dia: FloatProperty( attr='bf_Pan_Head_Dia', name='Pan Head Dia', default=5.599999904632568, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Diameter of the Pan Head') - bf_Philips_Bit_Dia = FloatProperty( + bf_Philips_Bit_Dia: FloatProperty( attr='bf_Philips_Bit_Dia', name='Bit Dia', default=1.8199999332427979, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Diameter of the Philips Bit') - bf_Thread_Length = FloatProperty( + bf_Thread_Length: FloatProperty( attr='bf_Thread_Length', name='Thread Length', default=6, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Length of the Thread') - bf_Major_Dia = FloatProperty( + bf_Major_Dia: FloatProperty( attr='bf_Major_Dia', name='Major Dia', default=3, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Outside diameter of the Thread') - bf_Pitch = FloatProperty( + bf_Pitch: FloatProperty( attr='bf_Pitch', name='Pitch', default=0.3499999940395355, min=0.1, soft_min=0.1, max=7.0, description='Pitch if the thread' ) - bf_Minor_Dia = FloatProperty( + bf_Minor_Dia: FloatProperty( attr='bf_Minor_Dia', name='Minor Dia', default=2.6211137771606445, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Inside diameter of the Thread' ) - bf_Crest_Percent = IntProperty( + bf_Crest_Percent: IntProperty( attr='bf_Crest_Percent', name='Crest Percent', default=10, min=1, soft_min=1, max=90, description='Percent of the pitch that makes up the Crest' ) - bf_Root_Percent = IntProperty( + bf_Root_Percent: IntProperty( attr='bf_Root_Percent', name='Root Percent', default=10, min=1, soft_min=1, max=90, description='Percent of the pitch that makes up the Root' ) - bf_Div_Count = IntProperty( + bf_Div_Count: IntProperty( attr='bf_Div_Count', name='Div count', default=36, min=4, soft_min=4, max=4096, description='Div count determine circle resolution' ) - bf_Hex_Nut_Height = FloatProperty( + bf_Hex_Nut_Height: FloatProperty( attr='bf_Hex_Nut_Height', name='Hex Nut Height', default=2.4000000953674316, min=0, soft_min=0, max=MAX_INPUT_NUMBER, description='Height of the Hex Nut' ) - bf_Hex_Nut_Flat_Distance = FloatProperty( + bf_Hex_Nut_Flat_Distance: FloatProperty( attr='bf_Hex_Nut_Flat_Distance', name='Hex Nut Flat Dist', default=5.5, min=0, soft_min=0, @@ -238,18 +238,18 @@ class add_mesh_bolt(Operator, AddObjectHelper): ) # generic transform props - view_align = BoolProperty( + view_align: BoolProperty( name="Align to View", default=False, update=AddObjectHelper.view_align_update_callback, ) - location = FloatVectorProperty( + location: FloatVectorProperty( name="Location", subtype='TRANSLATION', ) - rotation = FloatVectorProperty( + rotation: FloatVectorProperty( name="Rotation", subtype='EULER', ) diff --git a/add_mesh_extra_objects/Wallfactory.py b/add_mesh_extra_objects/Wallfactory.py index 16215fbf1d0fb4918b2b94dec4d731a2077e9006..b6d7460f4b09f0565f42eb211b08abc882336442 100644 --- a/add_mesh_extra_objects/Wallfactory.py +++ b/add_mesh_extra_objects/Wallfactory.py @@ -66,7 +66,7 @@ class add_mesh_wallb(Operator): # only create object when True # False allows modifying several parameters without creating object - ConstructTog = BoolProperty( + ConstructTog: BoolProperty( name="Construct", description="Generate the object", default=True @@ -74,13 +74,13 @@ class add_mesh_wallb(Operator): # need to modify so radial makes a tower (normal); # want "flat" setting to make disk (alternate) # make the wall circular - if not sloped it's a flat disc - RadialTog = BoolProperty( + RadialTog: BoolProperty( name="Radial", description="Make masonry radial", default=False ) # curve the wall - if radial creates dome. - SlopeTog = BoolProperty( + SlopeTog: BoolProperty( name="Curved", description="Make masonry sloped, or curved", default=False @@ -88,214 +88,214 @@ class add_mesh_wallb(Operator): # need to review defaults and limits for all of these UI objects # wall area/size - WallStart = FloatProperty( + WallStart: FloatProperty( name="Start", description="Left side, or start angle", default=-10.0, min=-100, max=100.0 ) - WallEnd = FloatProperty( + WallEnd: FloatProperty( name="End", description="Right side, or end angle", default=10.0, min=0.0, max=100.0 ) - WallBottom = FloatProperty( + WallBottom: FloatProperty( name="Bottom", description="Lower height or radius", default=0.0, min=-100, max=100 ) - WallTop = FloatProperty( + WallTop: FloatProperty( name="Top", description="Upper height or radius", default=15.0, min=0.0, max=100.0 ) - EdgeOffset = FloatProperty( + EdgeOffset: FloatProperty( name="Edging", description="Block staggering on wall sides", default=0.6, min=0.0, max=100.0 ) # block sizing - Width = FloatProperty( + Width: FloatProperty( name="Width", description="Average width of each block", default=1.5, min=0.01, max=100.0 ) - WidthVariance = FloatProperty( + WidthVariance: FloatProperty( name="Variance", description="Random variance of block width", default=0.5, min=0.0, max=100.0 ) - WidthMinimum = FloatProperty( + WidthMinimum: FloatProperty( name="Minimum", description="Absolute minimum block width", default=0.5, min=0.01, max=100.0 ) - Height = FloatProperty( + Height: FloatProperty( name="Height", description="Average Height of each block", default=0.7, min=0.01, max=100.0 ) - HeightVariance = FloatProperty( + HeightVariance: FloatProperty( name="Variance", description="Random variance of block Height", default=0.3, min=0.0, max=100.0 ) - HeightMinimum = FloatProperty( + HeightMinimum: FloatProperty( name="Minimum", description="Absolute minimum block Height", default=0.25, min=0.01, max=100.0 ) - Depth = FloatProperty( + Depth: FloatProperty( name="Depth", description="Average Depth of each block", default=2.0, min=0.01, max=100.0 ) - DepthVariance = FloatProperty( + DepthVariance: FloatProperty( name="Variance", description="Random variance of block Depth", default=0.1, min=0.0, max=100.0 ) - DepthMinimum = FloatProperty( + DepthMinimum: FloatProperty( name="Minimum", description="Absolute minimum block Depth", default=1.0, min=0.01, max=100.0 ) - MergeBlock = BoolProperty( + MergeBlock: BoolProperty( name="Merge Blocks", description="Make big blocks (merge closely adjoining blocks)", default=False ) # edging for blocks - Grout = FloatProperty( + Grout: FloatProperty( name="Thickness", description="Distance between blocks", default=0.1, min=-10.0, max=10.0 ) - GroutVariance = FloatProperty( + GroutVariance: FloatProperty( name="Variance", description="Random variance of block Grout", default=0.03, min=0.0, max=100.0 ) - GroutDepth = FloatProperty( + GroutDepth: FloatProperty( name="Depth", description="Grout Depth from the face of the blocks", default=0.1, min=0.0001, max=10.0 ) - GroutDepthVariance = FloatProperty( + GroutDepthVariance: FloatProperty( name="Variance", description="Random variance of block Grout Depth", default=0.03, min=0.0, max=100.0 ) - GroutEdge = BoolProperty( + GroutEdge: BoolProperty( name="Edging", description="Grout perimiter", default=False ) # properties for openings - Opening1Tog = BoolProperty( + Opening1Tog: BoolProperty( name="Opening(s)", description="Make windows or doors", default=True ) - Opening1Width = FloatProperty( + Opening1Width: FloatProperty( name="Width", description="The Width of the first opening", default=2.5, min=0.01, max=100.0 ) - Opening1Height = FloatProperty( + Opening1Height: FloatProperty( name="Height", description="The Height of the first opening", default=3.5, min=0.01, max=100.0 ) - Opening1X = FloatProperty( + Opening1X: FloatProperty( name="Indent", description="The x position or spacing of the first opening", default=5.0, min=-100, max=100.0 ) - Opening1Z = FloatProperty( + Opening1Z: FloatProperty( name="Bottom", description="The z position of the First opening", default=5.0, min=-100, max=100.0 ) - Opening1Repeat = BoolProperty( + Opening1Repeat: BoolProperty( name="Repeat", description="make multiple openings, with spacing X1", default=False ) - Opening1TopArchTog = BoolProperty( + Opening1TopArchTog: BoolProperty( name="Top Arch", description="Add an arch to the top of the first opening", default=True ) - Opening1TopArch = FloatProperty( + Opening1TopArch: FloatProperty( name="Curve", description="Height of the arch on the top of the opening", default=2.5, min=0.001, max=100.0 ) - Opening1TopArchThickness = FloatProperty( + Opening1TopArchThickness: FloatProperty( name="Thickness", description="Thickness of the arch on the top of the opening", default=0.75, min=0.001, max=100.0 ) - Opening1BtmArchTog = BoolProperty( + Opening1BtmArchTog: BoolProperty( name="Bottom Arch", description="Add an arch to the bottom of opening 1", default=False ) - Opening1BtmArch = FloatProperty( + Opening1BtmArch: FloatProperty( name="Curve", description="Height of the arch on the bottom of the opening", default=1.0, min=0.01, max=100.0 ) - Opening1BtmArchThickness = FloatProperty( + Opening1BtmArchThickness: FloatProperty( name="Thickness", description="Thickness of the arch on the bottom of the opening", default=0.5, min=0.01, max=100.0 ) - Opening1Bevel = FloatProperty( + Opening1Bevel: FloatProperty( name="Bevel", description="Angle block face", default=0.25, min=-10.0, max=10.0 ) # openings on top of wall - CrenelTog = BoolProperty( + CrenelTog: BoolProperty( name="Crenels", description="Make openings along top of wall", default=False ) - CrenelXP = FloatProperty( + CrenelXP: FloatProperty( name="Width", description="Gap width in wall based the percentage of wall width", default=0.25, min=0.10, max=1.0, subtype="PERCENTAGE" ) - CrenelZP = FloatProperty( + CrenelZP: FloatProperty( name="Height", description="Crenel Height as the percentage of wall height", default=0.10, @@ -304,166 +304,166 @@ class add_mesh_wallb(Operator): ) # narrow openings in wall. # need to prevent overlap with arch openings - though inversion is an interesting effect. - SlotTog = BoolProperty( + SlotTog: BoolProperty( name="Slots", description="Make narrow openings in wall", default=False ) - SlotRpt = BoolProperty( + SlotRpt: BoolProperty( name="Repeat", description="Repeat slots along wall", default=False ) - SlotWdg = BoolProperty( + SlotWdg: BoolProperty( name="Wedged (n/a)", description="Bevel edges of slots", default=False ) - SlotX = FloatProperty( + SlotX: FloatProperty( name="Indent", description="The x position or spacing of slots", default=0.0, min=-100, max=100.0 ) - SlotGap = FloatProperty( + SlotGap: FloatProperty( name="Opening", description="The opening size of slots", default=0.5, min=0.10, max=100.0 ) - SlotV = BoolProperty( + SlotV: BoolProperty( name="Vertical", description="Vertical slots", default=True ) - SlotVH = FloatProperty( + SlotVH: FloatProperty( name="Height", description="Height of vertical slot", default=3.5, min=0.10, max=100.0 ) - SlotVBtm = FloatProperty( + SlotVBtm: FloatProperty( name="Bottom", description="Z position for slot", default=5.00, min=-100.0, max=100.0 ) - SlotH = BoolProperty( + SlotH: BoolProperty( name="Horizontal", description="Horizontal slots", default=False ) - SlotHW = FloatProperty( + SlotHW: FloatProperty( name="Width", description="Width of horizontal slot", default=2.5, min=0.10, max=100.0 ) # this should offset from VBtm... maybe make a % like crenels? - SlotHBtm = FloatProperty( + SlotHBtm: FloatProperty( name="Bottom", description="Z position for horizontal slot", default=5.50, min=-100.0, max=100.0 ) # properties for shelf (extend blocks in area) - ShelfTog = BoolProperty( + ShelfTog: BoolProperty( name="Shelf", description="Add blocks in area by depth to make shelf/platform", default=False ) - ShelfX = FloatProperty( + ShelfX: FloatProperty( name="Left", description="The x position of Shelf", default=-5.00, min=-100, max=100.0 ) - ShelfZ = FloatProperty( + ShelfZ: FloatProperty( name="Bottom", description="The z position of Shelf", default=10.0, min=-100, max=100.0 ) - ShelfH = FloatProperty( + ShelfH: FloatProperty( name="Height", description="The Height of Shelf area", default=1.0, min=0.01, max=100.0 ) - ShelfW = FloatProperty( + ShelfW: FloatProperty( name="Width", description="The Width of shelf area", default=5.0, min=0.01, max=100.0 ) - ShelfD = FloatProperty( + ShelfD: FloatProperty( name="Depth", description="Depth of each block for shelf (from cursor + 1/2 wall depth)", default=2.0, min=0.01, max=100.0 ) - ShelfBack = BoolProperty( + ShelfBack: BoolProperty( name="Backside", description="Shelf on backside of wall", default=False ) # properties for steps (extend blocks in area, progressive width) - StepTog = BoolProperty( + StepTog: BoolProperty( name="Steps", description="Add blocks in area by depth with progressive width to make steps", default=False ) - StepX = FloatProperty( + StepX: FloatProperty( name="Left", description="The x position of steps", default=-9.00, min=-100, max=100.0 ) - StepZ = FloatProperty( + StepZ: FloatProperty( name="Bottom", description="The z position of steps", default=0.0, min=-100, max=100.0 ) - StepH = FloatProperty( + StepH: FloatProperty( name="Height", description="The Height of step area", default=10.0, min=0.01, max=100.0 ) - StepW = FloatProperty( + StepW: FloatProperty( name="Width", description="The Width of step area", default=8.0, min=0.01, max=100.0 ) - StepD = FloatProperty( + StepD: FloatProperty( name="Depth", description="Depth of each block for steps (from cursor + 1/2 wall depth)", default=1.0, min=0.01, max=100.0 ) - StepV = FloatProperty( + StepV: FloatProperty( name="Riser", description="Height of each step", default=0.70, min=0.01, max=100.0 ) - StepT = FloatProperty( + StepT: FloatProperty( name="Tread", description="Width of each step", default=1.0, min=0.01, max=100.0 ) - StepLeft = BoolProperty( + StepLeft: BoolProperty( name="Direction", description="If checked, flip steps direction towards the -X axis", default=False ) - StepOnly = BoolProperty( + StepOnly: BoolProperty( name="Steps Only", description="Steps only, no supporting blocks", default=False ) - StepBack = BoolProperty( + StepBack: BoolProperty( name="Backside", description="Steps on backside of wall", default=False diff --git a/add_mesh_extra_objects/__init__.py b/add_mesh_extra_objects/__init__.py index 1197738c7503097714cd531c9f35cb37f1025c9f..c481d53d862073b966c8f75178acda5a0c607610 100644 --- a/add_mesh_extra_objects/__init__.py +++ b/add_mesh_extra_objects/__init__.py @@ -253,94 +253,94 @@ class VIEW3D_MT_mesh_pipe_joints_add(Menu): class discombobulator_scene_props(bpy.types.PropertyGroup): DISC_doodads = [] # Protusions Buttons: - repeatprot = IntProperty( + repeatprot: IntProperty( name="Repeat protusions", description=("Make several layers of protusion \n" "Use carefully, runs recursively the discombulator"), default=1, min=1, max=4 # set to 4 because it's 2**n reqursive ) - doprots = BoolProperty( + doprots: BoolProperty( name="Make protusions", description="Check if we want to add protusions to the mesh", default=True ) - subpolygon1 = BoolProperty( + subpolygon1: BoolProperty( name="1", default=True ) - subpolygon2 = BoolProperty( + subpolygon2: BoolProperty( name="2", default=True ) - subpolygon3 = BoolProperty( + subpolygon3: BoolProperty( name="3", default=True ) - subpolygon4 = BoolProperty( + subpolygon4: BoolProperty( name="4", default=True ) - polygonschangedpercent = FloatProperty( + polygonschangedpercent: FloatProperty( name="Polygon %", description="Percentage of changed polygons", default=1.0 ) - minHeight = FloatProperty( + minHeight: FloatProperty( name="Min height", description="Minimal height of the protusions", default=0.2 ) - maxHeight = FloatProperty( + maxHeight: FloatProperty( name="Max height", description="Maximal height of the protusions", default=0.4 ) - minTaper = FloatProperty( + minTaper: FloatProperty( name="Min taper", description="Minimal height of the protusions", default=0.15, min=0.0, max=1.0, subtype='PERCENTAGE' ) - maxTaper = FloatProperty( + maxTaper: FloatProperty( name="Max taper", description="Maximal height of the protusions", default=0.35, min=0.0, max=1.0, subtype='PERCENTAGE' ) # Doodads buttons: - dodoodads = BoolProperty( + dodoodads: BoolProperty( name="Make doodads", description="Check if we want to generate doodads", default=False ) - mindoodads = IntProperty( + mindoodads: IntProperty( name="Minimum doodads number", description="Ask for the minimum number of doodads to generate per polygon", default=1, min=0, max=50 ) - maxdoodads = IntProperty( + maxdoodads: IntProperty( name="Maximum doodads number", description="Ask for the maximum number of doodads to generate per polygon", default=6, min=1, max=50 ) - doodMinScale = FloatProperty( + doodMinScale: FloatProperty( name="Scale min", description="Minimum scaling of doodad", default=0.5, min=0.0, max=1.0, subtype='PERCENTAGE' ) - doodMaxScale = FloatProperty( + doodMaxScale: FloatProperty( name="Scale max", description="Maximum scaling of doodad", default=1.0, min=0.0, max=1.0, subtype='PERCENTAGE' ) # Materials buttons: - sideProtMat = IntProperty( + sideProtMat: IntProperty( name="Side's prot mat", description="Material of protusion's sides", default=0, min=0 ) - topProtMat = IntProperty( + topProtMat: IntProperty( name="Prot's top mat", description="Material of protusion's top", default=0, min=0 diff --git a/add_mesh_extra_objects/add_empty_as_parent.py b/add_mesh_extra_objects/add_empty_as_parent.py index a6ae69e6cafef2e34a0f2d9020aa2ea14225464c..0d4716a3042b8564cba81065be8d2bce0d6d962d 100644 --- a/add_mesh_extra_objects/add_empty_as_parent.py +++ b/add_mesh_extra_objects/add_empty_as_parent.py @@ -22,24 +22,24 @@ class P2E(Operator): bl_description = "Parent selected objects to a new Empty" bl_options = {"REGISTER", "UNDO"} - nombre = StringProperty( + nombre: StringProperty( name="", default='OBJECTS', description='Give the empty / group a name' ) - grupo = BoolProperty( + grupo: BoolProperty( name="Create Group", default=False, description="Also add objects to a group" ) - locat = EnumProperty( + locat: EnumProperty( name='', items=[('CURSOR', 'Cursor', 'Cursor'), ('ACTIVE', 'Active', 'Active'), ('CENTER', 'Center', 'Selection Center')], description='Empty location', default='CENTER' ) - renom = BoolProperty( + renom: BoolProperty( name="Add Prefix", default=False, description="Add prefix to objects name" diff --git a/add_mesh_extra_objects/add_mesh_3d_function_surface.py b/add_mesh_extra_objects/add_mesh_3d_function_surface.py index 616add3f7178db2b36b08c007713f8c0fdba0d9c..eb2b53c1e61f72c1e8a92ee832d888745db773de 100644 --- a/add_mesh_extra_objects/add_mesh_3d_function_surface.py +++ b/add_mesh_extra_objects/add_mesh_3d_function_surface.py @@ -116,26 +116,26 @@ class AddZFunctionSurface(Operator): bl_description = "Add a surface defined defined by a function z=f(x,y)" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - equation = StringProperty( + equation: StringProperty( name="Z Equation", description="Equation for z=f(x,y)", default="1 - ( x**2 + y**2 )" ) - div_x = IntProperty( + div_x: IntProperty( name="X Subdivisions", description="Number of vertices in x direction", default=16, min=3, max=256 ) - div_y = IntProperty( + div_y: IntProperty( name="Y Subdivisions", description="Number of vertices in y direction", default=16, min=3, max=256 ) - size_x = FloatProperty( + size_x: FloatProperty( name="X Size", description="Size of the x axis", default=2.0, @@ -143,7 +143,7 @@ class AddZFunctionSurface(Operator): max=100.0, unit="LENGTH" ) - size_y = FloatProperty( + size_y: FloatProperty( name="Y Size", description="Size of the y axis", default=2.0, @@ -383,83 +383,83 @@ class AddXYZFunctionSurface(Operator): "x=F1(u,v), y=F2(u,v) and z=F3(u,v)") bl_options = {'REGISTER', 'UNDO', 'PRESET'} - x_eq = StringProperty( + x_eq: StringProperty( name="X equation", description="Equation for x=F(u,v). " "Also available: n, a, b, c, f, g, h", default="cos(v)*(1+cos(u))*sin(v/8)" ) - y_eq = StringProperty( + y_eq: StringProperty( name="Y equation", description="Equation for y=F(u,v). " "Also available: n, a, b, c, f, g, h", default="sin(u)*sin(v/8)+cos(v/8)*1.5" ) - z_eq = StringProperty( + z_eq: StringProperty( name="Z equation", description="Equation for z=F(u,v). " "Also available: n, a, b, c, f, g, h", default="sin(v)*(1+cos(u))*sin(v/8)" ) - range_u_min = FloatProperty( + range_u_min: FloatProperty( name="U min", description="Minimum U value. Lower boundary of U range", min=-100.00, max=0.00, default=0.00 ) - range_u_max = FloatProperty( + range_u_max: FloatProperty( name="U max", description="Maximum U value. Upper boundary of U range", min=0.00, max=100.00, default=2 * pi ) - range_u_step = IntProperty( + range_u_step: IntProperty( name="U step", description="U Subdivisions", min=1, max=1024, default=32 ) - wrap_u = BoolProperty( + wrap_u: BoolProperty( name="U wrap", description="U Wrap around", default=True ) - range_v_min = FloatProperty( + range_v_min: FloatProperty( name="V min", description="Minimum V value. Lower boundary of V range", min=-100.00, max=0.00, default=0.00 ) - range_v_max = FloatProperty( + range_v_max: FloatProperty( name="V max", description="Maximum V value. Upper boundary of V range", min=0.00, max=100.00, default=4 * pi ) - range_v_step = IntProperty( + range_v_step: IntProperty( name="V step", description="V Subdivisions", min=1, max=1024, default=128 ) - wrap_v = BoolProperty( + wrap_v: BoolProperty( name="V wrap", description="V Wrap around", default=False ) - close_v = BoolProperty( + close_v: BoolProperty( name="Close V", description="Create faces for first and last " "V values (only if U is wrapped)", default=False ) - n_eq = IntProperty( + n_eq: IntProperty( name="Number of objects (n=0..N-1)", description="The parameter n will be the index " "of the current object, 0 to N-1", @@ -467,32 +467,32 @@ class AddXYZFunctionSurface(Operator): max=100, default=1 ) - a_eq = StringProperty( + a_eq: StringProperty( name="A helper function", description="Equation for a=F(u,v). Also available: n", default="0" ) - b_eq = StringProperty( + b_eq: StringProperty( name="B helper function", description="Equation for b=F(u,v). Also available: n", default="0" ) - c_eq = StringProperty( + c_eq: StringProperty( name="C helper function", description="Equation for c=F(u,v). Also available: n", default="0" ) - f_eq = StringProperty( + f_eq: StringProperty( name="F helper function", description="Equation for f=F(u,v). Also available: n, a, b, c", default="0" ) - g_eq = StringProperty( + g_eq: StringProperty( name="G helper function", description="Equation for g=F(u,v). Also available: n, a, b, c", default="0" ) - h_eq = StringProperty( + h_eq: StringProperty( name="H helper function", description="Equation for h=F(u,v). Also available: n, a, b, c", default="0" diff --git a/add_mesh_extra_objects/add_mesh_beam_builder.py b/add_mesh_extra_objects/add_mesh_beam_builder.py index ba8ae6fc75dcbdeb56aeb289cd60324400cd8f86..8c87695316238bf0ff41216101ed069026a38dbf 100644 --- a/add_mesh_extra_objects/add_mesh_beam_builder.py +++ b/add_mesh_extra_objects/add_mesh_beam_builder.py @@ -694,7 +694,7 @@ class addBeam(Operator): bl_description = "Create beam meshes of various profiles" bl_options = {'REGISTER', 'UNDO'} - Type = EnumProperty( + Type: EnumProperty( items=( ('0', "Box Profile", "Square Beam"), ("1", "U Profile", "U Profile Beam"), @@ -705,34 +705,34 @@ class addBeam(Operator): ), description="Beam form" ) - beamZ = FloatProperty( + beamZ: FloatProperty( name="Height", min=0.01, max=100, default=1 ) - beamX = FloatProperty( + beamX: FloatProperty( name="Width", min=0.01, max=100, default=.5 ) - beamY = FloatProperty( + beamY: FloatProperty( name="Depth", min=0.01, max=100, default=2 ) - beamW = FloatProperty( + beamW: FloatProperty( name="Thickness", min=0.01, max=1, default=0.1 ) - edgeA = IntProperty( + edgeA: IntProperty( name="Taper", min=0, max=100, default=0, description="Angle beam edges" ) - Cursor = BoolProperty( + Cursor: BoolProperty( name="Use 3D Cursor", default=False, description="Draw the beam where the 3D Cursor is" diff --git a/add_mesh_extra_objects/add_mesh_gears.py b/add_mesh_extra_objects/add_mesh_gears.py index 6a7bafd9364008dc46aa2c2aad6da58ea10c7f03..c631f3948030b832891d7a164c745c24cd813a71 100644 --- a/add_mesh_extra_objects/add_mesh_gears.py +++ b/add_mesh_extra_objects/add_mesh_gears.py @@ -554,69 +554,69 @@ class AddGear(Operator): bl_description = "Construct a gear mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - number_of_teeth = IntProperty(name="Number of Teeth", + number_of_teeth: IntProperty(name="Number of Teeth", description="Number of teeth on the gear", min=2, max=265, default=12 ) - radius = FloatProperty(name="Radius", + radius: FloatProperty(name="Radius", description="Radius of the gear, negative for crown gear", min=-100.0, max=100.0, unit='LENGTH', default=1.0 ) - addendum = FloatProperty(name="Addendum", + addendum: FloatProperty(name="Addendum", description="Addendum, extent of tooth above radius", min=0.01, max=100.0, unit='LENGTH', default=0.1 ) - dedendum = FloatProperty(name="Dedendum", + dedendum: FloatProperty(name="Dedendum", description="Dedendum, extent of tooth below radius", min=0.0, max=100.0, unit='LENGTH', default=0.1 ) - angle = FloatProperty(name="Pressure Angle", + angle: FloatProperty(name="Pressure Angle", description="Pressure angle, skewness of tooth tip", min=0.0, max=radians(45.0), unit='ROTATION', default=radians(20.0) ) - base = FloatProperty(name="Base", + base: FloatProperty(name="Base", description="Base, extent of gear below radius", min=0.0, max=100.0, unit='LENGTH', default=0.2 ) - width = FloatProperty(name="Width", + width: FloatProperty(name="Width", description="Width, thickness of gear", min=0.05, max=100.0, unit='LENGTH', default=0.2 ) - skew = FloatProperty(name="Skewness", + skew: FloatProperty(name="Skewness", description="Skew of teeth", min=radians(-90.0), max=radians(90.0), unit='ROTATION', default=radians(0.0) ) - conangle = FloatProperty(name="Conical angle", + conangle: FloatProperty(name="Conical angle", description="Conical angle of gear", min=0.0, max=radians(90.0), unit='ROTATION', default=radians(0.0) ) - crown = FloatProperty(name="Crown", + crown: FloatProperty(name="Crown", description="Inward pointing extend of crown teeth", min=0.0, max=100.0, @@ -681,21 +681,21 @@ class AddWormGear(Operator): bl_description = "Construct a worm gear mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - number_of_teeth = IntProperty( + number_of_teeth: IntProperty( name="Number of Teeth", description="Number of teeth on the gear", min=2, max=265, default=12 ) - number_of_rows = IntProperty( + number_of_rows: IntProperty( name="Number of Rows", description="Number of rows on the worm gear", min=2, max=265, default=32 ) - radius = FloatProperty( + radius: FloatProperty( name="Radius", description="Radius of the gear, negative for crown gear", min=-100.0, @@ -703,7 +703,7 @@ class AddWormGear(Operator): unit='LENGTH', default=1.0 ) - addendum = FloatProperty( + addendum: FloatProperty( name="Addendum", description="Addendum, extent of tooth above radius", min=0.01, @@ -711,7 +711,7 @@ class AddWormGear(Operator): unit='LENGTH', default=0.1 ) - dedendum = FloatProperty( + dedendum: FloatProperty( name="Dedendum", description="Dedendum, extent of tooth below radius", min=0.0, @@ -719,7 +719,7 @@ class AddWormGear(Operator): unit='LENGTH', default=0.1 ) - angle = FloatProperty( + angle: FloatProperty( name="Pressure Angle", description="Pressure angle, skewness of tooth tip", min=0.0, @@ -727,7 +727,7 @@ class AddWormGear(Operator): default=radians(20.0), unit='ROTATION' ) - row_height = FloatProperty( + row_height: FloatProperty( name="Row Height", description="Height of each Row", min=0.05, @@ -735,7 +735,7 @@ class AddWormGear(Operator): unit='LENGTH', default=0.2 ) - skew = FloatProperty( + skew: FloatProperty( name="Skewness per Row", description="Skew of each row", min=radians(-90.0), @@ -743,7 +743,7 @@ class AddWormGear(Operator): default=radians(11.25), unit='ROTATION' ) - crown = FloatProperty( + crown: FloatProperty( name="Crown", description="Inward pointing extend of crown teeth", min=0.0, diff --git a/add_mesh_extra_objects/add_mesh_gemstones.py b/add_mesh_extra_objects/add_mesh_gemstones.py index 0da6b48843722e431a48653b7ea50670fda04536..a07c9f66bb64c8add881e9cd900c794ac90c3506 100644 --- a/add_mesh_extra_objects/add_mesh_gemstones.py +++ b/add_mesh_extra_objects/add_mesh_gemstones.py @@ -211,35 +211,35 @@ class AddDiamond(Operator): bl_description = "Construct a diamond mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - segments = IntProperty( + segments: IntProperty( name="Segments", description="Number of segments for the diamond", min=3, max=256, default=32 ) - girdle_radius = FloatProperty( + girdle_radius: FloatProperty( name="Girdle Radius", description="Girdle radius of the diamond", min=0.01, max=9999.0, default=1.0 ) - table_radius = FloatProperty( + table_radius: FloatProperty( name="Table Radius", description="Girdle radius of the diamond", min=0.01, max=9999.0, default=0.6 ) - crown_height = FloatProperty( + crown_height: FloatProperty( name="Crown Height", description="Crown height of the diamond", min=0.01, max=9999.0, default=0.35 ) - pavilion_height = FloatProperty( + pavilion_height: FloatProperty( name="Pavilion Height", description="Pavilion height of the diamond", min=0.01, @@ -265,35 +265,35 @@ class AddGem(Operator): bl_description = "Construct an offset faceted gem mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - segments = IntProperty( + segments: IntProperty( name="Segments", description="Longitudial segmentation", min=3, max=265, default=8 ) - pavilion_radius = FloatProperty( + pavilion_radius: FloatProperty( name="Radius", description="Radius of the gem", min=0.01, max=9999.0, default=1.0 ) - crown_radius = FloatProperty( + crown_radius: FloatProperty( name="Table Radius", description="Radius of the table(top)", min=0.01, max=9999.0, default=0.6 ) - crown_height = FloatProperty( + crown_height: FloatProperty( name="Table height", description="Height of the top half", min=0.01, max=9999.0, default=0.35 ) - pavilion_height = FloatProperty( + pavilion_height: FloatProperty( name="Pavilion height", description="Height of bottom half", min=0.01, diff --git a/add_mesh_extra_objects/add_mesh_honeycomb.py b/add_mesh_extra_objects/add_mesh_honeycomb.py index 357be4cb7c258668492e4653f166a3c165f07682..90d69b2dd4db75db873c6bcc950302a5b3c31185 100644 --- a/add_mesh_extra_objects/add_mesh_honeycomb.py +++ b/add_mesh_extra_objects/add_mesh_honeycomb.py @@ -218,13 +218,13 @@ class add_mesh_honeycomb(bpy.types.Operator): if self.edge > m: self.edge = m - rows = IntProperty( + rows: IntProperty( name="Num of rows", default=2, min=1, max=100, description='Number of the rows' ) - cols = IntProperty( + cols: IntProperty( name='Num of cols', default=2, min=1, max=100, @@ -236,28 +236,28 @@ class add_mesh_honeycomb(bpy.types.Operator): subtype='LAYER', options={'HIDDEN', 'SKIP_SAVE'}, ) - diam = FloatProperty( + diam: FloatProperty( name='Cell Diameter', default=1.0, min=0.0, update=fix_edge, description='Diameter of the cell' ) - edge = FloatProperty( + edge: FloatProperty( name='Edge Width', default=0.1, min=0.0, update=fix_edge, description='Width of the edge' ) # generic transform props - view_align = BoolProperty( + view_align: BoolProperty( name="Align to View", default=False ) - location = FloatVectorProperty( + location: FloatVectorProperty( name="Location", subtype='TRANSLATION' ) - rotation = FloatVectorProperty( + rotation: FloatVectorProperty( name="Rotation", subtype='EULER' ) diff --git a/add_mesh_extra_objects/add_mesh_menger_sponge.py b/add_mesh_extra_objects/add_mesh_menger_sponge.py index d0d25d9efbc83317bdda57a72e4d2c9544c8b2ec..df4fcb21c193885d2da444757842ea499b75c819 100644 --- a/add_mesh_extra_objects/add_mesh_menger_sponge.py +++ b/add_mesh_extra_objects/add_mesh_menger_sponge.py @@ -144,28 +144,28 @@ class AddMengerSponge(bpy.types.Operator): bl_description = "Construct a menger sponge mesh" bl_options = {'REGISTER', 'UNDO'} - level = IntProperty( + level: IntProperty( name="Level", description="Sponge Level", min=0, max=4, default=1, ) - radius = FloatProperty( + radius: FloatProperty( name="Width", description="Sponge Radius", min=0.01, max=100.0, default=1.0, ) # generic transform props - view_align = BoolProperty( + view_align: BoolProperty( name="Align to View", default=False, ) - location = FloatVectorProperty( + location: FloatVectorProperty( name="Location", subtype='TRANSLATION', ) - rotation = FloatVectorProperty( + rotation: FloatVectorProperty( name="Rotation", subtype='EULER', ) diff --git a/add_mesh_extra_objects/add_mesh_pipe_joint.py b/add_mesh_extra_objects/add_mesh_pipe_joint.py index c0a995d881e99e6af3ddd15df1a3e8b8fdeeffd3..0fe5d67b2d453d756ea513059f05484b5c9b97f4 100644 --- a/add_mesh_extra_objects/add_mesh_pipe_joint.py +++ b/add_mesh_extra_objects/add_mesh_pipe_joint.py @@ -94,7 +94,7 @@ class AddElbowJoint(Operator): bl_description = "Construct an elbow pipe mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - radius = FloatProperty( + radius: FloatProperty( name="Radius", description="The radius of the pipe", default=1.0, @@ -102,12 +102,12 @@ class AddElbowJoint(Operator): max=100.0, unit="LENGTH" ) - div = IntProperty( + div: IntProperty( name="Divisions", description="Number of vertices (divisions)", default=32, min=3, max=256 ) - angle = FloatProperty( + angle: FloatProperty( name="Angle", description="The angle of the branching pipe (i.e. the 'arm' - " "Measured from the center line of the main pipe", @@ -116,7 +116,7 @@ class AddElbowJoint(Operator): max=radians(179.9), unit="ROTATION" ) - startLength = FloatProperty( + startLength: FloatProperty( name="Length Start", description="Length of the beginning of the pipe", default=3.0, @@ -124,7 +124,7 @@ class AddElbowJoint(Operator): max=100.0, unit="LENGTH" ) - endLength = FloatProperty( + endLength: FloatProperty( name="End Length", description="Length of the end of the pipe", default=3.0, @@ -203,7 +203,7 @@ class AddTeeJoint(Operator): bl_description = "Construct a tee-joint pipe mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - radius = FloatProperty( + radius: FloatProperty( name="Radius", description="The radius of the pipe", default=1.0, @@ -211,14 +211,14 @@ class AddTeeJoint(Operator): max=100.0, unit="LENGTH" ) - div = IntProperty( + div: IntProperty( name="Divisions", description="Number of vertices (divisions)", default=32, min=4, max=256 ) - angle = FloatProperty( + angle: FloatProperty( name="Angle", description="The angle of the branching pipe (i.e. the 'arm' - " "Measured from the center line of the main pipe", @@ -227,7 +227,7 @@ class AddTeeJoint(Operator): max=radians(179.9), unit="ROTATION" ) - startLength = FloatProperty( + startLength: FloatProperty( name="Length Start", description="Length of the beginning of the" " main pipe (the straight one)", @@ -236,7 +236,7 @@ class AddTeeJoint(Operator): max=100.0, unit="LENGTH" ) - endLength = FloatProperty( + endLength: FloatProperty( name="End Length", description="Length of the end of the" " main pipe (the straight one)", @@ -245,7 +245,7 @@ class AddTeeJoint(Operator): max=100.0, unit="LENGTH" ) - branchLength = FloatProperty( + branchLength: FloatProperty( name="Arm Length", description="Length of the arm pipe (the bent one)", default=3.0, @@ -385,7 +385,7 @@ class AddWyeJoint(Operator): bl_description = "Construct a wye-joint pipe mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - radius = FloatProperty( + radius: FloatProperty( name="Radius", description="The radius of the pipe", default=1.0, @@ -393,14 +393,14 @@ class AddWyeJoint(Operator): max=100.0, unit="LENGTH" ) - div = IntProperty( + div: IntProperty( name="Divisions", description="Number of vertices (divisions)", default=32, min=4, max=256 ) - angle1 = FloatProperty( + angle1: FloatProperty( name="Angle 1", description="The angle of the 1. branching pipe " "(measured from the center line of the main pipe)", @@ -409,7 +409,7 @@ class AddWyeJoint(Operator): max=radians(179.9), unit="ROTATION" ) - angle2 = FloatProperty( + angle2: FloatProperty( name="Angle 2", description="The angle of the 2. branching pipe " "(measured from the center line of the main pipe) ", @@ -418,7 +418,7 @@ class AddWyeJoint(Operator): max=radians(179.9), unit="ROTATION" ) - startLength = FloatProperty( + startLength: FloatProperty( name="Length Start", description="Length of the beginning of the" " main pipe (the straight one)", @@ -427,7 +427,7 @@ class AddWyeJoint(Operator): max=100.0, unit="LENGTH" ) - branch1Length = FloatProperty( + branch1Length: FloatProperty( name="Length Arm 1", description="Length of the 1. arm", default=3.0, @@ -435,7 +435,7 @@ class AddWyeJoint(Operator): max=100.0, unit="LENGTH" ) - branch2Length = FloatProperty( + branch2Length: FloatProperty( name="Length Arm 2", description="Length of the 2. arm", default=3.0, @@ -587,7 +587,7 @@ class AddCrossJoint(Operator): bl_description = "Construct a cross-joint pipe mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - radius = FloatProperty( + radius: FloatProperty( name="Radius", description="The radius of the pipe", default=1.0, @@ -595,14 +595,14 @@ class AddCrossJoint(Operator): max=100.0, unit="LENGTH" ) - div = IntProperty( + div: IntProperty( name="Divisions", description="Number of vertices (divisions)", default=32, min=4, max=256 ) - angle1 = FloatProperty( + angle1: FloatProperty( name="Angle 1", description="The angle of the 1. arm (from the main axis)", default=radians(90.0), @@ -610,21 +610,21 @@ class AddCrossJoint(Operator): max=radians(179.9), unit="ROTATION" ) - angle2 = FloatProperty(name="Angle 2", + angle2: FloatProperty(name="Angle 2", description="The angle of the 2. arm (from the main axis)", default=radians(90.0), min=radians(-179.9), max=radians(179.9), unit="ROTATION" ) - angle3 = FloatProperty(name="Angle 3 (center)", + angle3: FloatProperty(name="Angle 3 (center)", description="The angle of the center arm (from the main axis)", default=radians(0.0), min=radians(-179.9), max=radians(179.9), unit="ROTATION" ) - startLength = FloatProperty( + startLength: FloatProperty( name="Length Start", description="Length of the beginning of the " "main pipe (the straight one)", @@ -633,14 +633,14 @@ class AddCrossJoint(Operator): max=100.0, unit="LENGTH" ) - branch1Length = FloatProperty(name="Length Arm 1", + branch1Length: FloatProperty(name="Length Arm 1", description="Length of the 1. arm", default=3.0, min=0.01, max=100.0, unit="LENGTH" ) - branch2Length = FloatProperty( + branch2Length: FloatProperty( name="Length Arm 2", description="Length of the 2. arm", default=3.0, @@ -648,7 +648,7 @@ class AddCrossJoint(Operator): max=100.0, unit="LENGTH" ) - branch3Length = FloatProperty( + branch3Length: FloatProperty( name="Length Arm 3 (center)", description="Length of the center arm", default=3.0, @@ -847,7 +847,7 @@ class AddNJoint(Operator): bl_description = "Construct a n-joint pipe mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - radius = FloatProperty( + radius: FloatProperty( name="Radius", description="The radius of the pipe", default=1.0, @@ -855,21 +855,21 @@ class AddNJoint(Operator): max=100.0, unit="LENGTH" ) - div = IntProperty( + div: IntProperty( name="Divisions", description="Number of vertices (divisions)", default=32, min=4, max=256 ) - number = IntProperty( + number: IntProperty( name="Arms / Joints", description="Number of joints / arms", default=5, min=2, max=99999 ) - length = FloatProperty( + length: FloatProperty( name="Length", description="Length of each joint / arm", default=3.0, diff --git a/add_mesh_extra_objects/add_mesh_pyramid.py b/add_mesh_extra_objects/add_mesh_pyramid.py index 680267cb380466e1fe967eed43fa5a064e5ddebd..ec41cc4faeeb2f7821fc3665fd7d550ccd89391e 100644 --- a/add_mesh_extra_objects/add_mesh_pyramid.py +++ b/add_mesh_extra_objects/add_mesh_pyramid.py @@ -107,31 +107,31 @@ class AddPyramid(Operator, AddObjectHelper): bl_description = "Construct a step pyramid mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - num_sides = IntProperty( + num_sides: IntProperty( name="Number Sides", description="How many sides each step will have", min=3, max=20, default=4 ) - num_steps = IntProperty( + num_steps: IntProperty( name="Number of Steps", description="How many steps for the overall pyramid", min=1, max=20, default=10 ) - width = FloatProperty( + width: FloatProperty( name="Initial Width", description="Initial base step width", min=0.01, max=100.0, default=2 ) - height = FloatProperty( + height: FloatProperty( name="Height", description="How tall each step will be", min=0.01, max=100.0, default=0.1 ) - reduce_by = FloatProperty( + reduce_by: FloatProperty( name="Reduce Step By", description="How much to reduce each succeeding step by", min=.01, max=2.0, diff --git a/add_mesh_extra_objects/add_mesh_round_brilliant.py b/add_mesh_extra_objects/add_mesh_round_brilliant.py index d8310c4203e5bbf6cb4d1a96ed5b442c19dedf7a..b5c0f869e1b81b5fdf5495eea5b0af0f9a326503 100644 --- a/add_mesh_extra_objects/add_mesh_round_brilliant.py +++ b/add_mesh_extra_objects/add_mesh_round_brilliant.py @@ -305,7 +305,7 @@ class MESH_OT_primitive_brilliant_add(Operator): bl_options = {'REGISTER', 'UNDO', 'PRESET'} # set user options - s = IntProperty( + s: IntProperty( name="Segments", description="Longitudial segmentation", step=1, @@ -314,7 +314,7 @@ class MESH_OT_primitive_brilliant_add(Operator): default=16, subtype='FACTOR' ) - table_w = FloatProperty( + table_w: FloatProperty( name="Table width", description="Width of table", min=0.001, @@ -322,7 +322,7 @@ class MESH_OT_primitive_brilliant_add(Operator): default=0.53, subtype='PERCENTAGE' ) - crown_h = FloatProperty( + crown_h: FloatProperty( name="Crown height", description="Height of crown", min=0.0, @@ -330,7 +330,7 @@ class MESH_OT_primitive_brilliant_add(Operator): default=0.162, subtype='PERCENTAGE' ) - girdle_t = FloatProperty( + girdle_t: FloatProperty( name="Girdle height", description="Height of girdle", min=0.0, @@ -338,17 +338,17 @@ class MESH_OT_primitive_brilliant_add(Operator): default=0.017, subtype='PERCENTAGE' ) - girdle_real = BoolProperty( + girdle_real: BoolProperty( name="Real girdle", description="More beautiful girdle; has more polygons", default=True ) - g_real_smooth = BoolProperty( + g_real_smooth: BoolProperty( name="Smooth girdle", description="smooth shading for girdle, only available for real girdle", default=False ) - pavi_d = FloatProperty( + pavi_d: FloatProperty( name="Pavilion depth", description="Height of pavilion", min=0.0, @@ -356,7 +356,7 @@ class MESH_OT_primitive_brilliant_add(Operator): default=0.431, subtype='PERCENTAGE' ) - bezel_f = FloatProperty( + bezel_f: FloatProperty( name="Upper facet factor", description="Determines the form of bezel and upper girdle facets", min=0.0, @@ -364,7 +364,7 @@ class MESH_OT_primitive_brilliant_add(Operator): default=0.250, subtype='PERCENTAGE' ) - pavi_f = FloatProperty( + pavi_f: FloatProperty( name="Lower facet factor", description="Determines the form of pavilion and lower girdle facets", min=0.001, @@ -372,7 +372,7 @@ class MESH_OT_primitive_brilliant_add(Operator): default=0.400, subtype='PERCENTAGE' ) - culet = FloatProperty( + culet: FloatProperty( name="Culet size", description="0: no culet (default)", min=0.0, @@ -380,7 +380,7 @@ class MESH_OT_primitive_brilliant_add(Operator): default=0.0, subtype='PERCENTAGE' ) - keep_lga = BoolProperty( + keep_lga: BoolProperty( name="Retain lower angle", description="If culet > 0, retains angle of pavilion facets", default=False diff --git a/add_mesh_extra_objects/add_mesh_round_cube.py b/add_mesh_extra_objects/add_mesh_round_cube.py index dca438aeb1be43c722135e1e706b832fc633cebf..6c39e799229375466fc195699b4d6329b5ae0923 100644 --- a/add_mesh_extra_objects/add_mesh_round_cube.py +++ b/add_mesh_extra_objects/add_mesh_round_cube.py @@ -339,27 +339,27 @@ class AddRoundCube(Operator, object_utils.AddObjectHelper): sanity_check_verts = 200000 vert_count = 0 - radius = FloatProperty( + radius: FloatProperty( name="Radius", description="Radius of vertices for sphere, capsule or cuboid bevel", default=1.0, min=0.0, soft_min=0.01, step=10 ) - size = FloatVectorProperty( + size: FloatVectorProperty( name="Size", description="Size", subtype='XYZ', ) - arc_div = IntProperty( + arc_div: IntProperty( name="Arc Divisions", description="Arc curve divisions, per quadrant, 0=derive from Linear", default=4, min=1 ) - lin_div = FloatProperty( + lin_div: FloatProperty( name="Linear Divisions", description="Linear unit divisions (Edges/Faces), 0=derive from Arc", default=0.0, min=0.0, step=100, precision=1 ) - div_type = EnumProperty( + div_type: EnumProperty( name='Type', description='Division type', items=( @@ -368,11 +368,11 @@ class AddRoundCube(Operator, object_utils.AddObjectHelper): ('ALL', 'All', 'Sphere / Corners, extruded edges and faces (size)')), default='CORNERS', ) - odd_axis_align = BoolProperty( + odd_axis_align: BoolProperty( name='Odd Axis Align', description='Align odd arc divisions with axes (Note: triangle corners!)', ) - no_limit = BoolProperty( + no_limit: BoolProperty( name='No Limit', description='Do not limit to ' + str(sanity_check_verts) + ' vertices (sanity check)', options={'HIDDEN'} diff --git a/add_mesh_extra_objects/add_mesh_solid.py b/add_mesh_extra_objects/add_mesh_solid.py index e8127e34b73d75dee5b110bba4778ab8154cbecd..98172d37312a22c19fdee5f303371f87baf193ec 100644 --- a/add_mesh_extra_objects/add_mesh_solid.py +++ b/add_mesh_extra_objects/add_mesh_solid.py @@ -328,7 +328,7 @@ class Solids(bpy.types.Operator): bl_description = "Add one of the Platonic, Archimedean or Catalan solids" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - source = EnumProperty( + source: EnumProperty( items=(("4", "Tetrahedron", ""), ("6", "Hexahedron", ""), ("8", "Octahedron", ""), @@ -337,7 +337,7 @@ class Solids(bpy.types.Operator): name="Source", description="Starting point of your solid" ) - size = FloatProperty( + size: FloatProperty( name="Size", description="Radius of the sphere through the vertices", min=0.01, @@ -346,7 +346,7 @@ class Solids(bpy.types.Operator): soft_max=100, default=1.0 ) - vTrunc = FloatProperty( + vTrunc: FloatProperty( name="Vertex Truncation", description="Amount of vertex truncation", min=0.0, @@ -357,7 +357,7 @@ class Solids(bpy.types.Operator): precision=3, step=0.5 ) - eTrunc = FloatProperty( + eTrunc: FloatProperty( name="Edge Truncation", description="Amount of edge truncation", min=0.0, @@ -368,24 +368,24 @@ class Solids(bpy.types.Operator): precision=3, step=0.2 ) - snub = EnumProperty( + snub: EnumProperty( items=(("None", "No Snub", ""), ("Left", "Left Snub", ""), ("Right", "Right Snub", "")), name="Snub", description="Create the snub version" ) - dual = BoolProperty( + dual: BoolProperty( name="Dual", description="Create the dual of the current solid", default=False ) - keepSize = BoolProperty( + keepSize: BoolProperty( name="Keep Size", description="Keep the whole solid at a constant size", default=False ) - preset = EnumProperty( + preset: EnumProperty( items=(("0", "Custom", ""), ("t4", "Truncated Tetrahedron", ""), ("r4", "Cuboctahedron", ""), diff --git a/add_mesh_extra_objects/add_mesh_star.py b/add_mesh_extra_objects/add_mesh_star.py index b7e420fe091fa7180f916503e8b1c46cbfd7c161..411fa91d7ca4e552f3b3f947700062b4608308b5 100644 --- a/add_mesh_extra_objects/add_mesh_star.py +++ b/add_mesh_extra_objects/add_mesh_star.py @@ -148,28 +148,28 @@ class AddStar(bpy.types.Operator): bl_description = "Construct a star mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - points = IntProperty( + points: IntProperty( name="Points", description="Number of points for the star", min=2, max=256, default=5 ) - outer_radius = FloatProperty( + outer_radius: FloatProperty( name="Outer Radius", description="Outer radius of the star", min=0.01, max=9999.0, default=1.0 ) - innter_radius = FloatProperty( + innter_radius: FloatProperty( name="Inner Radius", description="Inner radius of the star", min=0.01, max=9999.0, default=0.5 ) - height = FloatProperty(name="Height", + height: FloatProperty(name="Height", description="Height of the star", min=0.01, max=9999.0, diff --git a/add_mesh_extra_objects/add_mesh_supertoroid.py b/add_mesh_extra_objects/add_mesh_supertoroid.py index 655333150492169cae3c20084e0a95347049c7d7..5836ed5e5df2f8f84ab0886700c5aa3dea046cf7 100644 --- a/add_mesh_extra_objects/add_mesh_supertoroid.py +++ b/add_mesh_extra_objects/add_mesh_supertoroid.py @@ -142,48 +142,48 @@ class add_supertoroid(bpy.types.Operator): bl_description = "Construct a supertoroid mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - R = FloatProperty( + R: FloatProperty( name="Big radius", description="The radius inside the tube", default=1.0, min=0.01, max=100.0 ) - r = FloatProperty( + r: FloatProperty( name="Small radius", description="The radius of the tube", default=0.3, min=0.01, max=100.0 ) - u = IntProperty( + u: IntProperty( name="U-segments", description="Radial segmentation", default=16, min=3, max=265 ) - v = IntProperty( + v: IntProperty( name="V-segments", description="Lateral segmentation", default=8, min=3, max=265 ) - n1 = FloatProperty( + n1: FloatProperty( name="Ring manipulator", description="Manipulates the shape of the Ring", default=1.0, min=0.01, max=100.0 ) - n2 = FloatProperty( + n2: FloatProperty( name="Cross manipulator", description="Manipulates the shape of the cross-section", default=1.0, min=0.01, max=100.0 ) - ie = BoolProperty( + ie: BoolProperty( name="Use Int. and Ext. radii", description="Use internal and external radii", default=False ) - edit = BoolProperty( + edit: BoolProperty( name="", description="", default=False, diff --git a/add_mesh_extra_objects/add_mesh_teapot.py b/add_mesh_extra_objects/add_mesh_teapot.py index 3f117d724be36d1b9f853473b1f8ef5cae9050d9..1dabc520269929762f91e33d31297bdb29420023 100644 --- a/add_mesh_extra_objects/add_mesh_teapot.py +++ b/add_mesh_extra_objects/add_mesh_teapot.py @@ -17,13 +17,13 @@ class AddTeapot(bpy.types.Operator): bl_description = "Construct a teapot or teaspoon mesh" bl_options = {"REGISTER", "UNDO"} - resolution = IntProperty( + resolution: IntProperty( name="Resolution", description="Resolution of the Teapot", default=5, min=2, max=15, ) - objecttype = EnumProperty( + objecttype: EnumProperty( name="Object Type", description="Type of Bezier Object", items=(('1', "Teapot", "Construct a teapot mesh"), diff --git a/add_mesh_extra_objects/add_mesh_torusknot.py b/add_mesh_extra_objects/add_mesh_torusknot.py index 1cdac6b6ece34d7b406ba0de06bcc6b76084a528..7004fab47b3a765db252037bd9df1624c644dbe2 100644 --- a/add_mesh_extra_objects/add_mesh_torusknot.py +++ b/add_mesh_extra_objects/add_mesh_torusknot.py @@ -98,13 +98,13 @@ class AddTorusKnot(bpy.types.Operator): bl_description = "Construct a torus knot mesh" bl_options = {"REGISTER", "UNDO"} - resolution = IntProperty( + resolution: IntProperty( name="Resolution", description="Resolution of the Torus Knot", default=80, min=30, max=256 ) - objecttype = IntProperty( + objecttype: IntProperty( name="Knot Type", description="Type of Knot", default=1, diff --git a/add_mesh_extra_objects/add_mesh_triangles.py b/add_mesh_extra_objects/add_mesh_triangles.py index 2cccd0fb3060d0d176359bb1e99a83eff6daecfe..8a66254796f8bdae73ca027d8281e3183ebf694e 100644 --- a/add_mesh_extra_objects/add_mesh_triangles.py +++ b/add_mesh_extra_objects/add_mesh_triangles.py @@ -74,33 +74,33 @@ class MakeTriangle(Operator): ] # add definitions for some manipulation buttons - flipX = BoolProperty( + flipX: BoolProperty( name="Flip X sign", description="Draw on the other side of the X axis (Mirror on Y axis)", default=False ) - flipY = BoolProperty( + flipY: BoolProperty( name="Flip Y sign", description="Draw on the other side of the Y axis (Mirror on X axis)", default=False ) - scale = FloatProperty( + scale: FloatProperty( name="Scale", description="Triangle scale", default=1.0, min=1.0 ) - triangleType = EnumProperty( + triangleType: EnumProperty( items=triangleTypeList, name="Type", description="Triangle Type" ) - triangleFace = EnumProperty( + triangleFace: EnumProperty( items=triangleFaceList, name="Face types", description="Triangle Face Types" ) - at_3Dcursor = BoolProperty( + at_3Dcursor: BoolProperty( name="Use 3D Cursor", description="Draw the triangle where the 3D cursor is", default=False diff --git a/add_mesh_extra_objects/add_mesh_twisted_torus.py b/add_mesh_extra_objects/add_mesh_twisted_torus.py index f66324a4ff04f1d3dd6d78b75ffebfcdda3d7a6d..17d3f1a9a8729b7c7dce0484160bf54470178d4c 100644 --- a/add_mesh_extra_objects/add_mesh_twisted_torus.py +++ b/add_mesh_extra_objects/add_mesh_twisted_torus.py @@ -139,7 +139,7 @@ class AddTwistedTorus(bpy.types.Operator): bl_description = "Construct a twisted torus mesh" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - major_radius = FloatProperty( + major_radius: FloatProperty( name="Major Radius", description="Radius from the origin to the" " center of the cross section", @@ -147,47 +147,47 @@ class AddTwistedTorus(bpy.types.Operator): max=100.0, default=1.0 ) - minor_radius = FloatProperty( + minor_radius: FloatProperty( name="Minor Radius", description="Radius of the torus' cross section", min=0.01, max=100.0, default=0.25 ) - major_segments = IntProperty( + major_segments: IntProperty( name="Major Segments", description="Number of segments for the main ring of the torus", min=3, max=256, default=48 ) - minor_segments = IntProperty( + minor_segments: IntProperty( name="Minor Segments", description="Number of segments for the minor ring of the torus", min=3, max=256, default=12 ) - twists = IntProperty( + twists: IntProperty( name="Twists", description="Number of twists of the torus", min=0, max=256, default=1 ) - use_abso = BoolProperty( + use_abso: BoolProperty( name="Use Int/Ext Controls", description="Use the Int/Ext controls for torus dimensions", default=False ) - abso_major_rad = FloatProperty( + abso_major_rad: FloatProperty( name="Exterior Radius", description="Total Exterior Radius of the torus", min=0.01, max=100.0, default=1.0 ) - abso_minor_rad = FloatProperty( + abso_minor_rad: FloatProperty( name="Inside Radius", description="Total Interior Radius of the torus", min=0.01, diff --git a/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py b/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py index ab3b0e9b2fb743d0a4673657ee96f530cec15ebf..e3ea4009bbbecf1d8d158286080217f0a8cf841d 100644 --- a/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py +++ b/add_mesh_extra_objects/geodesic_domes/third_domes_panel_271.py @@ -34,23 +34,23 @@ class GenerateGeodesicDome(Operator): bl_options = {'REGISTER', 'UNDO'} # PKHG_NEW saving and loading parameters - save_parameters = BoolProperty( + save_parameters: BoolProperty( name="Save params", description="Activation save */tmp/GD_0.GD", default=False ) - load_parameters = BoolProperty( + load_parameters: BoolProperty( name="Load params", description="Read */tmp/GD_0.GD", default=False ) - gd_help_text_width = IntProperty( + gd_help_text_width: IntProperty( name="Text Width", description="The width above which the text wraps", default=60, max=180, min=20 ) - mainpages = EnumProperty( + mainpages: EnumProperty( name="Menu", description="Create Faces, Struts & Hubs", items=[("Main", "Main", "Geodesic objects"), @@ -62,7 +62,7 @@ class GenerateGeodesicDome(Operator): default='Main' ) # for Faces - facetype_menu = EnumProperty( + facetype_menu: EnumProperty( name="Faces", description="choose a facetype", items=[("0", "strip", "strip"), @@ -79,43 +79,43 @@ class GenerateGeodesicDome(Operator): ], default='0' ) - facetoggle = BoolProperty( + facetoggle: BoolProperty( name="Activate: Face Object", description="Activate Faces for Geodesic object", default=False ) - face_use_imported_object = BoolProperty( + face_use_imported_object: BoolProperty( name="Use: Imported Object", description="Activate faces on your Imported object", default=False ) - facewidth = FloatProperty( + facewidth: FloatProperty( name="Face Width", min=-1, soft_min=0.001, max=4, default=.50 ) - fwtog = BoolProperty( + fwtog: BoolProperty( name="Width tweak", default=False ) - faceheight = FloatProperty( + faceheight: FloatProperty( name="Face Height", min=0.001, max=4, default=1 ) - fhtog = BoolProperty( + fhtog: BoolProperty( name="Height tweak", default=False ) - face_detach = BoolProperty( + face_detach: BoolProperty( name="Detach Faces", default=False ) - fmeshname = StringProperty( + fmeshname: StringProperty( name="Face Mesh name", default="defaultface" ) - geodesic_types = EnumProperty( + geodesic_types: EnumProperty( name="Objects", description="Choose Geodesic, Grid, Cylinder, Parabola, " "Torus, Sphere, Import your mesh or Superparameters", @@ -129,12 +129,12 @@ class GenerateGeodesicDome(Operator): ], default='Geodesic' ) - import_mesh_name = StringProperty( + import_mesh_name: StringProperty( name="Mesh to import", description="the name has to be the name of a meshobject", default="None" ) - base_type = EnumProperty( + base_type: EnumProperty( name="Hedron", description="Choose between Tetrahedron, Octahedron, Icosahedron ", items=[("Tetrahedron", "Tetrahedron", "Generate Tetrahedron"), @@ -143,7 +143,7 @@ class GenerateGeodesicDome(Operator): ], default='Tetrahedron' ) - orientation = EnumProperty( + orientation: EnumProperty( name="Point^", description="Point (Vert), Edge or Face pointing upwards", items=[("PointUp", "PointUp", "Point up"), @@ -152,7 +152,7 @@ class GenerateGeodesicDome(Operator): ], default='PointUp' ) - geodesic_class = EnumProperty( + geodesic_class: EnumProperty( name="Class", description="Subdivide Basic/Triacon", items=[("Class 1", "Class 1", "class one"), @@ -160,7 +160,7 @@ class GenerateGeodesicDome(Operator): ], default='Class 1' ) - tri_hex_star = EnumProperty( + tri_hex_star: EnumProperty( name="Shape", description="Choose between tri hex star face types", items=[("tri", "tri", "tri faces"), @@ -169,7 +169,7 @@ class GenerateGeodesicDome(Operator): ], default='tri' ) - spherical_flat = EnumProperty( + spherical_flat: EnumProperty( name="Round", description="Choose between spherical or flat ", items=[("spherical", "spherical", "Generate spherical"), @@ -177,280 +177,280 @@ class GenerateGeodesicDome(Operator): ], default='spherical' ) - use_imported_mesh = BoolProperty( + use_imported_mesh: BoolProperty( name="use import", description="Use an imported mesh", default=False ) # Cylinder - cyxres = IntProperty( + cyxres: IntProperty( name="Resolution x/y", min=3, max=32, description="Number of faces around x/y", default=5 ) - cyyres = IntProperty( + cyyres: IntProperty( name="Resolution z", min=3, max=32, description="Number of faces in z direction", default=5 ) - cyxsz = FloatProperty( + cyxsz: FloatProperty( name="Scale x/y", min=0.01, max=10, description="Scale in x/y direction", default=1 ) - cyysz = FloatProperty( + cyysz: FloatProperty( name="Scale z", min=0.01, max=10, description="Scale in z direction", default=1 ) - cyxell = FloatProperty( + cyxell: FloatProperty( name="Stretch x", min=0.001, max=4, description="Stretch in x direction", default=1 ) - cygap = FloatProperty( + cygap: FloatProperty( name="Gap", min=-2, max=2, description="Shrink in % around radius", default=1 ) - cygphase = FloatProperty( + cygphase: FloatProperty( name="Phase", min=-4, max=4, description="Rotate around pivot x/y", default=0 ) # Parabola - paxres = IntProperty( + paxres: IntProperty( name="Resolution x/y", min=3, max=32, description="Number of faces around x/y", default=5 ) - payres = IntProperty( + payres: IntProperty( name="Resolution z", min=3, max=32, description="Number of faces in z direction", default=5 ) - paxsz = FloatProperty( + paxsz: FloatProperty( name="Scale x/y", min=0.001, max=10, description="scale in x/y direction", default=0.30 ) - paysz = FloatProperty( + paysz: FloatProperty( name="Scale z", min=0.001, max=10, description="Scale in z direction", default=1 ) - paxell = FloatProperty( + paxell: FloatProperty( name="Stretch x", min=0.001, max=4, description="Stretch in x direction", default=1 ) - pagap = FloatProperty( + pagap: FloatProperty( name="Gap", min=-2, max=2, description="Shrink in % around radius", default=1 ) - pagphase = FloatProperty( + pagphase: FloatProperty( name="Phase", min=-4, max=4, description="Rotate around pivot x/y", default=0 ) # Torus - ures = IntProperty( + ures: IntProperty( name="Resolution x/y", min=3, max=32, description="Number of faces around x/y", default=8) - vres = IntProperty( + vres: IntProperty( name="Resolution z", min=3, max=32, description="Number of faces in z direction", default=8) - urad = FloatProperty( + urad: FloatProperty( name="Radius x/y", min=0.001, max=10, description="Radius in x/y plane", default=1 ) - vrad = FloatProperty( + vrad: FloatProperty( name="Radius z", min=0.001, max=10, description="Radius in z plane", default=0.250 ) - uellipse = FloatProperty( + uellipse: FloatProperty( name="Stretch x", min=0.001, max=10, description="Number of faces in z direction", default=1 ) - vellipse = FloatProperty( + vellipse: FloatProperty( name="Stretch z", min=0.001, max=10, description="Number of faces in z direction", default=1 ) - upart = FloatProperty( + upart: FloatProperty( name="Gap x/y", min=-4, max=4, description="Shrink faces around x/y", default=1 ) - vpart = FloatProperty( + vpart: FloatProperty( name="Gap z", min=-4, max=4, description="Shrink faces in z direction", default=1 ) - ugap = FloatProperty( + ugap: FloatProperty( name="Phase x/y", min=-4, max=4, description="Rotate around pivot x/y", default=0 ) - vgap = FloatProperty( + vgap: FloatProperty( name="Phase z", min=-4, max=4, description="Rotate around pivot z", default=0 ) - uphase = FloatProperty( + uphase: FloatProperty( name="uphase", min=-4, max=4, description="Number of faces in z direction", default=0 ) - vphase = FloatProperty( + vphase: FloatProperty( name="vphase", min=-4, max=4, description="Number of faces in z direction", default=0 ) - uexp = FloatProperty( + uexp: FloatProperty( name="uexp", min=-4, max=4, description="Number of faces in z direction", default=0 ) - vexp = FloatProperty( + vexp: FloatProperty( name="vexp", min=-4, max=4, description="Number of faces in z direction", default=0 ) - usuper = FloatProperty( + usuper: FloatProperty( name="usuper", min=-4, max=4, description="First set of superform parameters", default=2 ) - vsuper = FloatProperty( + vsuper: FloatProperty( name="vsuper", min=-4, max=4, description="Second set of superform parameters", default=2 ) - utwist = FloatProperty( + utwist: FloatProperty( name="Twist x/y", min=-4, max=4, description="Use with superformular u", default=0 ) - vtwist = FloatProperty( + vtwist: FloatProperty( name="Twist z", min=-4, max=4, description="Use with superformular v", default=0 ) # Sphere - bures = IntProperty( + bures: IntProperty( name="Resolution x/y", min=3, max=32, description="Number of faces around x/y", default=8 ) - bvres = IntProperty( + bvres: IntProperty( name="Resolution z", min=3, max=32, description="Number of faces in z direction", default=8 ) - burad = FloatProperty( + burad: FloatProperty( name="Radius", min=-4, max=4, description="overall radius", default=1 ) - bupart = FloatProperty( + bupart: FloatProperty( name="Gap x/y", min=-4, max=4, description="Shrink faces around x/y", default=1 ) - bvpart = FloatProperty( + bvpart: FloatProperty( name="Gap z", min=-4, max=4, description="Shrink faces in z direction", default=1 ) - buphase = FloatProperty( + buphase: FloatProperty( name="Phase x/y", min=-4, max=4, description="Rotate around pivot x/y", default=0 ) - bvphase = FloatProperty( + bvphase: FloatProperty( name="Phase z", min=-4, max=4, description="Rotate around pivot z", default=0 ) - buellipse = FloatProperty( + buellipse: FloatProperty( name="Stretch x", min=0.001, max=4, description="Stretch in the x direction", default=1 ) - bvellipse = FloatProperty( + bvellipse: FloatProperty( name="Stretch z", min=0.001, max=4, description="Stretch in the z direction", default=1 ) # Grid - grxres = IntProperty( + grxres: IntProperty( name="Resolution x", min=2, soft_max=10, max=20, description="Number of faces in x direction", default=5 ) - gryres = IntProperty( + gryres: IntProperty( name="Resolution z", min=2, soft_min=2, soft_max=10, max=20, description="Number of faces in x direction", default=2 ) - grxsz = FloatProperty( + grxsz: FloatProperty( name="X size", min=1, soft_min=0.01, soft_max=5, max=10, description="X size", default=2.0 ) - grysz = FloatProperty( + grysz: FloatProperty( name="Y size", min=1, soft_min=0.01, soft_max=5, max=10, @@ -459,66 +459,66 @@ class GenerateGeodesicDome(Operator): ) # PKHG_TODO_??? what means cart - cart = IntProperty( + cart: IntProperty( name="cart", min=0, max=2, default=0 ) - frequency = IntProperty( + frequency: IntProperty( name="Frequency", min=1, max=8, description="Subdivide base triangles", default=1 ) - eccentricity = FloatProperty( + eccentricity: FloatProperty( name="Eccentricity", min=0.01, max=4, description="Scaling in x/y dimension", default=1 ) - squish = FloatProperty( + squish: FloatProperty( name="Squish", min=0.01, soft_max=4, max=10, description="Scaling in z dimension", default=1 ) - radius = FloatProperty( + radius: FloatProperty( name="Radius", min=0.01, soft_max=4, max=10, description="Overall radius", default=1 ) - squareness = FloatProperty( + squareness: FloatProperty( name="Square x/y", min=0.1, max=5, description="Superelipse action in x/y", default=2 ) - squarez = FloatProperty( + squarez: FloatProperty( name="Square z", min=0.1, soft_max=5, max=10, description="Superelipse action in z", default=2 ) - baselevel = IntProperty( + baselevel: IntProperty( name="baselevel", default=5 ) - dual = BoolProperty( + dual: BoolProperty( name="Dual", description="Faces become verts, " "verts become faces, edges flip", default=False ) - rotxy = FloatProperty( + rotxy: FloatProperty( name="Rotate x/y", min=-4, max=4, description="Rotate superelipse action in x/y", default=0 ) - rotz = FloatProperty( + rotz: FloatProperty( name="Rotate z", min=-4, max=4, description="Rotate superelipse action in z", @@ -526,94 +526,94 @@ class GenerateGeodesicDome(Operator): ) # for choice of superformula - uact = BoolProperty( + uact: BoolProperty( name="Superformula u (x/y)", description="Activate superformula u parameters", default=False ) - vact = BoolProperty( + vact: BoolProperty( name="Superformula v (z)", description="Activate superformula v parameters", default=False ) - um = FloatProperty( + um: FloatProperty( name="Pinch x/y", min=0, soft_min=0.1, soft_max=5, max=10, description="Pinch the mesh on x/y", default=3 ) - un1 = FloatProperty( + un1: FloatProperty( name="Squash x/y", min=0, soft_min=0.1, soft_max=5, max=20, description="Squash the mesh x/y", default=1 ) - un2 = FloatProperty( + un2: FloatProperty( name="Inflate x/y", min=0, soft_min=0.1, soft_max=5, max=10, description="Inflate the mesh x/y", default=1 ) - un3 = FloatProperty( + un3: FloatProperty( name="Roundify x/y", min=0, soft_min=0.1, soft_max=5, max=10, description="Roundify x/y", default=1 ) - ua = FloatProperty( + ua: FloatProperty( name="Shrink", min=0, soft_min=0.1, soft_max=5, max=10, description="Shrink", default=1.0 ) - ub = FloatProperty( + ub: FloatProperty( name="Shrink x/y", min=0, soft_min=0.1, soft_max=5, max=10, description="Shrink y/x", default=4.0 ) - vm = FloatProperty( + vm: FloatProperty( name="Scale Z Base", min=0, soft_min=0.1, soft_max=5, max=10, description="Scale Z Base", default=1 ) - vn1 = FloatProperty( + vn1: FloatProperty( name="Scale lock Top Z", min=0, soft_min=0.1, soft_max=5, max=10, description="Scale lock Top Z", default=1 ) - vn2 = FloatProperty( + vn2: FloatProperty( name="Inflate Base", min=0, soft_min=0.1, soft_max=5, max=10, description="Inflate Base", default=1 ) - vn3 = FloatProperty( + vn3: FloatProperty( name="Inflate", min=0, soft_min=0.1, soft_max=5, max=10, description="Inflate", default=1 ) - va = FloatProperty( + va: FloatProperty( name="Scale 1", min=0, soft_min=0.1, soft_max=5, max=10, description="Scale 1", default=1 ) - vb = FloatProperty( + vb: FloatProperty( name="Scale 2", min=0, soft_min=0.1, soft_max=5, max=10, @@ -621,28 +621,28 @@ class GenerateGeodesicDome(Operator): default=1 ) - uturn = FloatProperty( + uturn: FloatProperty( name="x/y Vert cycle", min=0, soft_min=0.1, soft_max=5, max=10, description="x/y Vert cycle", default=0 ) - vturn = FloatProperty( + vturn: FloatProperty( name="z Vert cycle", min=0, soft_min=0.1, soft_max=5, max=10, description="z Vert cycle", default=0 ) - utwist = FloatProperty( + utwist: FloatProperty( name="x/y Twist cycle", min=0, soft_min=0.1, soft_max=5, max=10, description="x/y Twist cycle", default=0 ) - vtwist = FloatProperty( + vtwist: FloatProperty( name="z Twist cycle", min=0, soft_min=0.1, soft_max=5, max=10, @@ -650,113 +650,113 @@ class GenerateGeodesicDome(Operator): default=0 ) # Strut - struttype = IntProperty( + struttype: IntProperty( name="Strut type", default=0 ) - struttoggle = BoolProperty( + struttoggle: BoolProperty( name="Use Struts", default=False ) - strutimporttoggle = BoolProperty( + strutimporttoggle: BoolProperty( name="Strut import toggle", default=False ) - strutimpmesh = StringProperty( + strutimpmesh: StringProperty( name="Strut import mesh", default="None" ) - strutwidth = FloatProperty( + strutwidth: FloatProperty( name="Strut width", min=-10, soft_min=5, soft_max=5, max=10, default=1 ) - swtog = BoolProperty( + swtog: BoolProperty( name="Width enable", default=False ) - strutheight = FloatProperty( + strutheight: FloatProperty( name="Strut height", min=-5, soft_min=-1, soft_max=5, max=10, default=1 ) - shtog = BoolProperty( + shtog: BoolProperty( name="Height tweak", default=False ) - strutshrink = FloatProperty( + strutshrink: FloatProperty( name="Strut shrink", min=0.001, max=4, default=1 ) - sstog = BoolProperty( + sstog: BoolProperty( name="Shrink tweak", default=False ) - stretch = FloatProperty( + stretch: FloatProperty( name="Stretch", min=-4, max=4, default=1.0 ) - lift = FloatProperty( + lift: FloatProperty( name="Lift", min=0.001, max=10, default=0 ) - smeshname = StringProperty( + smeshname: StringProperty( name="Strut mesh name", default="defaultstrut" ) # Hubs - hubtype = BoolProperty( + hubtype: BoolProperty( name="Hub type", description="not used", default=True ) - hubtoggle = BoolProperty( + hubtoggle: BoolProperty( name="Use Hubs", default=False ) - hubimporttoggle = BoolProperty( + hubimporttoggle: BoolProperty( name="New import", description="Import a mesh", default=False ) - hubimpmesh = StringProperty( + hubimpmesh: StringProperty( name="Hub mesh import", description="Name of mesh to import", default="None" ) - hubwidth = FloatProperty( + hubwidth: FloatProperty( name="Hub width", min=0.01, max=10, default=1 ) - hwtog = BoolProperty( + hwtog: BoolProperty( name="Width tweak", default=False ) - hubheight = FloatProperty( + hubheight: FloatProperty( name="Hub height", min=0.01, max=10, default=1 ) - hhtog = BoolProperty( + hhtog: BoolProperty( name="Height tweak", default=False ) - hublength = FloatProperty( + hublength: FloatProperty( name="Hub length", min=0.1, max=10, default=1 ) - hstog = BoolProperty( + hstog: BoolProperty( name="Hub s tweak", default=False ) - hmeshname = StringProperty( + hmeshname: StringProperty( name="Hub mesh name", description="Name of an existing mesh needed!", default="None" diff --git a/add_mesh_extra_objects/mesh_discombobulator.py b/add_mesh_extra_objects/mesh_discombobulator.py index bc0bfe6782733d84343fb5c577a2ed800e22a96b..f168e32b49ece7a0ffac19960e3be7f7bfeadf98 100644 --- a/add_mesh_extra_objects/mesh_discombobulator.py +++ b/add_mesh_extra_objects/mesh_discombobulator.py @@ -577,7 +577,7 @@ class unchooseDoodad(Operator): bl_description = "Remove the saved Doodad Object(s)" bl_options = {'REGISTER'} - remove_all = bpy.props.BoolProperty( + remove_all: bpy.props.BoolProperty( name="Remove all Doodads", default=False, ) diff --git a/animation_animall.py b/animation_animall.py index d0a0374f7b825677be40075e36f4eb7db5e07028..838a48328357cdf4dddaa14e175787908b87b7b8 100644 --- a/animation_animall.py +++ b/animation_animall.py @@ -518,7 +518,7 @@ class AnimallAddonPreferences(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="Animation", diff --git a/ant_landscape/__init__.py b/ant_landscape/__init__.py index b9888d527a13213f82d427729e85df9323bffca4..f9668369e9ad800e7de669b7795274bbd630609d 100644 --- a/ant_landscape/__init__.py +++ b/ant_landscape/__init__.py @@ -866,7 +866,7 @@ class AntLandscapePropertiesGroup(bpy.types.PropertyGroup): name="Vertex Group", default="" ) - strata = FloatProperty( + strata: FloatProperty( name="Amount", default=5.0, min=0.01, diff --git a/archimesh/__init__.py b/archimesh/__init__.py index 0208b944ae07107e60a0fc1c74091233bb72c7ee..bb8f1da28a163ab0f9d39825d9bbe5c9ca2d35d1 100644 --- a/archimesh/__init__.py +++ b/archimesh/__init__.py @@ -170,7 +170,7 @@ class Archi_Pref(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="Create", diff --git a/archimesh/achm_books_maker.py b/archimesh/achm_books_maker.py index 1c78f8b7be7112ac2369f35bd9f1dc834e171b25..f7fa58eed95064d7520ecec84f9569da5755b8b4 100644 --- a/archimesh/achm_books_maker.py +++ b/archimesh/achm_books_maker.py @@ -45,52 +45,52 @@ class AchmBooks(Operator): bl_category = 'Archimesh' bl_options = {'REGISTER', 'UNDO'} - width = FloatProperty( + width: FloatProperty( name='Width', min=0.001, max=1, default=0.045, precision=3, description='Bounding book width', ) - depth = FloatProperty( + depth: FloatProperty( name='Depth', min=0.001, max=1, default=0.22, precision=3, description='Bounding book depth', ) - height = FloatProperty( + height: FloatProperty( name='Height', min=0.001, max=1, default=0.30, precision=3, description='Bounding book height', ) - num = IntProperty( + num: IntProperty( name='Number of books', min=1, max=100, default=20, description='Number total of books', ) - rX = FloatProperty( + rX: FloatProperty( name='X', min=0.000, max=0.999, default=0, precision=3, description='Randomness for X axis', ) - rY = FloatProperty( + rY: FloatProperty( name='Y', min=0.000, max=0.999, default=0, precision=3, description='Randomness for Y axis', ) - rZ = FloatProperty( + rZ: FloatProperty( name='Z', min=0.000, max=0.999, default=0, precision=3, description='Randomness for Z axis', ) - rot = FloatProperty( + rot: FloatProperty( name='Rotation', min=0.000, max=1, default=0, precision=3, description='Randomness for vertical position (0-> All straight)', ) - afn = IntProperty( + afn: IntProperty( name='Affinity', min=0, max=10, default=5, description='Number of books with same rotation angle', ) # Materials - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, ) - objcol = FloatVectorProperty( + objcol: FloatVectorProperty( name="Color", description="Color for material", default=(1.0, 1.0, 1.0, 1.0), @@ -98,7 +98,7 @@ class AchmBooks(Operator): subtype='COLOR', size=4, ) - rC = FloatProperty( + rC: FloatProperty( name='Randomness', min=0.000, max=1, default=0, precision=3, description='Randomness for color ', diff --git a/archimesh/achm_column_maker.py b/archimesh/achm_column_maker.py index 6bae7efa744c91b6d88f4e49f73a5bd243da95a7..e9b66639b953172565135cc80161169455f0637c 100644 --- a/archimesh/achm_column_maker.py +++ b/archimesh/achm_column_maker.py @@ -41,7 +41,7 @@ class AchmColumn(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} # Define properties - model = bpy.props.EnumProperty( + model: bpy.props.EnumProperty( name="Model", items=( ('1', "Circular", ""), @@ -49,185 +49,185 @@ class AchmColumn(bpy.types.Operator): ), description="Type of column", ) - keep_size = bpy.props.BoolProperty( + keep_size: bpy.props.BoolProperty( name="Keep radius equal", description="Keep all radius (top, mid and bottom) to the same size", default=True, ) - rad_top = bpy.props.FloatProperty( + rad_top: bpy.props.FloatProperty( name='Top radius', min=0.001, max=10, default=0.15, precision=3, description='Radius of the column in the top', ) - rad_mid = bpy.props.FloatProperty( + rad_mid: bpy.props.FloatProperty( name='Middle radius', min=0.001, max=10, default=0.15, precision=3, description='Radius of the column in the middle', ) - shift = bpy.props.FloatProperty( + shift: bpy.props.FloatProperty( name='', min=-1, max=1, default=0, precision=3, description='Middle displacement', ) - rad_bottom = bpy.props.FloatProperty( + rad_bottom: bpy.props.FloatProperty( name='Bottom radius', min=0.001, max=10, default=0.15, precision=3, description='Radius of the column in the bottom', ) - col_height = bpy.props.FloatProperty( + col_height: bpy.props.FloatProperty( name='Total height', min=0.001, max=10, default=2.4, precision=3, description='Total height of column, including bases and tops', ) - col_sx = bpy.props.FloatProperty( + col_sx: bpy.props.FloatProperty( name='X size', min=0.001, max=10, default=0.30, precision=3, description='Column size for x axis', ) - col_sy = bpy.props.FloatProperty( + col_sy: bpy.props.FloatProperty( name='Y size', min=0.001, max=10, default=0.30, precision=3, description='Column size for y axis', ) - cir_base = bpy.props.BoolProperty( + cir_base: bpy.props.BoolProperty( name="Include circular base", description="Include a base with circular form", default=False, ) - cir_base_r = bpy.props.FloatProperty( + cir_base_r: bpy.props.FloatProperty( name='Radio', min=0.001, max=10, default=0.08, precision=3, description='Rise up radio of base', ) - cir_base_z = bpy.props.FloatProperty( + cir_base_z: bpy.props.FloatProperty( name='Height', min=0.001, max=10, default=0.05, precision=3, description='Size for z axis', ) - cir_top = bpy.props.BoolProperty( + cir_top: bpy.props.BoolProperty( name="Include circular top", description="Include a top with circular form", default=False, ) - cir_top_r = bpy.props.FloatProperty( + cir_top_r: bpy.props.FloatProperty( name='Radio', min=0.001, max=10, default=0.08, precision=3, description='Rise up radio of top', ) - cir_top_z = bpy.props.FloatProperty( + cir_top_z: bpy.props.FloatProperty( name='Height', min=0.001, max=10, default=0.05, precision=3, description='Size for z axis', ) - box_base = bpy.props.BoolProperty( + box_base: bpy.props.BoolProperty( name="Include rectangular base", description="Include a base with rectangular form", default=True, ) - box_base_x = bpy.props.FloatProperty( + box_base_x: bpy.props.FloatProperty( name='X size', min=0.001, max=10, default=0.40, precision=3, description='Size for x axis', ) - box_base_y = bpy.props.FloatProperty( + box_base_y: bpy.props.FloatProperty( name='Y size', min=0.001, max=10, default=0.40, precision=3, description='Size for y axis', ) - box_base_z = bpy.props.FloatProperty( + box_base_z: bpy.props.FloatProperty( name='Height', min=0.001, max=10, default=0.05, precision=3, description='Size for z axis', ) - box_top = bpy.props.BoolProperty( + box_top: bpy.props.BoolProperty( name="Include rectangular top", description="Include a top with rectangular form", default=True, ) - box_top_x = bpy.props.FloatProperty( + box_top_x: bpy.props.FloatProperty( name='X size', min=0.001, max=10, default=0.40, precision=3, description='Size for x axis', ) - box_top_y = bpy.props.FloatProperty( + box_top_y: bpy.props.FloatProperty( name='Y size', min=0.001, max=10, default=0.40, precision=3, description='Size for y axis', ) - box_top_z = bpy.props.FloatProperty( + box_top_z: bpy.props.FloatProperty( name='Height', min=0.001, max=10, default=0.05, precision=3, description='Size for z axis', ) - arc_top = bpy.props.BoolProperty( + arc_top: bpy.props.BoolProperty( name="Create top arch", description="Include an arch in the top of the column", default=False, ) - arc_radio = bpy.props.FloatProperty( + arc_radio: bpy.props.FloatProperty( name='Arc Radio', min=0.001, max=10, default=1, precision=1, description='Radio of the arch', ) - arc_width = bpy.props.FloatProperty( + arc_width: bpy.props.FloatProperty( name='Thickness', min=0.01, max=10, default=0.15, precision=2, description='Thickness of the arch wall', ) - arc_gap = bpy.props.FloatProperty( + arc_gap: bpy.props.FloatProperty( name='Arc gap', min=0.01, max=10, default=0.25, precision=2, description='Size of the gap in the arch sides', ) - crt_mat = bpy.props.BoolProperty( + crt_mat: bpy.props.BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, ) - crt_array = bpy.props.BoolProperty( + crt_array: bpy.props.BoolProperty( name="Create array of elements", description="Create a modifier array for all elemnst", default=False, ) - array_num_x = bpy.props.IntProperty( + array_num_x: bpy.props.IntProperty( name='Count X', min=0, max=100, default=3, description='Number of elements in array', ) - array_space_x = bpy.props.FloatProperty( + array_space_x: bpy.props.FloatProperty( name='Distance X', min=0.000, max=10, default=1, precision=3, description='Distance between elements (only arc disabled)', ) - array_num_y = bpy.props.IntProperty( + array_num_y: bpy.props.IntProperty( name='Count Y', min=0, max=100, default=0, description='Number of elements in array', ) - array_space_y = bpy.props.FloatProperty( + array_space_y: bpy.props.FloatProperty( name='Distance Y', min=0.000, max=10, default=1, precision=3, description='Distance between elements (only arc disabled)', ) - array_space_z = bpy.props.FloatProperty( + array_space_z: bpy.props.FloatProperty( name='Distance Z', min=-10, max=10, default=0, precision=3, description='Combined X/Z distance between elements (only arc disabled)', ) - ramp = bpy.props.BoolProperty( + ramp: bpy.props.BoolProperty( name="Deform", description="Deform top base with Z displacement", default=True, ) - array_space_factor = bpy.props.FloatProperty( + array_space_factor: bpy.props.FloatProperty( name='Move Y center', min=0.00, max=1, default=0.0, precision=3, description='Move the center of the arch in Y axis. (0 centered)', diff --git a/archimesh/achm_curtain_maker.py b/archimesh/achm_curtain_maker.py index cc63c3afe56854d176e64cefd5d021ecadd4f2d6..0b4bb84be4cf422d8f26aec3837679a7238b8834 100644 --- a/archimesh/achm_curtain_maker.py +++ b/archimesh/achm_curtain_maker.py @@ -42,55 +42,55 @@ class AchmJapan(Operator): bl_category = 'Archimesh' bl_options = {'REGISTER', 'UNDO'} - width = bpy.props.FloatProperty( + width: bpy.props.FloatProperty( name='Width', min=0.30, max=4, default=1, precision=3, description='Total width', ) - height = bpy.props.FloatProperty( + height: bpy.props.FloatProperty( name='Height', min=0.20, max=50, default=1.8, precision=3, description='Total height', ) - num = bpy.props.IntProperty( + num: bpy.props.IntProperty( name='Rails', min=2, max=5, default=2, description='Number total of rails', ) - palnum = bpy.props.IntProperty( + palnum: bpy.props.IntProperty( name='Panels', min=1, max=2, default=1, description='Panels by rail', ) - open01 = bpy.props.FloatProperty( + open01: bpy.props.FloatProperty( name='Position 01', min=0, max=1, default=0, precision=3, description='Position of the panel', ) - open02 = bpy.props.FloatProperty( + open02: bpy.props.FloatProperty( name='Position 02', min=0, max=1, default=0, precision=3, description='Position of the panel', ) - open03 = bpy.props.FloatProperty( + open03: bpy.props.FloatProperty( name='Position 03', min=0, max=1, default=0, precision=3, description='Position of the panel', ) - open04 = bpy.props.FloatProperty( + open04: bpy.props.FloatProperty( name='Position 04', min=0, max=1, default=0, precision=3, description='Position of the panel', ) - open05 = bpy.props.FloatProperty( + open05: bpy.props.FloatProperty( name='Position 05', min=0, max=1, default=0, precision=3, description='Position of the panel', ) # Materials - crt_mat = bpy.props.BoolProperty( + crt_mat: bpy.props.BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, @@ -183,19 +183,19 @@ class AchmRoller(Operator): bl_category = 'Archimesh' bl_options = {'REGISTER', 'UNDO'} - width = bpy.props.FloatProperty( + width: bpy.props.FloatProperty( name='Width', min=0.30, max=4, default=1, precision=3, description='Total width', ) - height = bpy.props.FloatProperty( + height: bpy.props.FloatProperty( name='Height', min=0.01, max=50, default=1.7, precision=3, description='Total height', ) # Materials - crt_mat = bpy.props.BoolProperty( + crt_mat: bpy.props.BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, diff --git a/archimesh/achm_door_maker.py b/archimesh/achm_door_maker.py index 4ef9937332150fc9f2d985ac1748be600367236d..baf3ac98767ac75a4b0689d844591e8531a9fdfc 100644 --- a/archimesh/achm_door_maker.py +++ b/archimesh/achm_door_maker.py @@ -281,49 +281,49 @@ def shape_children(mainobject, update=False): # Define property group class to create or modify # ------------------------------------------------------------------ class ObjectProperties(PropertyGroup): - frame_width = FloatProperty( + frame_width: FloatProperty( name='Frame width', min=0.25, max=10, default=1, precision=2, description='Doorframe width', update=update_object, ) - frame_height = FloatProperty( + frame_height: FloatProperty( name='Frame height', min=0.25, max=10, default=2.1, precision=2, description='Doorframe height', update=update_object, ) - frame_thick = FloatProperty( + frame_thick: FloatProperty( name='Frame thickness', min=0.05, max=0.50, default=0.08, precision=2, description='Doorframe thickness', update=update_object, ) - frame_size = FloatProperty( + frame_size: FloatProperty( name='Frame size', min=0.05, max=0.25, default=0.08, precision=2, description='Doorframe size', update=update_object, ) - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, update=update_object, ) - factor = FloatProperty( + factor: FloatProperty( name='', min=0.2, max=1, default=0.5, precision=3, description='Door ratio', update=update_object, ) - r = FloatProperty( + r: FloatProperty( name='Rotation', min=0, max=360, default=0, precision=1, description='Door rotation', update=update_object, ) - openside = EnumProperty( + openside: EnumProperty( name="Open side", items=( ('1', "Right open", ""), @@ -334,7 +334,7 @@ class ObjectProperties(PropertyGroup): update=update_object, ) - model = EnumProperty( + model: EnumProperty( name="Model", items=( ('1', "Model 01", ""), @@ -348,7 +348,7 @@ class ObjectProperties(PropertyGroup): update=update_object, ) - handle = EnumProperty( + handle: EnumProperty( name="Handle", items=( ('1', "Handle 01", ""), @@ -362,27 +362,27 @@ class ObjectProperties(PropertyGroup): ) # opengl internal data - glpoint_a = FloatVectorProperty( + glpoint_a: FloatVectorProperty( name="glpointa", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_b = FloatVectorProperty( + glpoint_b: FloatVectorProperty( name="glpointb", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_c = FloatVectorProperty( + glpoint_c: FloatVectorProperty( name="glpointc", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_d = FloatVectorProperty( + glpoint_d: FloatVectorProperty( name="glpointc", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_e = FloatVectorProperty( + glpoint_e: FloatVectorProperty( name="glpointc", description="Hidden property for opengl", default=(0, 0, 0), diff --git a/archimesh/achm_kitchen_maker.py b/archimesh/achm_kitchen_maker.py index f9d981808771127e1dd6d312f5dba282231d3f5d..994714b1b723fb189a4931550567817e3f765fd4 100644 --- a/archimesh/achm_kitchen_maker.py +++ b/archimesh/achm_kitchen_maker.py @@ -54,12 +54,12 @@ class AchmExportInventory(Operator, ExportHelper): # From ExportHelper. Filter filenames. filename_ext = ".txt" - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.txt", options={'HIDDEN'}, ) - filepath = StringProperty( + filepath: StringProperty( name="File Path", description="File path used for exporting room data file", maxlen=1024, default="", @@ -251,35 +251,35 @@ def getinventory(): # ------------------------------------------------------------------ class CabinetProperties(PropertyGroup): # Cabinet width - sX = FloatProperty( + sX: FloatProperty( name='width', min=0.001, max=10, default=0.60, precision=3, description='Cabinet width', ) - wY = FloatProperty( + wY: FloatProperty( name='', min=-10, max=10, default=0, precision=3, description='Modify depth size', ) - wZ = FloatProperty( + wZ: FloatProperty( name='', min=-10, max=10, default=0, precision=3, description='Modify height size', ) # Cabinet position shift - pX = FloatProperty( + pX: FloatProperty( name='', min=-10, max=10, default=0, precision=3, description='Position x shift', ) - pY = FloatProperty( + pY: FloatProperty( name='', min=-10, max=10, default=0, precision=3, description='Position y shift', ) - pZ = FloatProperty( + pZ: FloatProperty( name='', min=-10, max=10, default=0, precision=3, description='Position z shift', ) # Door type - dType = EnumProperty( + dType: EnumProperty( items=( ('1', "Single R", ""), ('2', "Single L", ""), @@ -298,47 +298,47 @@ class CabinetProperties(PropertyGroup): ) # Shelves - sNum = IntProperty( + sNum: IntProperty( name='Shelves', min=0, max=10, default=1, description='Number total of shelves', ) # Drawers - dNum = IntProperty( + dNum: IntProperty( name='Num', min=1, max=10, default=3, description='Number total of drawers', ) # Glass Factor - gF = FloatProperty( + gF: FloatProperty( name='', min=0.001, max=1, default=0.1, precision=3, description='Glass ratio', ) # Handle flag - hand = BoolProperty( + hand: BoolProperty( name="Handle", description="Create a handle", default=True, ) # Left baseboard - bL = BoolProperty( + bL: BoolProperty( name="Left Baseboard", description="Create a left baseboard", default=False, ) # Right baseboard - bR = BoolProperty( + bR: BoolProperty( name="Right Baseboard", description="Create a left baseboard", default=False, ) # Fill countertop spaces - tC = BoolProperty( + tC: BoolProperty( name="Countertop fill", description="Fill empty spaces with countertop", default=True, ) # Add countertop edge - tE = BoolProperty( + tE: BoolProperty( name="Countertop edge", description="Add edge to countertop", default=True, ) # cabinet rotation - rotate = EnumProperty( + rotate: EnumProperty( items=( ('9', "Default", ""), ('1', "90 CW", ""), @@ -365,7 +365,7 @@ class AchmKitchen(Operator): bl_options = {'REGISTER', 'UNDO'} # Define properties - type_cabinet = EnumProperty( + type_cabinet: EnumProperty( items=(('1', "Floor", ""), ('2', "Wall", "")), name="Type", @@ -373,19 +373,19 @@ class AchmKitchen(Operator): ) oldtype = type_cabinet - thickness = FloatProperty( + thickness: FloatProperty( name='Thickness', min=0.001, max=5, default=0.018, precision=3, description='Board thickness', ) - depth = FloatProperty( + depth: FloatProperty( name='Depth', min=0.001, max=50, default=0.59, precision=3, description='Default cabinet depth', ) - height = FloatProperty( + height: FloatProperty( name='Height', min=0.001, max=50, default=0.70, precision=3, description='Default cabinet height', ) - handle = EnumProperty( + handle: EnumProperty( items=( ('1', "Model 1", ""), ('2', "Model 2", ""), @@ -400,69 +400,69 @@ class AchmKitchen(Operator): name="Handle", description="Type of handle", ) - handle_x = FloatProperty( + handle_x: FloatProperty( name='', min=0.001, max=10, default=0.05, precision=3, description='Displacement in X relative position (limited to door size)', ) - handle_z = FloatProperty( + handle_z: FloatProperty( name='', min=0.001, max=10, default=0.05, precision=3, description='Displacement in Z relative position (limited to door size)', ) - baseboard = BoolProperty( + baseboard: BoolProperty( name="Baseboard", description="Create a baseboard automatically", default=True, ) - baseheight = FloatProperty( + baseheight: FloatProperty( name='height', min=0.001, max=10, default=0.16, precision=3, description='Baseboard height', ) - basefactor = FloatProperty( + basefactor: FloatProperty( name='sink', min=0, max=1, default=0.90, precision=3, description='Baseboard sink', ) - countertop = BoolProperty( + countertop: BoolProperty( name="Countertop", description="Create a countertop automatically (only default cabinet height)", default=True, ) - counterheight = FloatProperty( + counterheight: FloatProperty( name='height', min=0.001, max=10, default=0.02, precision=3, description='Countertop height', ) - counterextend = FloatProperty( + counterextend: FloatProperty( name='extend', min=0.001, max=10, default=0.03, precision=3, description='Countertop extent', ) - fitZ = BoolProperty( + fitZ: BoolProperty( name="Floor origin in Z=0", description="Use Z=0 axis as vertical origin floor position", default=True, ) - moveZ = FloatProperty( + moveZ: FloatProperty( name='Z position', min=0.001, max=10, default=1.5, precision=3, description='Wall cabinet Z position from floor', ) - cabinet_num = IntProperty( + cabinet_num: IntProperty( name='Number of Cabinets', min=1, max=30, default=1, description='Number total of cabinets in the Kitchen', ) - cabinets = CollectionProperty(type=CabinetProperties) + cabinets: CollectionProperty(type=CabinetProperties) # Materials - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, diff --git a/archimesh/achm_lamp_maker.py b/archimesh/achm_lamp_maker.py index 67fbfc1e549846f5858a005a07800bcec4593ed5..d9e7f64ecd5d2b7d8f12ecf8f88f86ae4879cf7e 100644 --- a/archimesh/achm_lamp_maker.py +++ b/archimesh/achm_lamp_maker.py @@ -136,7 +136,7 @@ class AchmLamp(Operator): bl_category = 'Archimesh' bl_options = {'REGISTER', 'UNDO'} # preset - preset = EnumProperty( + preset: EnumProperty( items=( ('0', "None", ""), ('1', "Sphere", ""), @@ -149,107 +149,107 @@ class AchmLamp(Operator): ) oldpreset = preset - base_height = FloatProperty( + base_height: FloatProperty( name='Height', min=0.01, max=10, default=0.20, precision=3, description='lamp base height', ) - base_segments = IntProperty( + base_segments: IntProperty( name='Segments', min=3, max=128, default=16, description='Number of segments (vertical)', ) - base_rings = IntProperty( + base_rings: IntProperty( name='Rings', min=2, max=12, default=6, description='Number of rings (horizontal)', ) - holder = FloatProperty( + holder: FloatProperty( name='Lampholder', min=0.001, max=10, default=0.02, precision=3, description='Lampholder height', ) - smooth = BoolProperty( + smooth: BoolProperty( name="Smooth", description="Use smooth shader", default=True, ) - subdivide = BoolProperty( + subdivide: BoolProperty( name="Subdivide", description="Add subdivision modifier", default=True, ) - bz01 = FloatProperty(name='S1', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz02 = FloatProperty(name='S2', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz03 = FloatProperty(name='S3', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz04 = FloatProperty(name='S4', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz05 = FloatProperty(name='S5', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz06 = FloatProperty(name='S6', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz07 = FloatProperty(name='S7', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz08 = FloatProperty(name='S8', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz09 = FloatProperty(name='S9', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz10 = FloatProperty(name='S10', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz11 = FloatProperty(name='S11', min=-1, max=1, default=0, precision=3, description='Z shift factor') - bz12 = FloatProperty(name='S12', min=-1, max=1, default=0, precision=3, description='Z shift factor') - - br01 = FloatProperty(name='R1', min=0.001, max=10, default=0.06, precision=3, description='Ring radio') - br02 = FloatProperty(name='R2', min=0.001, max=10, default=0.08, precision=3, description='Ring radio') - br03 = FloatProperty(name='R3', min=0.001, max=10, default=0.09, precision=3, description='Ring radio') - br04 = FloatProperty(name='R4', min=0.001, max=10, default=0.08, precision=3, description='Ring radio') - br05 = FloatProperty(name='R5', min=0.001, max=10, default=0.06, precision=3, description='Ring radio') - br06 = FloatProperty(name='R6', min=0.001, max=10, default=0.03, precision=3, description='Ring radio') - br07 = FloatProperty(name='R7', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') - br08 = FloatProperty(name='R8', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') - br09 = FloatProperty(name='R9', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') - br10 = FloatProperty(name='R10', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') - br11 = FloatProperty(name='R11', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') - br12 = FloatProperty(name='R12', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') - - top_height = FloatProperty( + bz01: FloatProperty(name='S1', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz02: FloatProperty(name='S2', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz03: FloatProperty(name='S3', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz04: FloatProperty(name='S4', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz05: FloatProperty(name='S5', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz06: FloatProperty(name='S6', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz07: FloatProperty(name='S7', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz08: FloatProperty(name='S8', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz09: FloatProperty(name='S9', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz10: FloatProperty(name='S10', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz11: FloatProperty(name='S11', min=-1, max=1, default=0, precision=3, description='Z shift factor') + bz12: FloatProperty(name='S12', min=-1, max=1, default=0, precision=3, description='Z shift factor') + + br01: FloatProperty(name='R1', min=0.001, max=10, default=0.06, precision=3, description='Ring radio') + br02: FloatProperty(name='R2', min=0.001, max=10, default=0.08, precision=3, description='Ring radio') + br03: FloatProperty(name='R3', min=0.001, max=10, default=0.09, precision=3, description='Ring radio') + br04: FloatProperty(name='R4', min=0.001, max=10, default=0.08, precision=3, description='Ring radio') + br05: FloatProperty(name='R5', min=0.001, max=10, default=0.06, precision=3, description='Ring radio') + br06: FloatProperty(name='R6', min=0.001, max=10, default=0.03, precision=3, description='Ring radio') + br07: FloatProperty(name='R7', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') + br08: FloatProperty(name='R8', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') + br09: FloatProperty(name='R9', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') + br10: FloatProperty(name='R10', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') + br11: FloatProperty(name='R11', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') + br12: FloatProperty(name='R12', min=0.001, max=10, default=0.10, precision=3, description='Ring radio') + + top_height: FloatProperty( name='Height', min=0.01, max=10, default=0.20, precision=3, description='lampshade height', ) - top_segments = IntProperty( + top_segments: IntProperty( name='Segments', min=3, max=128, default=32, description='Number of segments (vertical)', ) - tr01 = FloatProperty( + tr01: FloatProperty( name='R1', min=0.001, max=10, default=0.16, precision=3, description='lampshade bottom radio', ) - tr02 = FloatProperty(name='R2', min=0.001, max=10, + tr02: FloatProperty(name='R2', min=0.001, max=10, default=0.08, precision=3, description='lampshade top radio') - pleats = BoolProperty( + pleats: BoolProperty( name="Pleats", description="Create pleats in the lampshade", default=False, ) - tr03 = FloatProperty( + tr03: FloatProperty( name='R3', min=0.001, max=1, default=0.01, precision=3, description='Pleats size', ) - energy = FloatProperty( + energy: FloatProperty( name='Light', min=0.00, max=1000, default=15, precision=3, description='Light intensity', ) - opacity = FloatProperty( + opacity: FloatProperty( name='Translucency', min=0.00, max=1, default=0.3, precision=3, description='Lampshade translucency factor (1 completely translucent)', ) # Materials - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, ) - objcol = FloatVectorProperty( + objcol: FloatVectorProperty( name="Color", description="Color for material", default=(1.0, 1.0, 1.0, 1.0), diff --git a/archimesh/achm_roof_maker.py b/archimesh/achm_roof_maker.py index d88b576389212fe7521f873cd8b7d3b26802cf54..0cf6d22286800a35eeb38633c4425d4e81e117a3 100644 --- a/archimesh/achm_roof_maker.py +++ b/archimesh/achm_roof_maker.py @@ -43,38 +43,38 @@ class AchmRoof(Operator): bl_options = {'REGISTER', 'UNDO'} # Define properties - roof_width = IntProperty( + roof_width: IntProperty( name='Num tiles X', min=1, max=100, default=6, description='Tiles in X axis', ) - roof_height = IntProperty( + roof_height: IntProperty( name='Num tiles Y', min=1, max=100, default=3, description='Tiles in Y axis', ) - roof_thick = FloatProperty( + roof_thick: FloatProperty( name='Tile thickness', min=0.000, max=0.50, default=0.012, precision=3, description='Thickness of the roof tile', ) - roof_angle = FloatProperty( + roof_angle: FloatProperty( name='Roof slope', min=0.0, max=70.0, default=0.0, precision=1, description='Roof angle of slope', ) - roof_scale = FloatProperty( + roof_scale: FloatProperty( name='Tile scale', min=0.001, max=10, default=1, precision=3, description='Scale of roof tile', ) - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, ) - model = EnumProperty( + model: EnumProperty( items=( ('1', "Model 01", ""), ('2', "Model 02", ""), diff --git a/archimesh/achm_room_maker.py b/archimesh/achm_room_maker.py index 71243ca2a58e34870ec9ebc298591bf1a9676cf6..11a259be6a855e5b17262af9aeb0636bf6cb6b6a 100644 --- a/archimesh/achm_room_maker.py +++ b/archimesh/achm_room_maker.py @@ -48,12 +48,12 @@ class AchmExportRoom(Operator, ExportHelper): # From ExportHelper. Filter filenames. filename_ext = ".dat" - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.dat", options={'HIDDEN'}, ) - filepath = StringProperty( + filepath: StringProperty( name="File Path", description="File path used for exporting room data file", maxlen=1024, default="", @@ -160,12 +160,12 @@ class AchmImportRoom(Operator, ImportHelper): # From Helper. Filter filenames. filename_ext = ".dat" - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.dat", options={'HIDDEN'}, ) - filepath = StringProperty( + filepath: StringProperty( name="File Path", description="File path used for exporting room data file", maxlen=1024, default="", @@ -835,7 +835,7 @@ def create_floor(rp, typ, myroom): # Define property group class to create, or modify, room walls. # ------------------------------------------------------------------ class WallProperties(PropertyGroup): - w = FloatProperty( + w: FloatProperty( name='Length', min=-150, max=150, default=1, precision=3, @@ -843,33 +843,33 @@ class WallProperties(PropertyGroup): update=update_room, ) - a = BoolProperty( + a: BoolProperty( name="Advanced", description="Define advanced parameters of the wall", default=False, update=update_room, ) - curved = BoolProperty( + curved: BoolProperty( name="Curved", description="Enable curved wall parameters", default=False, update=update_room, ) - curve_factor = FloatProperty( + curve_factor: FloatProperty( name='Factor', min=-5, max=5, default=1, precision=1, description='Curvature variation', update=update_room, ) - curve_arc_deg = FloatProperty( + curve_arc_deg: FloatProperty( name='Degrees', min=1, max=359, default=180, precision=1, description='Degrees of the curve arc (must be >= steps)', update=update_room, ) - curve_steps = IntProperty( + curve_steps: IntProperty( name='Steps', min=2, max=50, default=12, @@ -877,19 +877,19 @@ class WallProperties(PropertyGroup): update=update_room, ) - m = FloatProperty( + m: FloatProperty( name='Peak', min=0, max=50, default=0, precision=3, description='Middle height variation', update=update_room, ) - f = FloatProperty( + f: FloatProperty( name='Factor', min=-1, max=1, default=0, precision=3, description='Middle displacement', update=update_room, ) - r = FloatProperty( + r: FloatProperty( name='Angle', min=-180, max=180, default=0, precision=1, @@ -897,7 +897,7 @@ class WallProperties(PropertyGroup): update=update_room, ) - h = EnumProperty( + h: EnumProperty( items=( ('0', "Visible", ""), ('1', "Baseboard", ""), @@ -910,12 +910,12 @@ class WallProperties(PropertyGroup): ) # opengl internal data - glpoint_a = FloatVectorProperty( + glpoint_a: FloatVectorProperty( name="glpointa", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_b = FloatVectorProperty( + glpoint_b: FloatVectorProperty( name="glpointb", description="Hidden property for opengl", default=(0, 0, 0), @@ -1492,90 +1492,90 @@ def is_in_nextface(idx, activefaces, verts, x, y): # Define property group class to create or modify a rooms. # ------------------------------------------------------------------ class RoomProperties(PropertyGroup): - room_height = FloatProperty( + room_height: FloatProperty( name='Height', min=0.001, max=50, default=2.4, precision=3, description='Room height', update=update_room, ) - wall_width = FloatProperty( + wall_width: FloatProperty( name='Thickness', min=0.000, max=10, default=0.0, precision=3, description='Thickness of the walls', update=update_room, ) - inverse = BoolProperty( + inverse: BoolProperty( name="Inverse", description="Inverse normals to outside", default=False, update=update_room, ) - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, update=update_room, ) - wall_num = IntProperty( + wall_num: IntProperty( name='Number of Walls', min=1, max=50, default=1, description='Number total of walls in the room', update=add_room_wall, ) - baseboard = BoolProperty( + baseboard: BoolProperty( name="Baseboard", description="Create a baseboard automatically", default=True, update=update_room, ) - base_width = FloatProperty( + base_width: FloatProperty( name='Width', min=0.001, max=10, default=0.015, precision=3, description='Baseboard width', update=update_room, ) - base_height = FloatProperty( + base_height: FloatProperty( name='Height', min=0.05, max=20, default=0.12, precision=3, description='Baseboard height', update=update_room, ) - ceiling = BoolProperty( + ceiling: BoolProperty( name="Ceiling", description="Create a ceiling", default=False, update=update_room, ) - floor = BoolProperty( + floor: BoolProperty( name="Floor", description="Create a floor automatically", default=False, update=update_room, ) - merge = BoolProperty( + merge: BoolProperty( name="Close walls", description="Close walls to create a full closed room", default=False, update=update_room, ) - walls = CollectionProperty( + walls: CollectionProperty( type=WallProperties, ) - shell = BoolProperty( + shell: BoolProperty( name="Wall cover", description="Create a cover of boards", default=False, update=update_room, ) - shell_thick = FloatProperty( + shell_thick: FloatProperty( name='Thickness', min=0.001, max=1, default=0.025, precision=3, description='Cover board thickness', update=update_room, ) - shell_height = FloatProperty( + shell_height: FloatProperty( name='Height', min=0.05, max=1, default=0.20, precision=3, description='Cover board height', update=update_room, ) - shell_factor = FloatProperty( + shell_factor: FloatProperty( name='Top', min=0.1, max=1, default=1, precision=1, description='Percentage for top covering (1 Full)', update=update_room, ) - shell_bfactor = FloatProperty( + shell_bfactor: FloatProperty( name='Bottom', min=0.1, max=1, default=1, precision=1, description='Percentage for bottom covering (1 Full)', update=update_room, diff --git a/archimesh/achm_shelves_maker.py b/archimesh/achm_shelves_maker.py index 6cbab554085c38394c30bb85a8ec203811cc22c8..c9351a0756823ac466ddf434a361f1575001eeb3 100644 --- a/archimesh/achm_shelves_maker.py +++ b/archimesh/achm_shelves_maker.py @@ -34,34 +34,34 @@ from .achm_tools import * # Define property group class for shelves properties # ------------------------------------------------------------------ class ShelvesProperties(PropertyGroup): - sX = FloatProperty(name='width', min=0.001, max=10, default=1, + sX: FloatProperty(name='width', min=0.001, max=10, default=1, precision=3, description='Furniture width') - wY = FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Modify y size') - wZ = FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Modify z size') + wY: FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Modify y size') + wZ: FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Modify z size') # Cabinet position shift - pX = FloatProperty(name='', min=0, max=10, default=0, precision=3, description='Position x shift') - pY = FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Position y shift') - pZ = FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Position z shift') + pX: FloatProperty(name='', min=0, max=10, default=0, precision=3, description='Position x shift') + pY: FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Position y shift') + pZ: FloatProperty(name='', min=-10, max=10, default=0, precision=3, description='Position z shift') # Shelves - sNum = IntProperty(name='Shelves', min=0, max=12, default=6, description='Number total of shelves') + sNum: IntProperty(name='Shelves', min=0, max=12, default=6, description='Number total of shelves') # 12 shelves (shelf) - Z01 = FloatProperty(name='zS1', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z02 = FloatProperty(name='zS2', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z03 = FloatProperty(name='zS3', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z04 = FloatProperty(name='zS4', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z05 = FloatProperty(name='zS5', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z06 = FloatProperty(name='zS6', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z07 = FloatProperty(name='zS7', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z08 = FloatProperty(name='zS8', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z09 = FloatProperty(name='zS9', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z10 = FloatProperty(name='zS10', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z11 = FloatProperty(name='zS11', min=-10, max=10, default=0, precision=3, description='Position z shift') - Z12 = FloatProperty(name='zS12', min=-10, max=10, default=0, precision=3, description='Position z shift') - - right = BoolProperty(name="Right", description="Create right side", default=True) - left = BoolProperty(name="Left", description="Create left side", default=True) + Z01: FloatProperty(name='zS1', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z02: FloatProperty(name='zS2', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z03: FloatProperty(name='zS3', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z04: FloatProperty(name='zS4', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z05: FloatProperty(name='zS5', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z06: FloatProperty(name='zS6', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z07: FloatProperty(name='zS7', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z08: FloatProperty(name='zS8', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z09: FloatProperty(name='zS9', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z10: FloatProperty(name='zS10', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z11: FloatProperty(name='zS11', min=-10, max=10, default=0, precision=3, description='Position z shift') + Z12: FloatProperty(name='zS12', min=-10, max=10, default=0, precision=3, description='Position z shift') + + right: BoolProperty(name="Right", description="Create right side", default=True) + left: BoolProperty(name="Left", description="Create left side", default=True) bpy.utils.register_class(ShelvesProperties) @@ -77,37 +77,37 @@ class AchmShelves(Operator): bl_category = 'Archimesh' bl_options = {'REGISTER', 'UNDO'} - thickness = FloatProperty( + thickness: FloatProperty( name='Side Thickness', min=0.001, max=5, default=0.03, precision=3, description='Board thickness', ) - sthickness = FloatProperty( + sthickness: FloatProperty( name='Shelves Thickness', min=0.001, max=5, default=0.03, precision=3, description='Board thickness', ) - depth = FloatProperty( + depth: FloatProperty( name='Depth', min=0.001, max=50, default=0.28, precision=3, description='Default unit depth', ) - height = FloatProperty( + height: FloatProperty( name='Height', min=0.001, max=50, default=2, precision=3, description='Default unit height', ) - top = FloatProperty( + top: FloatProperty( name='Top', min=0, max=50, default=0.03, precision=3, description='Default top shelf position', ) - bottom = FloatProperty( + bottom: FloatProperty( name='Bottom', min=0, max=50, default=0.07, precision=3, description='Default bottom self position', ) - stype = EnumProperty( + stype: EnumProperty( items=( ('1', "Full side", ""), ('4', "4 Legs", ""), @@ -116,22 +116,22 @@ class AchmShelves(Operator): description="Type of side construction", ) - fitZ = BoolProperty( + fitZ: BoolProperty( name="Floor origin in Z=0", description="Use Z=0 axis as vertical origin floor position", default=True, ) - shelves_num = IntProperty( + shelves_num: IntProperty( name='Number of Units', min=1, max=10, default=1, description='Number total of shelves units', ) - shelves = CollectionProperty(type=ShelvesProperties) + shelves: CollectionProperty(type=ShelvesProperties) # Materials - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, diff --git a/archimesh/achm_stairs_maker.py b/archimesh/achm_stairs_maker.py index d5b1f82e68877fde0e2e9c6ad70c1921ede0d400..2d687a72c082609144a7d1024291c7f117a33815 100644 --- a/archimesh/achm_stairs_maker.py +++ b/archimesh/achm_stairs_maker.py @@ -43,7 +43,7 @@ class AchmStairs(Operator): bl_options = {'REGISTER', 'UNDO'} # Define properties - model = EnumProperty( + model: EnumProperty( items=( ('1', "Rectangular", ""), ('2', "Rounded", ""), @@ -51,85 +51,85 @@ class AchmStairs(Operator): name="Model", description="Type of steps", ) - radio = FloatProperty( + radio: FloatProperty( name='', min=0.001, max=0.500, default=0.20, precision=3, description='Radius factor for rounded', ) - curve = BoolProperty( + curve: BoolProperty( name="Include deformation handles", description="Include a curve to modify the stairs curve", default=False, ) - step_num = IntProperty( + step_num: IntProperty( name='Number of steps', min=1, max=1000, default=3, description='Number total of steps', ) - max_width = FloatProperty( + max_width: FloatProperty( name='Width', min=0.001, max=10, default=1, precision=3, description='Step maximum width', ) - depth = FloatProperty( + depth: FloatProperty( name='Depth', min=0.001, max=10, default=0.30, precision=3, description='Depth of the step', ) - shift = FloatProperty( + shift: FloatProperty( name='Shift', min=0.001, max=1, default=1, precision=3, description='Step shift in Y axis', ) - thickness = FloatProperty( + thickness: FloatProperty( name='Thickness', min=0.001, max=10, default=0.03, precision=3, description='Step thickness', ) - sizev = BoolProperty( + sizev: BoolProperty( name="Variable width", description="Steps are not equal in width", default=False, ) - back = BoolProperty( + back: BoolProperty( name="Close sides", description="Close all steps side to make a solid structure", default=False, ) - min_width = FloatProperty( + min_width: FloatProperty( name='', min=0.001, max=10, default=1, precision=3, description='Step minimum width', ) - height = FloatProperty( + height: FloatProperty( name='height', min=0.001, max=10, default=0.14, precision=3, description='Step height', ) - front_gap = FloatProperty( + front_gap: FloatProperty( name='Front', min=0, max=10, default=0.03, precision=3, description='Front gap', ) - side_gap = FloatProperty( + side_gap: FloatProperty( name='Side', min=0, max=10, default=0, precision=3, description='Side gap', ) - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, diff --git a/archimesh/achm_venetian_maker.py b/archimesh/achm_venetian_maker.py index 57adf0ef64bc27694810f8ba47cb6818f25c4eed..01d0c4225c53e1fc7e463d7167770d915c67074e 100644 --- a/archimesh/achm_venetian_maker.py +++ b/archimesh/achm_venetian_maker.py @@ -328,38 +328,38 @@ def shape_mesh_and_create_children(mainobject, tmp_mesh, update=False): # Define property group class to create or modify # ------------------------------------------------------------------ class ObjectProperties(PropertyGroup): - width = FloatProperty( + width: FloatProperty( name='Width', min=0.30, max=4, default=1, precision=3, description='Total width', update=update_object, ) - height = FloatProperty( + height: FloatProperty( name='Height', min=0.20, max=10, default=1.7, precision=3, description='Total height', update=update_object, ) - depth = FloatProperty( + depth: FloatProperty( name='Slat depth', min=0.02, max=0.30, default=0.04, precision=3, description='Slat depth', update=update_object, ) - angle = FloatProperty( + angle: FloatProperty( name='Angle', min=0, max=85, default=0, precision=1, description='Angle of the slats', update=update_object, ) - ratio = IntProperty( + ratio: IntProperty( name='Extend', min=0, max=100, default=100, description='% of extension (100 full extend)', update=update_object, ) # Materials - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, update=update_object, ) - objcol = FloatVectorProperty( + objcol: FloatVectorProperty( name="Color", description="Color for material", default=(0.616, 0.435, 1.0, 1.0), diff --git a/archimesh/achm_window_maker.py b/archimesh/achm_window_maker.py index 1e43c792a247f9fa26b34e0337314cf4e7e086f6..a026232a5bd426a0a884daa461f54d2e531822da 100644 --- a/archimesh/achm_window_maker.py +++ b/archimesh/achm_window_maker.py @@ -242,40 +242,40 @@ def shape_mesh_and_create_children(mainobject, tmp_mesh, update=False): # Define property group class to create or modify # ------------------------------------------------------------------ class ObjectProperties(PropertyGroup): - width = FloatProperty( + width: FloatProperty( name='Width', min=0.20, max=50, default=1.20, precision=3, description='window width', update=update_object, ) - depth = FloatProperty( + depth: FloatProperty( name='Depth', min=0.07, max=1, default=0.10, precision=3, description='window depth', update=update_object, ) - height = FloatProperty( + height: FloatProperty( name='Height', min=0.20, max=50, default=1, precision=3, description='window height', update=update_object, ) - r = FloatProperty( + r: FloatProperty( name='Rotation', min=0, max=360, default=0, precision=1, description='Window rotation', update=update_object, ) - external = BoolProperty( + external: BoolProperty( name="External frame", description="Create an external front frame", default=True, update=update_object, ) - frame = FloatProperty( + frame: FloatProperty( name='External Frame', min=0.001, max=1, default=0.01, precision=3, @@ -283,21 +283,21 @@ class ObjectProperties(PropertyGroup): update=update_object, ) - frame_L = FloatProperty( + frame_L: FloatProperty( name='Frame', min=0.02, max=1, default=0.06, precision=3, description='Frame size', update=update_object, ) - wf = FloatProperty( + wf: FloatProperty( name='WinFrame', min=0.001, max=1, default=0.05, precision=3, description='Window Frame size', update=update_object, ) - leafratio = FloatProperty( + leafratio: FloatProperty( name='Leaf ratio', min=0.001, max=0.999, default=0.50, @@ -305,7 +305,7 @@ class ObjectProperties(PropertyGroup): description='Leaf thickness ratio', update=update_object, ) - opentype = EnumProperty( + opentype: EnumProperty( items=( ('1', "Rail window", ""), ('2', "Two leaf", ""), @@ -315,34 +315,34 @@ class ObjectProperties(PropertyGroup): description="Defines type of window", update=update_object, ) - handle = BoolProperty( + handle: BoolProperty( name="Create handles", description="Create default handle to the leaf", default=True, update=update_object, ) - sill = BoolProperty( + sill: BoolProperty( name="Sill", description="Add sill to window", default=True, update=update_object, ) - sill_thickness = FloatProperty( + sill_thickness: FloatProperty( name='Thickness', min=0, max=50, default=0.01, precision=3, description='Sill thickness', update=update_object, ) - sill_back = FloatProperty( + sill_back: FloatProperty( name='Back', min=0, max=10, default=0.0, precision=3, description='Extrusion in back side', update=update_object, ) - sill_front = FloatProperty( + sill_front: FloatProperty( name='Front', min=0, max=10, default=0.12, precision=3, @@ -350,39 +350,39 @@ class ObjectProperties(PropertyGroup): update=update_object, ) - blind = BoolProperty( + blind: BoolProperty( name="Blind", description="Create an external blind", default=False, update=update_object, ) - blind_box = BoolProperty( + blind_box: BoolProperty( name="Blind box", description="Create a box over frame for blind", default=True, update=update_object, ) - blind_height = FloatProperty( + blind_height: FloatProperty( name='Height', min=0.001, max=10, default=0.12, precision=3, description='Blind box height', update=update_object, ) - blind_back = FloatProperty( + blind_back: FloatProperty( name='Back', min=0.001, max=10, default=0.002, precision=3, description='Extrusion in back side', update=update_object, ) - blind_rail = FloatProperty( + blind_rail: FloatProperty( name='Separation', min=0.001, max=10, default=0.10, precision=3, description='Separation from frame', update=update_object, ) - blind_ratio = IntProperty( + blind_ratio: IntProperty( name='Extend', min=0, max=100, default=20, @@ -391,24 +391,24 @@ class ObjectProperties(PropertyGroup): ) # Materials - crt_mat = BoolProperty( + crt_mat: BoolProperty( name="Create default Cycles materials", description="Create default materials for Cycles render", default=True, update=update_object, ) # opengl internal data - glpoint_a = FloatVectorProperty( + glpoint_a: FloatVectorProperty( name="glpointa", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_b = FloatVectorProperty( + glpoint_b: FloatVectorProperty( name="glpointb", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_c = FloatVectorProperty( + glpoint_c: FloatVectorProperty( name="glpointc", description="Hidden property for opengl", default=(0, 0, 0), diff --git a/archimesh/achm_window_panel.py b/archimesh/achm_window_panel.py index 16c9209b5b942fb2b0e01166be56514df827bc28..349117344ad440945e2144c615d34f6d04d26d54 100644 --- a/archimesh/achm_window_panel.py +++ b/archimesh/achm_window_panel.py @@ -1553,7 +1553,7 @@ def create_ctrl_box(parentobj, objname): # Define property group class to create or modify # ------------------------------------------------------------------ class GeneralPanelProperties(PropertyGroup): - prs = EnumProperty( + prs: EnumProperty( items=( ('1', "WINDOW 250X200", ""), ('2', "WINDOW 200X200", ""), @@ -1569,40 +1569,40 @@ class GeneralPanelProperties(PropertyGroup): update=update_using_default, ) son = prs - gen = IntProperty( + gen: IntProperty( name='H Count', min=1, max=8, default=3, description='Horizontal Panes', update=update_window, ) - yuk = IntProperty( + yuk: IntProperty( name='V Count', min=1, max=5, default=1, description='Vertical Panes', update=update_window, ) - kl1 = IntProperty( + kl1: IntProperty( name='Outer Frame', min=2, max=50, default=5, description='Outside Frame Thickness', update=update_window, ) - kl2 = IntProperty( + kl2: IntProperty( name='Risers', min=2, max=50, default=5, description='Risers Width', update=update_window, ) - fk = IntProperty( + fk: IntProperty( name='Inner Frame', min=1, max=20, default=2, description='Inside Frame Thickness', update=update_window, ) - mr = BoolProperty(name='Sill', default=True, description='Window Sill', update=update_window) - mr1 = IntProperty(name='', min=1, max=20, default=4, description='Height', update=update_window) - mr2 = IntProperty(name='', min=0, max=20, default=4, description='First Depth', update=update_window) - mr3 = IntProperty(name='', min=1, max=50, default=20, description='Second Depth', update=update_window) - mr4 = IntProperty(name='', min=0, max=50, default=0, description='Extrusion for Jamb', + mr: BoolProperty(name='Sill', default=True, description='Window Sill', update=update_window) + mr1: IntProperty(name='', min=1, max=20, default=4, description='Height', update=update_window) + mr2: IntProperty(name='', min=0, max=20, default=4, description='First Depth', update=update_window) + mr3: IntProperty(name='', min=1, max=50, default=20, description='Second Depth', update=update_window) + mr4: IntProperty(name='', min=0, max=50, default=0, description='Extrusion for Jamb', update=update_window) - mt1 = EnumProperty( + mt1: EnumProperty( items=( ('1', "PVC", ""), ('2', "WOOD", ""), @@ -1613,7 +1613,7 @@ class GeneralPanelProperties(PropertyGroup): description='Material to use', update=update_window, ) - mt2 = EnumProperty( + mt2: EnumProperty( items=( ('1', "PVC", ""), ('2', "WOOD", ""), @@ -1625,14 +1625,14 @@ class GeneralPanelProperties(PropertyGroup): update=update_window, ) - r = FloatProperty( + r: FloatProperty( name='Rotation', min=0, max=360, default=0, precision=1, description='Panel rotation', update=update_window, ) - UST = EnumProperty( + UST: EnumProperty( items=( ('1', "Flat", ""), ('2', "Arch", ""), @@ -1643,7 +1643,7 @@ class GeneralPanelProperties(PropertyGroup): description='Type of window upper section', update=update_window, ) - DT2 = EnumProperty( + DT2: EnumProperty( items=( ('1', "Difference", ""), ('2', "Radius", ""), @@ -1652,7 +1652,7 @@ class GeneralPanelProperties(PropertyGroup): default='1', update=update_window, ) - DT3 = EnumProperty( + DT3: EnumProperty( items=( ('1', "Difference", ""), ('2', "Incline %", ""), @@ -1662,102 +1662,102 @@ class GeneralPanelProperties(PropertyGroup): default='1', update=update_window, ) - VL1 = IntProperty(name='', min=-10000, max=10000, default=30, update=update_window) # Fark - VL2 = IntProperty(name='', min=1, max=10000, default=30, update=update_window) # Cap - VL3 = IntProperty(name='', min=-100, max=100, default=30, update=update_window) # Egim % - VL4 = IntProperty(name='', min=-45, max=45, default=30, update=update_window) # Egim Aci + VL1: IntProperty(name='', min=-10000, max=10000, default=30, update=update_window) # Fark + VL2: IntProperty(name='', min=1, max=10000, default=30, update=update_window) # Cap + VL3: IntProperty(name='', min=-100, max=100, default=30, update=update_window) # Egim % + VL4: IntProperty(name='', min=-45, max=45, default=30, update=update_window) # Egim Aci - res = IntProperty(name='Resolution', min=2, max=360, default=36, update=update_window) # Res + res: IntProperty(name='Resolution', min=2, max=360, default=36, update=update_window) # Res - gnx0 = IntProperty(name='', min=1, max=300, default=60, description='1st Window Width', + gnx0: IntProperty(name='', min=1, max=300, default=60, description='1st Window Width', update=update_window) - gnx1 = IntProperty(name='', min=1, max=300, default=110, description='2nd Window Width', + gnx1: IntProperty(name='', min=1, max=300, default=110, description='2nd Window Width', update=update_window) - gnx2 = IntProperty(name='', min=1, max=300, default=60, description='3rd Window Width', + gnx2: IntProperty(name='', min=1, max=300, default=60, description='3rd Window Width', update=update_window) - gnx3 = IntProperty(name='', min=1, max=300, default=60, description='4th Window Width', + gnx3: IntProperty(name='', min=1, max=300, default=60, description='4th Window Width', update=update_window) - gnx4 = IntProperty(name='', min=1, max=300, default=60, description='5th Window Width', + gnx4: IntProperty(name='', min=1, max=300, default=60, description='5th Window Width', update=update_window) - gnx5 = IntProperty(name='', min=1, max=300, default=60, description='6th Window Width', + gnx5: IntProperty(name='', min=1, max=300, default=60, description='6th Window Width', update=update_window) - gnx6 = IntProperty(name='', min=1, max=300, default=60, description='7th Window Width', + gnx6: IntProperty(name='', min=1, max=300, default=60, description='7th Window Width', update=update_window) - gnx7 = IntProperty(name='', min=1, max=300, default=60, description='8th Window Width', + gnx7: IntProperty(name='', min=1, max=300, default=60, description='8th Window Width', update=update_window) - gny0 = IntProperty(name='', min=1, max=300, default=190, description='1st Row Height', + gny0: IntProperty(name='', min=1, max=300, default=190, description='1st Row Height', update=update_window) - gny1 = IntProperty(name='', min=1, max=300, default=45, description='2nd Row Height', + gny1: IntProperty(name='', min=1, max=300, default=45, description='2nd Row Height', update=update_window) - gny2 = IntProperty(name='', min=1, max=300, default=45, description='3rd Row Height', + gny2: IntProperty(name='', min=1, max=300, default=45, description='3rd Row Height', update=update_window) - gny3 = IntProperty(name='', min=1, max=300, default=45, description='4th Row Height', + gny3: IntProperty(name='', min=1, max=300, default=45, description='4th Row Height', update=update_window) - gny4 = IntProperty(name='', min=1, max=300, default=45, description='5th Row Height', + gny4: IntProperty(name='', min=1, max=300, default=45, description='5th Row Height', update=update_window) - k00 = BoolProperty(name='', default=True, update=update_window) - k01 = BoolProperty(name='', default=False, update=update_window) - k02 = BoolProperty(name='', default=True, update=update_window) - k03 = BoolProperty(name='', default=False, update=update_window) - k04 = BoolProperty(name='', default=False, update=update_window) - k05 = BoolProperty(name='', default=False, update=update_window) - k06 = BoolProperty(name='', default=False, update=update_window) - k07 = BoolProperty(name='', default=False, update=update_window) - - k10 = BoolProperty(name='', default=False, update=update_window) - k11 = BoolProperty(name='', default=False, update=update_window) - k12 = BoolProperty(name='', default=False, update=update_window) - k13 = BoolProperty(name='', default=False, update=update_window) - k14 = BoolProperty(name='', default=False, update=update_window) - k15 = BoolProperty(name='', default=False, update=update_window) - k16 = BoolProperty(name='', default=False, update=update_window) - k17 = BoolProperty(name='', default=False, update=update_window) - - k20 = BoolProperty(name='', default=False, update=update_window) - k21 = BoolProperty(name='', default=False, update=update_window) - k22 = BoolProperty(name='', default=False, update=update_window) - k23 = BoolProperty(name='', default=False, update=update_window) - k24 = BoolProperty(name='', default=False, update=update_window) - k25 = BoolProperty(name='', default=False, update=update_window) - k26 = BoolProperty(name='', default=False, update=update_window) - k27 = BoolProperty(name='', default=False, update=update_window) - - k30 = BoolProperty(name='', default=False, update=update_window) - k31 = BoolProperty(name='', default=False, update=update_window) - k32 = BoolProperty(name='', default=False, update=update_window) - k33 = BoolProperty(name='', default=False, update=update_window) - k34 = BoolProperty(name='', default=False, update=update_window) - k35 = BoolProperty(name='', default=False, update=update_window) - k36 = BoolProperty(name='', default=False, update=update_window) - k37 = BoolProperty(name='', default=False, update=update_window) - - k40 = BoolProperty(name='', default=False, update=update_window) - k41 = BoolProperty(name='', default=False, update=update_window) - k42 = BoolProperty(name='', default=False, update=update_window) - k43 = BoolProperty(name='', default=False, update=update_window) - k44 = BoolProperty(name='', default=False, update=update_window) - k45 = BoolProperty(name='', default=False, update=update_window) - k46 = BoolProperty(name='', default=False, update=update_window) - k47 = BoolProperty(name='', default=False, update=update_window) + k00: BoolProperty(name='', default=True, update=update_window) + k01: BoolProperty(name='', default=False, update=update_window) + k02: BoolProperty(name='', default=True, update=update_window) + k03: BoolProperty(name='', default=False, update=update_window) + k04: BoolProperty(name='', default=False, update=update_window) + k05: BoolProperty(name='', default=False, update=update_window) + k06: BoolProperty(name='', default=False, update=update_window) + k07: BoolProperty(name='', default=False, update=update_window) + + k10: BoolProperty(name='', default=False, update=update_window) + k11: BoolProperty(name='', default=False, update=update_window) + k12: BoolProperty(name='', default=False, update=update_window) + k13: BoolProperty(name='', default=False, update=update_window) + k14: BoolProperty(name='', default=False, update=update_window) + k15: BoolProperty(name='', default=False, update=update_window) + k16: BoolProperty(name='', default=False, update=update_window) + k17: BoolProperty(name='', default=False, update=update_window) + + k20: BoolProperty(name='', default=False, update=update_window) + k21: BoolProperty(name='', default=False, update=update_window) + k22: BoolProperty(name='', default=False, update=update_window) + k23: BoolProperty(name='', default=False, update=update_window) + k24: BoolProperty(name='', default=False, update=update_window) + k25: BoolProperty(name='', default=False, update=update_window) + k26: BoolProperty(name='', default=False, update=update_window) + k27: BoolProperty(name='', default=False, update=update_window) + + k30: BoolProperty(name='', default=False, update=update_window) + k31: BoolProperty(name='', default=False, update=update_window) + k32: BoolProperty(name='', default=False, update=update_window) + k33: BoolProperty(name='', default=False, update=update_window) + k34: BoolProperty(name='', default=False, update=update_window) + k35: BoolProperty(name='', default=False, update=update_window) + k36: BoolProperty(name='', default=False, update=update_window) + k37: BoolProperty(name='', default=False, update=update_window) + + k40: BoolProperty(name='', default=False, update=update_window) + k41: BoolProperty(name='', default=False, update=update_window) + k42: BoolProperty(name='', default=False, update=update_window) + k43: BoolProperty(name='', default=False, update=update_window) + k44: BoolProperty(name='', default=False, update=update_window) + k45: BoolProperty(name='', default=False, update=update_window) + k46: BoolProperty(name='', default=False, update=update_window) + k47: BoolProperty(name='', default=False, update=update_window) # opengl internal data - glpoint_a = FloatVectorProperty( + glpoint_a: FloatVectorProperty( name="glpointa", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_b = FloatVectorProperty( + glpoint_b: FloatVectorProperty( name="glpointb", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_c = FloatVectorProperty( + glpoint_c: FloatVectorProperty( name="glpointc", description="Hidden property for opengl", default=(0, 0, 0), ) - glpoint_d = FloatVectorProperty( + glpoint_d: FloatVectorProperty( name="glpointc", description="Hidden property for opengl", default=(0, 0, 0), diff --git a/btrace/__init__.py b/btrace/__init__.py index 8f00f2c33368eea966ca597c34ad4b95268e6faf..dee32a3fbcd21db47b9d5c7f1e530129a622fde5 100644 --- a/btrace/__init__.py +++ b/btrace/__init__.py @@ -66,7 +66,7 @@ from bpy.props import ( class btrace_preferences(AddonPreferences): bl_idname = __name__ - expand_enum = EnumProperty( + expand_enum: EnumProperty( name="UI Options", items=[ ('list', "Drop down list", diff --git a/btrace/bTrace_props.py b/btrace/bTrace_props.py index 2a56946ebff142e942195b0b7d0cd86d25c096ee..68d7f087481419d3651078db3328a084a4ade814 100644 --- a/btrace/bTrace_props.py +++ b/btrace/bTrace_props.py @@ -33,7 +33,7 @@ from bpy.props import ( # Class to define properties class TracerProperties(PropertyGroup): """Options for tools""" - curve_spline = EnumProperty( + curve_spline: EnumProperty( name="Spline", items=(("POLY", "Poly", "Use Poly spline type"), ("NURBS", "Nurbs", "Use Nurbs spline type"), @@ -41,7 +41,7 @@ class TracerProperties(PropertyGroup): description="Choose which type of spline to use when curve is created", default="BEZIER" ) - curve_handle = EnumProperty( + curve_handle: EnumProperty( name="Handle", items=(("ALIGNED", "Aligned", "Use Aligned Handle Type"), ("AUTOMATIC", "Automatic", "Use Auto Handle Type"), @@ -50,272 +50,272 @@ class TracerProperties(PropertyGroup): description="Choose which type of handle to use when curve is created", default="VECTOR" ) - curve_resolution = IntProperty( + curve_resolution: IntProperty( name="Bevel Resolution", min=1, max=32, default=4, description="Adjust the Bevel resolution" ) - curve_depth = FloatProperty( + curve_depth: FloatProperty( name="Bevel Depth", min=0.0, max=100.0, default=0.1, description="Adjust the Bevel depth" ) - curve_u = IntProperty( + curve_u: IntProperty( name="Resolution U", min=0, max=64, default=12, description="Adjust the Surface resolution" ) - curve_join = BoolProperty( + curve_join: BoolProperty( name="Join Curves", default=False, description="Join all the curves after they have been created" ) - curve_smooth = BoolProperty( + curve_smooth: BoolProperty( name="Smooth", default=True, description="Render curve smooth" ) # Option to Duplicate Mesh - object_duplicate = BoolProperty( + object_duplicate: BoolProperty( name="Apply to Copy", default=False, description="Apply curve to a copy of object" ) # Distort Mesh options - distort_modscale = IntProperty( + distort_modscale: IntProperty( name="Modulation Scale", min=0, max=50, default=2, description="Add a scale to modulate the curve at random points, set to 0 to disable" ) - distort_noise = FloatProperty( + distort_noise: FloatProperty( name="Mesh Noise", min=0.0, max=50.0, default=0.00, description="Adjust noise added to mesh before adding curve" ) # Particle Options - particle_step = IntProperty( + particle_step: IntProperty( name="Step Size", min=1, max=50, default=5, description="Sample one every this number of frames" ) - particle_auto = BoolProperty( + particle_auto: BoolProperty( name="Auto Frame Range", default=True, description="Calculate Frame Range from particles life" ) - particle_f_start = IntProperty( + particle_f_start: IntProperty( name='Start Frame', min=1, max=5000, default=1, description='Start frame' ) - particle_f_end = IntProperty( + particle_f_end: IntProperty( name="End Frame", min=1, max=5000, default=250, description="End frame" ) # F-Curve Modifier Properties - fcnoise_rot = BoolProperty( + fcnoise_rot: BoolProperty( name="Rotation", default=False, description="Affect Rotation" ) - fcnoise_loc = BoolProperty( + fcnoise_loc: BoolProperty( name="Location", default=True, description="Affect Location" ) - fcnoise_scale = BoolProperty( + fcnoise_scale: BoolProperty( name="Scale", default=False, description="Affect Scale" ) - fcnoise_amp = IntProperty( + fcnoise_amp: IntProperty( name="Amp", min=1, max=500, default=5, description="Adjust the amplitude" ) - fcnoise_timescale = FloatProperty( + fcnoise_timescale: FloatProperty( name="Time Scale", min=1, max=500, default=50, description="Adjust the time scale" ) - fcnoise_key = BoolProperty( + fcnoise_key: BoolProperty( name="Add Keyframe", default=True, description="Keyframe is needed for tool, this adds a LocRotScale keyframe" ) - show_curve_settings = BoolProperty( + show_curve_settings: BoolProperty( name="Curve Settings", default=False, description="Change the curve settings for the created curve" ) - material_settings = BoolProperty( + material_settings: BoolProperty( name="Material Settings", default=False, description="Change the material settings for the created curve" ) - particle_settings = BoolProperty( + particle_settings: BoolProperty( name="Particle Settings", default=False, description="Show the settings for the created curve" ) - animation_settings = BoolProperty( + animation_settings: BoolProperty( name="Animation Settings", default=False, description="Show the settings for the Animations" ) - distort_curve = BoolProperty( + distort_curve: BoolProperty( name="Add Distortion", default=False, description="Set options to distort the final curve" ) - connect_noise = BoolProperty( + connect_noise: BoolProperty( name="F-Curve Noise", default=False, description="Adds F-Curve Noise Modifier to selected objects" ) - settings_objectTrace = BoolProperty( + settings_objectTrace: BoolProperty( name="Object Trace Settings", default=False, description="Trace selected mesh object with a curve" ) - settings_objectsConnect = BoolProperty( + settings_objectsConnect: BoolProperty( name="Objects Connect Settings", default=False, description="Connect objects with a curve controlled by hooks" ) - settings_objectTrace = BoolProperty( + settings_objectTrace: BoolProperty( name="Object Trace Settings", default=False, description="Trace selected mesh object with a curve" ) - respect_order = BoolProperty( + respect_order: BoolProperty( name="Order", default=False, description="Remember order objects were selected" ) - settings_particleTrace = BoolProperty( + settings_particleTrace: BoolProperty( name="Particle Trace Settings", default=False, description="Trace particle path with a curve" ) - settings_particleConnect = BoolProperty( + settings_particleConnect: BoolProperty( name="Particle Connect Settings", default=False, description="Connect particles with a curves and animated over particle lifetime" ) - settings_growCurve = BoolProperty( + settings_growCurve: BoolProperty( name="Grow Curve Settings", default=False, description="Animate curve bevel over time by keyframing points radius" ) - settings_fcurve = BoolProperty( + settings_fcurve: BoolProperty( name="F-Curve Settings", default=False, description="F-Curve Settings" ) - settings_toggle = BoolProperty( + settings_toggle: BoolProperty( name="Settings", default=False, description="Toggle Settings" ) # Animation Options - anim_auto = BoolProperty( + anim_auto: BoolProperty( name="Auto Frame Range", default=True, description="Automatically calculate Frame Range" ) - anim_f_start = IntProperty( + anim_f_start: IntProperty( name="Start", min=1, max=2500, default=1, description="Start frame / Hidden object" ) - anim_length = IntProperty( + anim_length: IntProperty( name="Duration", min=1, soft_max=1000, max=2500, default=100, description="Animation Length" ) - anim_f_fade = IntProperty( + anim_f_fade: IntProperty( name="Fade After", min=0, soft_max=250, max=2500, default=10, description="Fade after this frames / Zero means no fade" ) - anim_delay = IntProperty( + anim_delay: IntProperty( name="Grow", min=0, max=50, default=5, description="Frames it takes a point to grow" ) - anim_tails = BoolProperty( + anim_tails: BoolProperty( name='Tails on endpoints', default=True, description='Set radius to zero for open splines endpoints' ) - anim_keepr = BoolProperty( + anim_keepr: BoolProperty( name="Keep Radius", default=True, description="Try to keep radius data from original curve" ) - animate = BoolProperty( + animate: BoolProperty( name="Animate Result", default=False, description="Animate the final curve objects" ) # Convert to Curve options - convert_conti = BoolProperty( + convert_conti: BoolProperty( name="Continuous", default=True, description="Create a continuous curve using verts from mesh" ) - convert_everyedge = BoolProperty( + convert_everyedge: BoolProperty( name="Every Edge", default=False, description="Create a curve from all verts in a mesh" ) - convert_edgetype = EnumProperty( + convert_edgetype: EnumProperty( name="Edge Type for Curves", items=(("CONTI", "Continuous", "Create a continuous curve using verts from mesh"), ("EDGEALL", "All Edges", "Create a curve from every edge in a mesh")), description="Choose which type of spline to use when curve is created", default="CONTI" ) - convert_joinbefore = BoolProperty( + convert_joinbefore: BoolProperty( name="Join objects before convert", default=False, description="Join all selected mesh to one object before converting to mesh" ) # Mesh Follow Options - fol_edge_select = BoolProperty( + fol_edge_select: BoolProperty( name="Edge", default=False, description="Grow from edges" ) - fol_vert_select = BoolProperty( + fol_vert_select: BoolProperty( name="Vertex", default=False, description="Grow from verts" ) - fol_face_select = BoolProperty( + fol_face_select: BoolProperty( name="Face", default=True, description="Grow from faces" ) - fol_mesh_type = EnumProperty( + fol_mesh_type: EnumProperty( name="Mesh type", default="VERTS", description="Mesh feature to draw cruves from", @@ -324,25 +324,25 @@ class TracerProperties(PropertyGroup): ("FACES", "Faces", "Draw from Faces"), ("OBJECT", "Object", "Draw from Object origin")) ) - fol_start_frame = IntProperty( + fol_start_frame: IntProperty( name="Start Frame", min=1, max=2500, default=1, description="Start frame for range to trace" ) - fol_end_frame = IntProperty( + fol_end_frame: IntProperty( name="End Frame", min=1, max=2500, default=250, description="End frame for range to trace" ) - fol_perc_verts = FloatProperty( + fol_perc_verts: FloatProperty( name="Reduce selection by", min=0.001, max=1.000, default=0.5, description="percentage of total verts to trace" ) - fol_sel_option = EnumProperty( + fol_sel_option: EnumProperty( name="Selection type", description="Choose which objects to follow", default="RANDOM", @@ -350,32 +350,32 @@ class TracerProperties(PropertyGroup): ("CUSTOM", "Custom Select", "Follow selected items"), ("ALL", "All", "Follow all items")) ) - trace_mat_color = FloatVectorProperty( + trace_mat_color: FloatVectorProperty( name="Material Color", description="Choose material color", min=0, max=1, default=(0.0, 0.3, 0.6), subtype="COLOR" ) - trace_mat_random = BoolProperty( + trace_mat_random: BoolProperty( name="Random Color", default=False, description='Make the material colors random' ) # Material custom Properties properties - mat_simple_adv_toggle = EnumProperty( + mat_simple_adv_toggle: EnumProperty( name="Material Options", items=(("SIMPLE", "Simple", "Show Simple Material Options"), ("ADVANCED", "Advanced", "Show Advanced Material Options")), description="Choose which Material Options to show", default="SIMPLE" ) - mat_run_color_blender = BoolProperty( + mat_run_color_blender: BoolProperty( name="Run Color Blender", default=False, description="Generate colors from a color scheme" ) - mmColors = EnumProperty( + mmColors: EnumProperty( items=(("RANDOM", "Random", "Use random colors"), ("CUSTOM", "Custom", "Use custom colors"), ("BW", "Black/White", "Use Black and White"), @@ -387,148 +387,148 @@ class TracerProperties(PropertyGroup): name="Define a color palette" ) # Custom property for how many keyframes to skip - mmSkip = IntProperty( + mmSkip: IntProperty( name="frames", min=1, max=500, default=20, description="Number of frames between each keyframes" ) # Custom property to enable/disable random order for the - mmBoolRandom = BoolProperty( + mmBoolRandom: BoolProperty( name="Random Order", default=False, description="Randomize the order of the colors" ) # Custom Color properties - mmColor1 = FloatVectorProperty( + mmColor1: FloatVectorProperty( min=0, max=1, default=(0.8, 0.8, 0.8), description="Custom Color 1", subtype="COLOR" ) - mmColor2 = FloatVectorProperty( + mmColor2: FloatVectorProperty( min=0, max=1, default=(0.8, 0.8, 0.3), description="Custom Color 2", subtype="COLOR" ) - mmColor3 = FloatVectorProperty( + mmColor3: FloatVectorProperty( min=0, max=1, default=(0.8, 0.5, 0.6), description="Custom Color 3", subtype="COLOR" ) - mmColor4 = FloatVectorProperty( + mmColor4: FloatVectorProperty( min=0, max=1, default=(0.2, 0.8, 0.289), description="Custom Color 4", subtype="COLOR" ) - mmColor5 = FloatVectorProperty( + mmColor5: FloatVectorProperty( min=0, max=1, default=(1.0, 0.348, 0.8), description="Custom Color 5", subtype="COLOR" ) - mmColor6 = FloatVectorProperty( + mmColor6: FloatVectorProperty( min=0, max=1, default=(0.4, 0.67, 0.8), description="Custom Color 6", subtype="COLOR" ) - mmColor7 = FloatVectorProperty( + mmColor7: FloatVectorProperty( min=0, max=1, default=(0.66, 0.88, 0.8), description="Custom Color 7", subtype="COLOR" ) - mmColor8 = FloatVectorProperty( + mmColor8: FloatVectorProperty( min=0, max=1, default=(0.8, 0.38, 0.22), description="Custom Color 8", subtype="COLOR" ) # BW Color properties - bwColor1 = FloatVectorProperty( + bwColor1: FloatVectorProperty( min=0, max=1, default=(0.0, 0.0, 0.0), description="Black/White Color 1", subtype="COLOR" ) - bwColor2 = FloatVectorProperty( + bwColor2: FloatVectorProperty( min=0, max=1, default=(1.0, 1.0, 1.0), description="Black/White Color 2", subtype="COLOR" ) # Bright Color properties - brightColor1 = FloatVectorProperty( + brightColor1: FloatVectorProperty( min=0, max=1, default=(1.0, 0.0, 0.75), description="Bright Color 1", subtype="COLOR" ) - brightColor2 = FloatVectorProperty( + brightColor2: FloatVectorProperty( min=0, max=1, default=(0.0, 1.0, 1.0), description="Bright Color 2", subtype="COLOR" ) - brightColor3 = FloatVectorProperty( + brightColor3: FloatVectorProperty( min=0, max=1, default=(0.0, 1.0, 0.0), description="Bright Color 3", subtype="COLOR" ) - brightColor4 = FloatVectorProperty( + brightColor4: FloatVectorProperty( min=0, max=1, default=(1.0, 1.0, 0.0), description="Bright Color 4", subtype="COLOR" ) # Earth Color Properties - earthColor1 = FloatVectorProperty( + earthColor1: FloatVectorProperty( min=0, max=1, default=(0.068, 0.019, 0.014), description="Earth Color 1", subtype="COLOR" ) - earthColor2 = FloatVectorProperty( + earthColor2: FloatVectorProperty( min=0, max=1, default=(0.089, 0.060, 0.047), description="Earth Color 2", subtype="COLOR" ) - earthColor3 = FloatVectorProperty( + earthColor3: FloatVectorProperty( min=0, max=1, default=(0.188, 0.168, 0.066), description="Earth Color 3", subtype="COLOR" ) - earthColor4 = FloatVectorProperty( + earthColor4: FloatVectorProperty( min=0, max=1, default=(0.445, 0.296, 0.065), description="Earth Color 4", subtype="COLOR" ) - earthColor5 = FloatVectorProperty( + earthColor5: FloatVectorProperty( min=0, max=1, default=(0.745, 0.332, 0.065), description="Earth Color 5", subtype="COLOR" ) # Green to Blue Color properties - greenblueColor1 = FloatVectorProperty( + greenblueColor1: FloatVectorProperty( min=0, max=1, default=(0.296, 0.445, 0.074), description="Green/Blue Color 1", subtype="COLOR" ) - greenblueColor2 = FloatVectorProperty( + greenblueColor2: FloatVectorProperty( min=0, max=1, default=(0.651, 1.0, 0.223), description="Green/Blue Color 2", subtype="COLOR" ) - greenblueColor3 = FloatVectorProperty( + greenblueColor3: FloatVectorProperty( min=0, max=1, default=(0.037, 0.047, 0.084), description="Green/Blue Color 3", @@ -558,7 +558,7 @@ class TracerProperties(PropertyGroup): ('tool_colorblender', "Color Blender", "Pick the color of the created curves", "COLOR", 9), ] - btrace_toolmenu = EnumProperty( + btrace_toolmenu: EnumProperty( name="Tools", items=btrace_menu_items, description="", diff --git a/camera_turnaround.py b/camera_turnaround.py index 78fdab608527bb04472cbbbcc6a5355072d32aaf..36393f3ab1fa32022a34741bb851b530ec93ebd4 100644 --- a/camera_turnaround.py +++ b/camera_turnaround.py @@ -184,47 +184,47 @@ class RunAction(Operator): # ------------------------------------------------------ class CameraTurnProps(PropertyGroup): - camera_revol_x = FloatProperty( + camera_revol_x: FloatProperty( name='X', min=0, max=25, default=0, precision=2, description='Number total of revolutions in X axis' ) - camera_revol_y = FloatProperty( + camera_revol_y: FloatProperty( name='Y', min=0, max=25, default=0, precision=2, description='Number total of revolutions in Y axis' ) - camera_revol_z = FloatProperty( + camera_revol_z: FloatProperty( name='Z', min=0, max=25, default=1, precision=2, description='Number total of revolutions in Z axis' ) - inverse_x = BoolProperty( + inverse_x: BoolProperty( name="-X", description="Inverse rotation", default=False ) - inverse_y = BoolProperty( + inverse_y: BoolProperty( name="-Y", description="Inverse rotation", default=False ) - inverse_z = BoolProperty( + inverse_z: BoolProperty( name="-Z", description="Inverse rotation", default=False ) - use_cursor = BoolProperty( + use_cursor: BoolProperty( name="Use cursor position", description="Use cursor position instead of object origin", default=False ) - back_forw = BoolProperty( + back_forw: BoolProperty( name="Back and forward", description="Create back and forward animation", default=False ) - dolly_zoom = EnumProperty( + dolly_zoom: EnumProperty( items=( ('0', "None", ""), ('1', "Dolly zoom", ""), @@ -233,24 +233,24 @@ class CameraTurnProps(PropertyGroup): name="Lens Effects", description="Create a camera lens movement" ) - camera_from_lens = FloatProperty( + camera_from_lens: FloatProperty( name="From", min=1, max=500, default=35, precision=3, description="Start lens value" ) - camera_to_lens = FloatProperty( + camera_to_lens: FloatProperty( name="To", min=1, max=500, default=35, precision=3, description="End lens value" ) - track = BoolProperty( + track: BoolProperty( name="Create track constraint", description="Add a track constraint to the camera", default=False ) - reset_cam_anim = BoolProperty( + reset_cam_anim: BoolProperty( name="Clear Camera", description="Clear previous camera animations if there are any\n" "(For instance, previous Dolly Zoom)", diff --git a/development_api_navigator.py b/development_api_navigator.py index deae844383e1f896ff32ec449fc1f40ee4511a8f..11193984a9cef349cfea239b5784f1861c79eb70 100644 --- a/development_api_navigator.py +++ b/development_api_navigator.py @@ -347,7 +347,7 @@ class Down(ApiNavigator, Operator): bl_idname = "api_navigator.down" bl_label = "API Navigator Down" - pointed_module = StringProperty( + pointed_module: StringProperty( name="Current Module", default="" ) @@ -405,7 +405,7 @@ class Subscript(ApiNavigator, Operator): bl_idname = "api_navigator.subscript" bl_label = "API Navigator Subscript" - subscription = StringProperty( + subscription: StringProperty( name="", default="" ) @@ -652,27 +652,27 @@ class ApiNavProps(PropertyGroup): bpy.context.window_manager.api_nav_props """ - path = StringProperty( + path: StringProperty( name="Path", description="Enter bpy.ops.api_navigator to see the documentation", default="bpy" ) - old_path = StringProperty( + old_path: StringProperty( name="Old Path", default="" ) - filters = StringProperty( + filters: StringProperty( name="Filters", description="Filter the resulting modules", default="" ) - reduce_to = IntProperty( + reduce_to: IntProperty( name="Reduce to", description="Display a maximum number of x entries by pages", default=10, min=1 ) - pages = IntProperty( + pages: IntProperty( name="Pages", description="Display a Page", default=0, diff --git a/development_edit_operator.py b/development_edit_operator.py index 458bbf5620f538180a944bb20765f2e1108cc2f4..257e61be74b44903c0c7184dee4d6da937334d06 100644 --- a/development_edit_operator.py +++ b/development_edit_operator.py @@ -105,7 +105,7 @@ class EditOperator(Operator): items = get_ops() - op = EnumProperty( + op: EnumProperty( name="Op", description="", items=items diff --git a/development_iskeyfree.py b/development_iskeyfree.py index 5d5600f4748fcd07b3aab6c5c245e25ff6037192..1cb446596447b0a638b28c430bb1cf68b6492ff7 100644 --- a/development_iskeyfree.py +++ b/development_iskeyfree.py @@ -275,31 +275,31 @@ def update_data(self, context): class IskeyFreeProperties(PropertyGroup): - data = StringProperty( + data: StringProperty( name="Key", maxlen=32, description="Shortcut to verify" ) - use_crtl = BoolProperty( + use_crtl: BoolProperty( name="Ctrl", description="Ctrl key used in shortcut", default=False ) - use_alt = BoolProperty( + use_alt: BoolProperty( name="Alt", description="Alt key used in shortcut", default=False ) - use_shift = BoolProperty( + use_shift: BoolProperty( name="Shift", description="Shift key used in shortcut", default=False ) - use_oskey = BoolProperty( + use_oskey: BoolProperty( name="OsKey", description="Operating system key used in shortcut", default=False ) - numpad = EnumProperty( + numpad: EnumProperty( items=( ('NONE', "Select key", ""), ("LEFTMOUSE", "LEFTMOUSE", ""), diff --git a/development_ui_classes.py b/development_ui_classes.py index f03b7bb50b8a9737f7a40f3e545ab94c31262570..65d3b1b5f4c6d09b836334f8f83326ef8b588375 100644 --- a/development_ui_classes.py +++ b/development_ui_classes.py @@ -146,7 +146,7 @@ class TEXT_OT_ui_cheat_sheet(Operator): # Properties class text_ui_cheat_props(PropertyGroup): - dev_ui_cheat_type = EnumProperty( + dev_ui_cheat_type: EnumProperty( name="Choose a Type", description="Choose what Classes to include in a Text-Block", items=(('all', "All", "Print all the types"), @@ -156,7 +156,7 @@ class text_ui_cheat_props(PropertyGroup): ), default='all', ) - searchable = BoolProperty( + searchable: BoolProperty( name="Format searchable", description="Generate the list as Python dictionary,\n" "using the format Class: Path", diff --git a/io_anim_acclaim/__init__.py b/io_anim_acclaim/__init__.py index 7cada817faa6cb8633207a6272f6f95d7433c60c..bafdb2bcf642811d45dde024162f8d5bfe326578 100644 --- a/io_anim_acclaim/__init__.py +++ b/io_anim_acclaim/__init__.py @@ -315,41 +315,41 @@ class AsfImporter(bpy.types.Operator): bl_idname = "import_anim.asf" bl_label = "Import ASF" - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', ) - armature_name = StringProperty( + armature_name: StringProperty( name="Armature Name", maxlen=63, default="Skeleton", description="Name of the new object", ) - use_limits = BoolProperty( + use_limits: BoolProperty( name="Use Limits", default=False, description="Create bone constraints for limits", ) - scale = FloatProperty( + scale: FloatProperty( name="Scale", default=1.0, description="Scale the armature by this value", min=0.0001, max=1000000.0, soft_min=0.001, soft_max=100.0, ) - from_inches = BoolProperty( + from_inches: BoolProperty( name="Convert from inches to metric", default=False, description="Scale by 2.54/100", ) - use_rot_x = BoolProperty( + use_rot_x: BoolProperty( name="Rotate X 90 degrees", default=False, description="Correct orientation", ) - use_rot_z = BoolProperty( + use_rot_z: BoolProperty( name="Rotate Z 90 degrees", default=False, description="Correct orientation", ) - filter_glob = StringProperty(default="*.asf", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.asf", options={'HIDDEN'}) def execute(self, context): uscale = (0.0254 if self.from_inches else 1.0) @@ -410,23 +410,23 @@ class AmcImporter(bpy.types.Operator): bl_idname = "import_anim.amc" bl_label = "Import AMC" - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', ) - frame_skip = IntProperty( + frame_skip: IntProperty( name="Fps divisor", default=4, # usually the sample rate is 120, so the default 4 gives you 30fps description="Frame supersampling factor", min=1, ) - use_frame_no = BoolProperty( + use_frame_no: BoolProperty( name="Use frame numbers", default=False, description="Offset start of animation according to the source", ) - filter_glob = StringProperty(default="*.amc", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.amc", options={'HIDDEN'}) @classmethod def poll(cls, context): @@ -466,16 +466,16 @@ class AmcExporter(bpy.types.Operator): bl_idname = "export_anim.amc" bl_label = "Export AMC" - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH' ) - use_scale = BoolProperty( + use_scale: BoolProperty( name="Use original armature scale", default=True, description="Scale movement to original scale if available", ) - filter_glob = StringProperty(default="*.amc", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.amc", options={'HIDDEN'}) @classmethod def poll(cls, context): diff --git a/io_anim_c3d/__init__.py b/io_anim_c3d/__init__.py index e14fcaec7d546df901cc1c5bf64bc229ea2ca96d..0d4a1b951283c4e5983ddbf7d3d88aa710a6433f 100644 --- a/io_anim_c3d/__init__.py +++ b/io_anim_c3d/__init__.py @@ -127,78 +127,78 @@ class C3DImporter(bpy.types.Operator): bl_idname = "import_anim.c3d" bl_label = "Import C3D" - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', ) - Y_up = BoolProperty( + Y_up: BoolProperty( name="Up vector is Y axis", default=False, description="Check when the data uses Y-up, uncheck when it uses Z-up", ) - from_inches = BoolProperty( + from_inches: BoolProperty( name="Convert from inches to meters", default=False, description="Scale by 2.54/100", ) - scale = FloatProperty( + scale: FloatProperty( name="Scale", default=1.0, description="Scale the positions by this value", min=0.0000001, max=1000000.0, soft_min=0.001, soft_max=100.0, ) - auto_scale = BoolProperty( + auto_scale: BoolProperty( name="Adjust scale automatically", default=False, description="Guess correct scale factor", ) - auto_magnitude = BoolProperty( + auto_magnitude: BoolProperty( name="Adjust scale magnitude", default=True, description="Automatically adjust scale magnitude", ) - create_armature = BoolProperty( + create_armature: BoolProperty( name="Create an armature", default=True, description="Import the markers as bones instead of empties", ) - size = FloatProperty( + size: FloatProperty( name="Empty or bone size", default=.03, description="The size of each empty or bone", min=0.0001, max=1000000.0, soft_min=0.001, soft_max=100.0, ) - x_ray = BoolProperty( + x_ray: BoolProperty( name="Use X-Ray", default=True, description="Show the empties or armature over other objects", ) - frame_skip = IntProperty( + frame_skip: IntProperty( name="Fps divisor", default=1, description="Frame supersampling factor", min=1, ) - use_frame_no = BoolProperty( + use_frame_no: BoolProperty( name="Use frame numbers", default=False, description="Offset start of animation according to the source", ) - show_names = BoolProperty( + show_names: BoolProperty( name="Show Names", default=False, description="Show the markers' name", ) - prefix = StringProperty( + prefix: StringProperty( name="Name Prefix", maxlen=32, description="Prefix object names with this", ) - use_existing = BoolProperty( + use_existing: BoolProperty( name="Use existing empties or armature", default=False, description="Use previously created homonymous empties or bones", ) - confidence = FloatProperty( + confidence: FloatProperty( name="Minimum Confidence Level", default=0, description="Only consider markers with at least " "this confidence level", @@ -206,7 +206,7 @@ class C3DImporter(bpy.types.Operator): soft_min=-1., soft_max=100.0, ) - filter_glob = StringProperty(default="*.c3d;*.csv", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.c3d;*.csv", options={'HIDDEN'}) def find_height(self, ms): """ diff --git a/io_anim_nuke_chan/__init__.py b/io_anim_nuke_chan/__init__.py index 9266c4398e9f7b78df582f7c7485e607e3328a5a..f562244ea5a6460290d1c1760b3e8924b0ed610c 100644 --- a/io_anim_nuke_chan/__init__.py +++ b/io_anim_nuke_chan/__init__.py @@ -74,20 +74,20 @@ class ImportChan(Operator, ImportHelper): filename_ext = ".chan" - filter_glob = StringProperty(default="*.chan", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.chan", options={'HIDDEN'}) rotation_order = rotation_order - z_up = BoolProperty( + z_up: BoolProperty( name="Make Z up", description="Switch the Y and Z axis", default=True) - sensor_width = FloatProperty( + sensor_width: FloatProperty( name="Camera sensor width", description="Imported camera sensor width", default=32.0) - sensor_height = FloatProperty( + sensor_height: FloatProperty( name="Camera sensor height", description="Imported camera sensor height", default=18.0) @@ -113,8 +113,8 @@ class ExportChan(Operator, ExportHelper): bl_label = "Export chan file" filename_ext = ".chan" - filter_glob = StringProperty(default="*.chan", options={'HIDDEN'}) - y_up = BoolProperty( + filter_glob: StringProperty(default="*.chan", options={'HIDDEN'}) + y_up: BoolProperty( name="Make Y up", description="Switch the Y and Z axis", default=True) diff --git a/io_convert_image_to_mesh_img/ui/importer.py b/io_convert_image_to_mesh_img/ui/importer.py index 9ac7371bf54d2d0eb38dfd9d508450c884867107..45ff3fffe8fa1b1d6f657f8eac3367290c131bfc 100644 --- a/io_convert_image_to_mesh_img/ui/importer.py +++ b/io_convert_image_to_mesh_img/ui/importer.py @@ -38,7 +38,7 @@ class ImportHiRISETerrain(bpy.types.Operator, ImportHelper): bl_options = {'UNDO'} filename_ext = ".img" - filter_glob = StringProperty( + filter_glob: StringProperty( options={'HIDDEN'}, default="*.img" ) @@ -60,7 +60,7 @@ class ImportHiRISETerrain(bpy.types.Operator, ImportHelper): # functions to the property itself because they result in a recursion # error. Instead, we use another, hidden, property to store the scaled # resolution. - dtm_resolution = FloatProperty( + dtm_resolution: FloatProperty( subtype="PERCENTAGE", description=( "Percentage scale for terrain model resolution. 100\% loads the " @@ -78,7 +78,7 @@ class ImportHiRISETerrain(bpy.types.Operator, ImportHelper): name="Terrain Model Resolution", min=1.0, max=100.0, default=10.0 ) - scaled_dtm_resolution = FloatProperty( + scaled_dtm_resolution: FloatProperty( options={'HIDDEN'}, name="Scaled Terrain Model Resolution", get=(lambda self: self.dtm_resolution / 100) @@ -96,7 +96,7 @@ class ImportHiRISETerrain(bpy.types.Operator, ImportHelper): # Blender to change the clipping distance to something appropriate for # the DTM, and scales the grid floor to have gridlines 1km apart, # instead of 1m apart. - should_setup_viewport = BoolProperty( + should_setup_viewport: BoolProperty( description=( "Set up the Blender screen to try and avoid clipping the DTM " "and to make the grid floor larger. *WARNING* This will change " @@ -107,7 +107,7 @@ class ImportHiRISETerrain(bpy.types.Operator, ImportHelper): ) # 2. Blender's default units are dimensionless. This option instructs # Blender to change its unit's dimension to meters. - should_setup_units = BoolProperty( + should_setup_units: BoolProperty( description=( "Set the Blender scene to use meters as its unit" ), diff --git a/io_convert_image_to_mesh_img/ui/terrainpanel.py b/io_convert_image_to_mesh_img/ui/terrainpanel.py index 93908709bb027892a1d93737949482c936f1b58b..2fc0d0b2aaa74212cfa1cfe69201efa9ce4dac72 100644 --- a/io_convert_image_to_mesh_img/ui/terrainpanel.py +++ b/io_convert_image_to_mesh_img/ui/terrainpanel.py @@ -55,7 +55,7 @@ class TerrainPanel(Panel): # functions to the property itself because they result in a recursion # error. Instead, we use another, hidden, property to store the scaled # resolution. - bpy.types.Object.dtm_resolution = FloatProperty( + bpy.types.Object.dtm_resolution: FloatProperty( subtype="PERCENTAGE", name="New Resolution", description=( @@ -70,7 +70,7 @@ class TerrainPanel(Panel): ), min=1.0, max=100.0, default=10.0 ) - bpy.types.Object.scaled_dtm_resolution = FloatProperty( + bpy.types.Object.scaled_dtm_resolution: FloatProperty( options={'HIDDEN'}, name="Scaled Terrain Model Resolution", get=(lambda self: self.dtm_resolution / 100.0) diff --git a/io_export_after_effects.py b/io_export_after_effects.py index d682497d862049928007af567266ce79fda0dc7f..462efbabcadac85fbd943a28db41417367bd6dcf 100644 --- a/io_export_after_effects.py +++ b/io_export_after_effects.py @@ -696,29 +696,29 @@ class ExportJsx(bpy.types.Operator, ExportHelper): bl_idname = "export.jsx" bl_label = "Export to Adobe After Effects" filename_ext = ".jsx" - filter_glob = StringProperty(default="*.jsx", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.jsx", options={'HIDDEN'}) - include_animation = BoolProperty( + include_animation: BoolProperty( name="Animation", description="Animate Exported Cameras and Objects", default=True, ) - include_active_cam = BoolProperty( + include_active_cam: BoolProperty( name="Active Camera", description="Include Active Camera", default=True, ) - include_selected_cams = BoolProperty( + include_selected_cams: BoolProperty( name="Selected Cameras", description="Add Selected Cameras", default=True, ) - include_selected_objects = BoolProperty( + include_selected_objects: BoolProperty( name="Selected Objects", description="Export Selected Objects", default=True, ) - include_cam_bundles = BoolProperty( + include_cam_bundles: BoolProperty( name="Camera 3D Markers", description="Include 3D Markers of Camera Motion Solution for selected cameras", default=True, @@ -728,7 +728,7 @@ class ExportJsx(bpy.types.Operator, ExportHelper): # description="Include 3D Markers of Object Motion Solution for selected cameras", # default=True, # ) - ae_size = FloatProperty( + ae_size: FloatProperty( name="AE Size", description="Size of AE Composition (pixels per 1BU)", default=100.0, diff --git a/io_export_paper_model.py b/io_export_paper_model.py index 0906eb338d9253df42f94bb242f3ecb6c99b6058..1c471a8f72e6656aab108c3bb3ee0399f99417e4 100644 --- a/io_export_paper_model.py +++ b/io_export_paper_model.py @@ -1905,17 +1905,17 @@ class Unfold(bpy.types.Operator): bl_label = "Unfold" bl_description = "Mark seams so that the mesh can be exported as a paper model" bl_options = {'REGISTER', 'UNDO'} - edit = bpy.props.BoolProperty(default=False, options={'HIDDEN'}) - priority_effect_convex = bpy.props.FloatProperty( + edit: bpy.props.BoolProperty(default=False, options={'HIDDEN'}) + priority_effect_convex: bpy.props.FloatProperty( name="Priority Convex", description="Priority effect for edges in convex angles", default=default_priority_effect['CONVEX'], soft_min=-1, soft_max=10, subtype='FACTOR') - priority_effect_concave = bpy.props.FloatProperty( + priority_effect_concave: bpy.props.FloatProperty( name="Priority Concave", description="Priority effect for edges in concave angles", default=default_priority_effect['CONCAVE'], soft_min=-1, soft_max=10, subtype='FACTOR') - priority_effect_length = bpy.props.FloatProperty( + priority_effect_length: bpy.props.FloatProperty( name="Priority Length", description="Priority effect of edge length", default=default_priority_effect['LENGTH'], soft_min=-10, soft_max=1, subtype='FACTOR') - do_create_uvmap = bpy.props.BoolProperty( + do_create_uvmap: bpy.props.BoolProperty( name="Create UVMap", description="Create a new UV Map showing the islands and page layout", default=False) object = None @@ -2036,69 +2036,69 @@ class PaperModelStyle(bpy.types.PropertyGroup): ('LONGDASH', "Long Dashes (-- --)", "Solid line"), ('DASHDOT', "Dash-dotted (-- .)", "Solid line") ] - outer_color = bpy.props.FloatVectorProperty( + outer_color: bpy.props.FloatVectorProperty( name="Outer Lines", description="Color of net outline", default=(0.0, 0.0, 0.0, 1.0), min=0, max=1, subtype='COLOR', size=4) - outer_style = bpy.props.EnumProperty( + outer_style: bpy.props.EnumProperty( name="Outer Lines Drawing Style", description="Drawing style of net outline", default='SOLID', items=line_styles) - line_width = bpy.props.FloatProperty( + line_width: bpy.props.FloatProperty( name="Base Lines Thickness", description="Base thickness of net lines, each actual value is a multiple of this length", default=1e-4, min=0, soft_max=5e-3, precision=5, step=1e-2, subtype="UNSIGNED", unit="LENGTH") - outer_width = bpy.props.FloatProperty( + outer_width: bpy.props.FloatProperty( name="Outer Lines Thickness", description="Relative thickness of net outline", default=3, min=0, soft_max=10, precision=1, step=10, subtype='FACTOR') - use_outbg = bpy.props.BoolProperty( + use_outbg: bpy.props.BoolProperty( name="Highlight Outer Lines", description="Add another line below every line to improve contrast", default=True) - outbg_color = bpy.props.FloatVectorProperty( + outbg_color: bpy.props.FloatVectorProperty( name="Outer Highlight", description="Color of the highlight for outer lines", default=(1.0, 1.0, 1.0, 1.0), min=0, max=1, subtype='COLOR', size=4) - outbg_width = bpy.props.FloatProperty( + outbg_width: bpy.props.FloatProperty( name="Outer Highlight Thickness", description="Relative thickness of the highlighting lines", default=5, min=0, soft_max=10, precision=1, step=10, subtype='FACTOR') - convex_color = bpy.props.FloatVectorProperty( + convex_color: bpy.props.FloatVectorProperty( name="Inner Convex Lines", description="Color of lines to be folded to a convex angle", default=(0.0, 0.0, 0.0, 1.0), min=0, max=1, subtype='COLOR', size=4) - convex_style = bpy.props.EnumProperty( + convex_style: bpy.props.EnumProperty( name="Convex Lines Drawing Style", description="Drawing style of lines to be folded to a convex angle", default='DASH', items=line_styles) - convex_width = bpy.props.FloatProperty( + convex_width: bpy.props.FloatProperty( name="Convex Lines Thickness", description="Relative thickness of concave lines", default=2, min=0, soft_max=10, precision=1, step=10, subtype='FACTOR') - concave_color = bpy.props.FloatVectorProperty( + concave_color: bpy.props.FloatVectorProperty( name="Inner Concave Lines", description="Color of lines to be folded to a concave angle", default=(0.0, 0.0, 0.0, 1.0), min=0, max=1, subtype='COLOR', size=4) - concave_style = bpy.props.EnumProperty( + concave_style: bpy.props.EnumProperty( name="Concave Lines Drawing Style", description="Drawing style of lines to be folded to a concave angle", default='DASHDOT', items=line_styles) - concave_width = bpy.props.FloatProperty( + concave_width: bpy.props.FloatProperty( name="Concave Lines Thickness", description="Relative thickness of concave lines", default=2, min=0, soft_max=10, precision=1, step=10, subtype='FACTOR') - freestyle_color = bpy.props.FloatVectorProperty( + freestyle_color: bpy.props.FloatVectorProperty( name="Freestyle Edges", description="Color of lines marked as Freestyle Edge", default=(0.0, 0.0, 0.0, 1.0), min=0, max=1, subtype='COLOR', size=4) - freestyle_style = bpy.props.EnumProperty( + freestyle_style: bpy.props.EnumProperty( name="Freestyle Edges Drawing Style", description="Drawing style of Freestyle Edges", default='SOLID', items=line_styles) - freestyle_width = bpy.props.FloatProperty( + freestyle_width: bpy.props.FloatProperty( name="Freestyle Edges Thickness", description="Relative thickness of Freestyle edges", default=2, min=0, soft_max=10, precision=1, step=10, subtype='FACTOR') - use_inbg = bpy.props.BoolProperty( + use_inbg: bpy.props.BoolProperty( name="Highlight Inner Lines", description="Add another line below every line to improve contrast", default=True) - inbg_color = bpy.props.FloatVectorProperty( + inbg_color: bpy.props.FloatVectorProperty( name="Inner Highlight", description="Color of the highlight for inner lines", default=(1.0, 1.0, 1.0, 1.0), min=0, max=1, subtype='COLOR', size=4) - inbg_width = bpy.props.FloatProperty( + inbg_width: bpy.props.FloatProperty( name="Inner Highlight Thickness", description="Relative thickness of the highlighting lines", default=2, min=0, soft_max=10, precision=1, step=10, subtype='FACTOR') - sticker_fill = bpy.props.FloatVectorProperty( + sticker_fill: bpy.props.FloatVectorProperty( name="Tabs Fill", description="Fill color of sticking tabs", default=(0.9, 0.9, 0.9, 1.0), min=0, max=1, subtype='COLOR', size=4) - text_color = bpy.props.FloatVectorProperty( + text_color: bpy.props.FloatVectorProperty( name="Text Color", description="Color of all text used in the document", default=(0.0, 0.0, 0.0, 1.0), min=0, max=1, subtype='COLOR', size=4) bpy.utils.register_class(PaperModelStyle) @@ -2110,25 +2110,25 @@ class ExportPaperModel(bpy.types.Operator): bl_idname = "export_mesh.paper_model" bl_label = "Export Paper Model" bl_description = "Export the selected object's net and optionally bake its texture" - filepath = bpy.props.StringProperty( + filepath: bpy.props.StringProperty( name="File Path", description="Target file to save the SVG", options={'SKIP_SAVE'}) - filename = bpy.props.StringProperty( + filename: bpy.props.StringProperty( name="File Name", description="Name of the file", options={'SKIP_SAVE'}) - directory = bpy.props.StringProperty( + directory: bpy.props.StringProperty( name="Directory", description="Directory of the file", options={'SKIP_SAVE'}) - page_size_preset = bpy.props.EnumProperty( + page_size_preset: bpy.props.EnumProperty( name="Page Size", description="Size of the exported document", default='A4', update=page_size_preset_changed, items=global_paper_sizes) - output_size_x = bpy.props.FloatProperty( + output_size_x: bpy.props.FloatProperty( name="Page Width", description="Width of the exported document", default=0.210, soft_min=0.105, soft_max=0.841, subtype="UNSIGNED", unit="LENGTH") - output_size_y = bpy.props.FloatProperty( + output_size_y: bpy.props.FloatProperty( name="Page Height", description="Height of the exported document", default=0.297, soft_min=0.148, soft_max=1.189, subtype="UNSIGNED", unit="LENGTH") - output_margin = bpy.props.FloatProperty( + output_margin: bpy.props.FloatProperty( name="Page Margin", description="Distance from page borders to the printable area", default=0.005, min=0, soft_max=0.1, step=0.1, subtype="UNSIGNED", unit="LENGTH") - output_type = bpy.props.EnumProperty( + output_type: bpy.props.EnumProperty( name="Textures", description="Source of a texture for the model", default='NONE', items=[ ('NONE', "No Texture", "Export the net only"), @@ -2137,47 +2137,47 @@ class ExportPaperModel(bpy.types.Operator): ('RENDER', "Full Render", "Render the material in actual scene illumination"), ('SELECTED_TO_ACTIVE', "Selected to Active", "Render all selected surrounding objects as a texture") ]) - do_create_stickers = bpy.props.BoolProperty( + do_create_stickers: bpy.props.BoolProperty( name="Create Tabs", description="Create gluing tabs around the net (useful for paper)", default=True) - do_create_numbers = bpy.props.BoolProperty( + do_create_numbers: bpy.props.BoolProperty( name="Create Numbers", description="Enumerate edges to make it clear which edges should be sticked together", default=True) - sticker_width = bpy.props.FloatProperty( + sticker_width: bpy.props.FloatProperty( name="Tabs and Text Size", description="Width of gluing tabs and their numbers", default=0.005, soft_min=0, soft_max=0.05, step=0.1, subtype="UNSIGNED", unit="LENGTH") - angle_epsilon = bpy.props.FloatProperty( + angle_epsilon: bpy.props.FloatProperty( name="Hidden Edge Angle", description="Folds with angle below this limit will not be drawn", default=pi/360, min=0, soft_max=pi/4, step=0.01, subtype="ANGLE", unit="ROTATION") - output_dpi = bpy.props.FloatProperty( + output_dpi: bpy.props.FloatProperty( name="Resolution (DPI)", description="Resolution of images in pixels per inch", default=90, min=1, soft_min=30, soft_max=600, subtype="UNSIGNED") - file_format = bpy.props.EnumProperty( + file_format: bpy.props.EnumProperty( name="Document Format", description="File format of the exported net", default='PDF', items=[ ('PDF', "PDF", "Adobe Portable Document Format 1.4"), ('SVG', "SVG", "W3C Scalable Vector Graphics"), ]) - image_packing = bpy.props.EnumProperty( + image_packing: bpy.props.EnumProperty( name="Image Packing Method", description="Method of attaching baked image(s) to the SVG", default='ISLAND_EMBED', items=[ ('PAGE_LINK', "Single Linked", "Bake one image per page of output and save it separately"), ('ISLAND_LINK', "Linked", "Bake images separately for each island and save them in a directory"), ('ISLAND_EMBED', "Embedded", "Bake images separately for each island and embed them into the SVG") ]) - scale = bpy.props.FloatProperty( + scale: bpy.props.FloatProperty( name="Scale", description="Divisor of all dimensions when exporting", default=1, soft_min=1.0, soft_max=10000.0, step=100, subtype='UNSIGNED', precision=1) - do_create_uvmap = bpy.props.BoolProperty( + do_create_uvmap: bpy.props.BoolProperty( name="Create UVMap", description="Create a new UV Map showing the islands and page layout", default=False, options={'SKIP_SAVE'}) - ui_expanded_document = bpy.props.BoolProperty( + ui_expanded_document: bpy.props.BoolProperty( name="Show Document Settings Expanded", description="Shows the box 'Document Settings' expanded in user interface", default=True, options={'SKIP_SAVE'}) - ui_expanded_style = bpy.props.BoolProperty( + ui_expanded_style: bpy.props.BoolProperty( name="Show Style Settings Expanded", description="Shows the box 'Colors and Style' expanded in user interface", default=False, options={'SKIP_SAVE'}) - style = bpy.props.PointerProperty(type=PaperModelStyle) + style: bpy.props.PointerProperty(type=PaperModelStyle) unfolder = None largest_island_ratio = 0 @@ -2524,48 +2524,48 @@ def island_item_changed(self, context): class FaceList(bpy.types.PropertyGroup): - id = bpy.props.IntProperty(name="Face ID") + id: bpy.props.IntProperty(name="Face ID") bpy.utils.register_class(FaceList) class IslandList(bpy.types.PropertyGroup): - faces = bpy.props.CollectionProperty( + faces: bpy.props.CollectionProperty( name="Faces", description="Faces belonging to this island", type=FaceList) - label = bpy.props.StringProperty( + label: bpy.props.StringProperty( name="Label", description="Label on this island", default="", update=label_changed) - abbreviation = bpy.props.StringProperty( + abbreviation: bpy.props.StringProperty( name="Abbreviation", description="Three-letter label to use when there is not enough space", default="", update=island_item_changed) - auto_label = bpy.props.BoolProperty( + auto_label: bpy.props.BoolProperty( name="Auto Label", description="Generate the label automatically", default=True, update=island_item_changed) - auto_abbrev = bpy.props.BoolProperty( + auto_abbrev: bpy.props.BoolProperty( name="Auto Abbreviation", description="Generate the abbreviation automatically", default=True, update=island_item_changed) bpy.utils.register_class(IslandList) class PaperModelSettings(bpy.types.PropertyGroup): - display_islands = bpy.props.BoolProperty( + display_islands: bpy.props.BoolProperty( name="Highlight selected island", description="Highlight faces corresponding to the selected island in the 3D View", options={'SKIP_SAVE'}, update=display_islands_changed) - islands_alpha = bpy.props.FloatProperty( + islands_alpha: bpy.props.FloatProperty( name="Opacity", description="Opacity of island highlighting", min=0.0, max=1.0, default=0.3) - limit_by_page = bpy.props.BoolProperty( + limit_by_page: bpy.props.BoolProperty( name="Limit Island Size", description="Do not create islands larger than given dimensions", default=False, update=page_size_preset_changed) - page_size_preset = bpy.props.EnumProperty( + page_size_preset: bpy.props.EnumProperty( name="Page Size", description="Maximal size of an island", default='A4', update=page_size_preset_changed, items=global_paper_sizes) - output_size_x = bpy.props.FloatProperty( + output_size_x: bpy.props.FloatProperty( name="Width", description="Maximal width of an island", default=0.2, soft_min=0.105, soft_max=0.841, subtype="UNSIGNED", unit="LENGTH") - output_size_y = bpy.props.FloatProperty( + output_size_y: bpy.props.FloatProperty( name="Height", description="Maximal height of an island", default=0.29, soft_min=0.148, soft_max=1.189, subtype="UNSIGNED", unit="LENGTH") - scale = bpy.props.FloatProperty( + scale: bpy.props.FloatProperty( name="Scale", description="Divisor of all dimensions when exporting", default=1, soft_min=1.0, soft_max=10000.0, step=100, subtype='UNSIGNED', precision=1) bpy.utils.register_class(PaperModelSettings) diff --git a/io_export_unreal_psk_psa.py b/io_export_unreal_psk_psa.py index 987bf2a6b269b7fb9b78f19539897df0799e3f70..8428ea8719c09dd8370229af6d81202505af397f 100644 --- a/io_export_unreal_psk_psa.py +++ b/io_export_unreal_psk_psa.py @@ -2282,17 +2282,17 @@ class OBJECT_OT_UTRebuildArmature(Operator): class UDKActionSetListPG(PropertyGroup): - bool = BoolProperty(default=False) - string = StringProperty() - actionname = StringProperty() - bmatch = BoolProperty( + bool: BoolProperty(default=False) + string: StringProperty() + actionname: StringProperty() + bmatch: BoolProperty( default=False, name="Match", options={"HIDDEN"}, description="This check against bone names and action group " "names matches and override boolean if true" ) - bexport = BoolProperty( + bexport: BoolProperty( default=False, name="Export", description="Check this to export the animation" @@ -2307,21 +2307,21 @@ class UL_UDKActionSetList(UIList): class UDKObjListPG(PropertyGroup): - bool = BoolProperty(default=False) - string = StringProperty() - bexport = BoolProperty( + bool: BoolProperty(default=False) + string: StringProperty() + bexport: BoolProperty( default=False, name="Export", options={"HIDDEN"}, description="This will be ignore when exported" ) - bselect = BoolProperty( + bselect: BoolProperty( default=False, name="Select", options={"HIDDEN"}, description="This will be ignore when exported" ) - otype = StringProperty( + otype: StringProperty( name="Type", description="This will be ignore when exported" ) @@ -2335,23 +2335,23 @@ class UL_UDKObjList(UIList): class UDKMeshListPG(PropertyGroup): - bool = BoolProperty( + bool: BoolProperty( default=False ) - string = StringProperty() - bexport = BoolProperty( + string: StringProperty() + bexport: BoolProperty( default=False, name="Export", options={"HIDDEN"}, description="This object will be export when true" ) - bselect = BoolProperty( + bselect: BoolProperty( default=False, name="Select", options={"HIDDEN"}, description="Make sure you have Mesh is parent to Armature" ) - otype = StringProperty( + otype: StringProperty( name="Type", description="This will be ignore when exported" ) @@ -2365,21 +2365,21 @@ class UL_UDKMeshList(UIList): class UDKArmListPG(PropertyGroup): - bool = BoolProperty(default=False) - string = StringProperty() - bexport = BoolProperty( + bool: BoolProperty(default=False) + string: StringProperty() + bexport: BoolProperty( default=False, name="Export", options={"HIDDEN"}, description="This will be ignore when exported" ) - bselect = BoolProperty( + bselect: BoolProperty( default=False, name="Select", options={"HIDDEN"}, description="This will be ignore when exported" ) - otype = StringProperty( + otype: StringProperty( name="Type", description="This will be ignore when exported" ) @@ -2547,7 +2547,7 @@ class OBJECT_OT_UDKObjUpdate(Operator): bl_idname = "object.selobjectpdate" bl_label = "Update Object(s)" - actionname = bpy.props.StringProperty() + actionname: bpy.props.StringProperty() def execute(self, context): udkupdateobjects() @@ -2646,7 +2646,7 @@ class OBJECT_OT_ActionSetAnimUpdate(Operator): bl_idname = "action.setanimupdate" bl_label = "Update Action Set(s)" - actionname = bpy.props.StringProperty() + actionname: bpy.props.StringProperty() def execute(self, context): my_sett = bpy.context.scene.udkas_list @@ -2737,20 +2737,20 @@ class ExportUDKAnimData(Operator): # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', ) - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.psk;*.psa", options={'HIDDEN'}, ) - udk_option_scale = FloatProperty( + udk_option_scale: FloatProperty( name="UDK Scale", description="In case you don't want to scale objects manually - " "This will just scale position when on export for the skeleton mesh and animation data", default=1 ) - udk_option_rebuildobjects = BoolProperty( + udk_option_rebuildobjects: BoolProperty( name="Rebuild Objects", description="In case of deform skeleton mesh and animations data - " "This will rebuild objects from raw format on export when checked", @@ -2843,7 +2843,7 @@ class PskAddonPreferences(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="File I/O", diff --git a/io_import_gimp_image_to_scene.py b/io_import_gimp_image_to_scene.py index 94d496e33f25491d3d30e4196114354e53d0d409..a79a5844a8169e924aeb0c04ade41c1b4849bf70 100644 --- a/io_import_gimp_image_to_scene.py +++ b/io_import_gimp_image_to_scene.py @@ -554,31 +554,31 @@ class GIMPImageToScene(bpy.types.Operator): bl_description = "Imports GIMP multilayer image files into 3D Scenes" bl_options = {'REGISTER', 'UNDO'} - filename = StringProperty(name="File Name", + filename: StringProperty(name="File Name", description="Name of the file") - directory = StringProperty(name="Directory", + directory: StringProperty(name="Directory", description="Directory of the file") - LayerViewers = BoolProperty(name="Layer Viewers", + LayerViewers: BoolProperty(name="Layer Viewers", description="Add Viewer nodes to each Render Layer node", default=True) - MixerViewers = BoolProperty(name="Mixer Viewers", + MixerViewers: BoolProperty(name="Mixer Viewers", description="Add Viewer nodes to each Mix node", default=True) - AlphaMode = EnumProperty(name="Alpha Mode", + AlphaMode: EnumProperty(name="Alpha Mode", description="Representation of alpha information in the RGBA pixels", items=( ('STRAIGHT', 'Texture Alpha Factor', 'Transparent RGB and alpha pixels are unmodified'), ('PREMUL', 'Material Alpha Value', 'Transparent RGB pixels are multiplied by the alpha channel')), default='STRAIGHT') - ShadelessMats = BoolProperty(name="Shadeless Material", + ShadelessMats: BoolProperty(name="Shadeless Material", description="Set Materials as Shadeless", default=True) - OpacityMode = EnumProperty(name="Opacity Mode", + OpacityMode: EnumProperty(name="Opacity Mode", description="Layer Opacity management", items=( ('TEX', 'Texture Alpha Factor', ''), @@ -587,24 +587,24 @@ class GIMPImageToScene(bpy.types.Operator): ('BAKE', 'Baked in Image Alpha', '')), default='TEX') - SetCamera = BoolProperty(name="Set Camera", + SetCamera: BoolProperty(name="Set Camera", description="Create an Ortho Camera matching image resolution", default=True) - SetupCompo = BoolProperty(name="Setup Node Compositing", + SetupCompo: BoolProperty(name="Setup Node Compositing", description="Create a compositing node setup (will delete existing nodes)", default=False) - GroupUntagged = BoolProperty(name="Group Untagged", + GroupUntagged: BoolProperty(name="Group Untagged", description="Layers with no tag go to a single Render Layer", default=False) - LayerOffset = FloatProperty(name="Layer Separation", + LayerOffset: FloatProperty(name="Layer Separation", description="Distance between each 3D Layer in the Z axis", min=0, default=0.50) - LayerScale = FloatProperty(name="Layer Scale", + LayerScale: FloatProperty(name="Layer Scale", description="Scale pixel resolution by Blender units", min=0, default=0.01) diff --git a/io_import_scene_lwo.py b/io_import_scene_lwo.py index be5f55aa9521a87f6e6e83d45fe672efa01ad276..141093665ddc732702ae40b2aa22306d99a9d217 100644 --- a/io_import_scene_lwo.py +++ b/io_import_scene_lwo.py @@ -1222,12 +1222,12 @@ class IMPORT_OT_lwo(bpy.types.Operator): bl_description= "Import a LightWave Object file" bl_options= {'REGISTER', 'UNDO'} - filepath= StringProperty(name="File Path", description="Filepath used for importing the LWO file", maxlen=1024, default="") + filepath: StringProperty(name="File Path", description="Filepath used for importing the LWO file", maxlen=1024, default="") - ADD_SUBD_MOD= BoolProperty(name="Apply SubD Modifier", description="Apply the Subdivision Surface modifier to layers with Subpatches", default=True) - LOAD_HIDDEN= BoolProperty(name="Load Hidden Layers", description="Load object layers that have been marked as hidden", default=False) - SKEL_TO_ARM= BoolProperty(name="Create Armature", description="Create an armature from an embedded Skelegon rig", default=True) - USE_EXISTING_MATERIALS= BoolProperty(name="Use Existing Materials", description="Use existing materials if a material by that name already exists", default=False) + ADD_SUBD_MOD: BoolProperty(name="Apply SubD Modifier", description="Apply the Subdivision Surface modifier to layers with Subpatches", default=True) + LOAD_HIDDEN: BoolProperty(name="Load Hidden Layers", description="Load object layers that have been marked as hidden", default=False) + SKEL_TO_ARM: BoolProperty(name="Create Armature", description="Create an armature from an embedded Skelegon rig", default=True) + USE_EXISTING_MATERIALS: BoolProperty(name="Use Existing Materials", description="Use existing materials if a material by that name already exists", default=False) def execute(self, context): load_lwo(self.filepath, diff --git a/io_import_scene_unreal_psa_psk.py b/io_import_scene_unreal_psa_psk.py index d6896f6dd21d1082f2ddb1d80899a60f21335c5b..daea302eae8130125cef8a9f634243c6e0504936 100644 --- a/io_import_scene_unreal_psa_psk.py +++ b/io_import_scene_unreal_psa_psk.py @@ -1044,10 +1044,10 @@ class IMPORT_OT_psa(bpy.types.Operator): bl_space_type = "PROPERTIES" bl_region_type = "WINDOW" - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', ) - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.psa", options={'HIDDEN'}, ) diff --git a/io_mesh_pdb/__init__.py b/io_mesh_pdb/__init__.py index 4e731cf51e9c1e56af8dde45ef106cce2a1a3e8b..051936046b2c6b7938b79739bead7d7e0ee95f70 100644 --- a/io_mesh_pdb/__init__.py +++ b/io_mesh_pdb/__init__.py @@ -74,87 +74,87 @@ class ImportPDB(Operator, ImportHelper): bl_options = {'PRESET', 'UNDO'} filename_ext = ".pdb" - filter_glob = StringProperty(default="*.pdb", options={'HIDDEN'},) + filter_glob: StringProperty(default="*.pdb", options={'HIDDEN'},) - use_center = BoolProperty( + use_center: BoolProperty( name = "Object to origin", default=True, description = "Put the object into the global origin") - use_camera = BoolProperty( + use_camera: BoolProperty( name="Camera", default=False, description="Do you need a camera?") - use_light = BoolProperty( + use_light: BoolProperty( name="Lamp", default=False, description = "Do you need a lamp?") - ball = EnumProperty( + ball: EnumProperty( name="Type of ball", description="Choose ball", items=(('0', "NURBS", "NURBS balls"), ('1', "Mesh" , "Mesh balls"), ('2', "Meta" , "Metaballs")), default='0',) - mesh_azimuth = IntProperty( + mesh_azimuth: IntProperty( name = "Azimuth", default=32, min=1, description = "Number of sectors (azimuth)") - mesh_zenith = IntProperty( + mesh_zenith: IntProperty( name = "Zenith", default=32, min=1, description = "Number of sectors (zenith)") - scale_ballradius = FloatProperty( + scale_ballradius: FloatProperty( name = "Balls", default=1.0, min=0.0001, description = "Scale factor for all atom radii") - scale_distances = FloatProperty ( + scale_distances: FloatProperty ( name = "Distances", default=1.0, min=0.0001, description = "Scale factor for all distances") - atomradius = EnumProperty( + atomradius: EnumProperty( name="Type", description="Choose type of atom radius", items=(('0', "Pre-defined", "Use pre-defined radius"), ('1', "Atomic", "Use atomic radius"), ('2', "van der Waals", "Use van der Waals radius")), default='0',) - use_sticks = BoolProperty( + use_sticks: BoolProperty( name="Use sticks", default=True, description="Do you want to display the sticks?") - use_sticks_type = EnumProperty( + use_sticks_type: EnumProperty( name="Type", description="Choose type of stick", items=(('0', "Dupliverts", "Use dupliverts structures"), ('1', "Skin", "Use skin and subdivision modifier"), ('2', "Normal", "Use simple cylinders")), default='0',) - sticks_subdiv_view = IntProperty( + sticks_subdiv_view: IntProperty( name = "SubDivV", default=2, min=1, description="Number of subdivisions (view)") - sticks_subdiv_render = IntProperty( + sticks_subdiv_render: IntProperty( name = "SubDivR", default=2, min=1, description="Number of subdivisions (render)") - sticks_sectors = IntProperty( + sticks_sectors: IntProperty( name = "Sector", default=20, min=1, description="Number of sectors of a stick") - sticks_radius = FloatProperty( + sticks_radius: FloatProperty( name = "Radius", default=0.2, min=0.0001, description ="Radius of a stick") - sticks_unit_length = FloatProperty( + sticks_unit_length: FloatProperty( name = "Unit", default=0.05, min=0.0001, description = "Length of the unit of a stick in Angstrom") - use_sticks_color = BoolProperty( + use_sticks_color: BoolProperty( name="Color", default=True, description="The sticks appear in the color of the atoms") - use_sticks_smooth = BoolProperty( + use_sticks_smooth: BoolProperty( name="Smooth", default=True, description="The sticks are round (sectors are not visible)") - use_sticks_bonds = BoolProperty( + use_sticks_bonds: BoolProperty( name="Bonds", default=False, description="Show double and triple bonds") - sticks_dist = FloatProperty( + sticks_dist: FloatProperty( name="", default = 1.1, min=1.0, max=3.0, description="Distance between sticks measured in stick diameter") - use_sticks_one_object = BoolProperty( + use_sticks_one_object: BoolProperty( name="One object", default=True, description="All sticks are one object") - use_sticks_one_object_nr = IntProperty( + use_sticks_one_object_nr: IntProperty( name = "No.", default=200, min=10, description="Number of sticks to be grouped at once") - datafile = StringProperty( + datafile: StringProperty( name = "", description="Path to your custom data file", maxlen = 256, default = "", subtype='FILE_PATH') @@ -268,10 +268,10 @@ class ExportPDB(Operator, ExportHelper): bl_label = "Export Protein Data Bank(*.pdb)" filename_ext = ".pdb" - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.pdb", options={'HIDDEN'},) - atom_pdb_export_type = EnumProperty( + atom_pdb_export_type: EnumProperty( name="Type of Objects", description="Choose type of objects", items=(('0', "All", "Export all active objects"), diff --git a/io_mesh_raw/__init__.py b/io_mesh_raw/__init__.py index 5ad4c6f5f319b41c0557b97c108560bc0c8d6c7e..9219efa2f0e8b7d6e371a0ab886144ec5ee4d761 100644 --- a/io_mesh_raw/__init__.py +++ b/io_mesh_raw/__init__.py @@ -51,10 +51,10 @@ class RawImporter(bpy.types.Operator): bl_label = "Import RAW" bl_options = {'UNDO'} - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', ) - filter_glob = StringProperty(default="*.raw", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.raw", options={'HIDDEN'}) def execute(self, context): from . import import_raw @@ -73,14 +73,14 @@ class RawExporter(bpy.types.Operator, ExportHelper): bl_label = "Export RAW" filename_ext = ".raw" - filter_glob = StringProperty(default="*.raw", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.raw", options={'HIDDEN'}) - apply_modifiers = BoolProperty( + apply_modifiers: BoolProperty( name="Apply Modifiers", description="Use transformed mesh data from each object", default=True, ) - triangulate = BoolProperty( + triangulate: BoolProperty( name="Triangulate", description="Triangulate quads", default=True, diff --git a/io_online_sketchfab/__init__.py b/io_online_sketchfab/__init__.py index fa1cefdddc6a2709f3251d267080922ca6f5e291..222be11321e3d57cc88e42b1e60263f31a3325b0 100644 --- a/io_online_sketchfab/__init__.py +++ b/io_online_sketchfab/__init__.py @@ -340,16 +340,16 @@ class VIEW3D_PT_sketchfab(Panel): # property group containing all properties for the user interface class SketchfabProps(PropertyGroup): - description = StringProperty( + description: StringProperty( name="Description", description="Description of the model (optional)", default="") - filepath = StringProperty( + filepath: StringProperty( name="Filepath", description="internal use", default="", ) - lamps = EnumProperty( + lamps: EnumProperty( name="Lamps", items=(('ALL', "All", "Export all lamps in the file"), ('NONE', "None", "Don't export any lamps"), @@ -357,35 +357,35 @@ class SketchfabProps(PropertyGroup): description="Determines which lamps are exported", default='ALL', ) - models = EnumProperty( + models: EnumProperty( name="Models", items=(('ALL', "All", "Export all meshes in the file"), ('SELECTION', "Selection", "Only export selected meshes")), description="Determines which meshes are exported", default='SELECTION', ) - private = BoolProperty( + private: BoolProperty( name="Private", description="Upload as private (requires a pro account)", default=False, ) - password = StringProperty( + password: StringProperty( name="Password", description="Password-protect your model (requires a pro account)", default="", subtype="PASSWORD" ) - tags = StringProperty( + tags: StringProperty( name="Tags", description="List of tags, separated by spaces (optional)", default="", ) - title = StringProperty( + title: StringProperty( name="Title", description="Title of the model (determined automatically if left empty)", default="", ) - token = StringProperty( + token: StringProperty( name="Api Key", description="You can find this on your dashboard at the Sketchfab website", default="", @@ -398,7 +398,7 @@ class SketchfabEmailToken(Operator): bl_idname = "wm.sketchfab_email_token" bl_label = "Enter your email to get a sketchfab token" - email = StringProperty( + email: StringProperty( name="Email", default="you@example.com", ) @@ -463,7 +463,7 @@ class SfabAddonPreferences(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="File I/O", diff --git a/io_scene_3ds/__init__.py b/io_scene_3ds/__init__.py index 4daa4c29bd55e58a3db2ab10faeb08ab3e1b6078..b2ea526e2e39ab0533c5f463ff094c54814cb304 100644 --- a/io_scene_3ds/__init__.py +++ b/io_scene_3ds/__init__.py @@ -63,9 +63,9 @@ class Import3DS(bpy.types.Operator, ImportHelper): bl_options = {'UNDO'} filename_ext = ".3ds" - filter_glob = StringProperty(default="*.3ds", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.3ds", options={'HIDDEN'}) - constrain_size = FloatProperty( + constrain_size: FloatProperty( name="Size Constraint", description="Scale the model by 10 until it reaches the " "size constraint (0 to disable)", @@ -73,13 +73,13 @@ class Import3DS(bpy.types.Operator, ImportHelper): soft_min=0.0, soft_max=1000.0, default=10.0, ) - use_image_search = BoolProperty( + use_image_search: BoolProperty( name="Image Search", description="Search subdirectories for any associated images " "(Warning, may be slow)", default=True, ) - use_apply_transform = BoolProperty( + use_apply_transform: BoolProperty( name="Apply Transform", description="Workaround for object transformations " "importing incorrectly", @@ -109,12 +109,12 @@ class Export3DS(bpy.types.Operator, ExportHelper): bl_label = 'Export 3DS' filename_ext = ".3ds" - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.3ds", options={'HIDDEN'}, ) - use_selection = BoolProperty( + use_selection: BoolProperty( name="Selection Only", description="Export selected objects only", default=False, diff --git a/io_scene_ms3d/ms3d_ui.py b/io_scene_ms3d/ms3d_ui.py index c483df8a0e6c0cd9c27ebc77384f59b55838ce2b..c6db5d508d5f1e966f0bf60934b08d71ddbb229e 100644 --- a/io_scene_ms3d/ms3d_ui.py +++ b/io_scene_ms3d/ms3d_ui.py @@ -267,12 +267,12 @@ class Ms3dImportOperator(Operator, ImportHelper): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', options={'HIDDEN', } ) - verbose = EnumProperty( + verbose: EnumProperty( name=ms3d_str['PROP_NAME_VERBOSE'], description=ms3d_str['PROP_DESC_VERBOSE'], items=( (Ms3dUi.VERBOSE_MODE_NONE, @@ -291,13 +291,13 @@ class Ms3dImportOperator(Operator, ImportHelper): default=Ms3dUi.PROP_DEFAULT_VERBOSE, ) - use_animation = BoolProperty( + use_animation: BoolProperty( name=ms3d_str['PROP_NAME_USE_ANIMATION'], description=ms3d_str['PROP_DESC_USE_ANIMATION'], default=Ms3dUi.PROP_DEFAULT_USE_ANIMATION, ) - rotation_mode = EnumProperty( + rotation_mode: EnumProperty( name=ms3d_str['PROP_NAME_ROTATION_MODE'], description=ms3d_str['PROP_DESC_ROTATION_MODE'], items=( (Ms3dUi.PROP_ITEM_ROTATION_MODE_EULER, @@ -310,13 +310,13 @@ class Ms3dImportOperator(Operator, ImportHelper): default=Ms3dUi.PROP_DEFAULT_ANIMATION_ROTATION, ) - use_joint_size = BoolProperty( + use_joint_size: BoolProperty( name=ms3d_str['PROP_NAME_USE_JOINT_SIZE'], description=ms3d_str['PROP_DESC_USE_JOINT_SIZE'], default=Ms3dUi.PROP_DEFAULT_USE_JOINT_SIZE, ) - joint_size = FloatProperty( + joint_size: FloatProperty( name=ms3d_str['PROP_NAME_IMPORT_JOINT_SIZE'], description=ms3d_str['PROP_DESC_IMPORT_JOINT_SIZE'], min=Ms3dUi.PROP_JOINT_SIZE_MIN, max=Ms3dUi.PROP_JOINT_SIZE_MAX, @@ -327,24 +327,24 @@ class Ms3dImportOperator(Operator, ImportHelper): #options={'HIDDEN', }, ) - use_joint_to_bones = BoolProperty( + use_joint_to_bones: BoolProperty( name=ms3d_str['PROP_NAME_JOINT_TO_BONES'], description=ms3d_str['PROP_DESC_JOINT_TO_BONES'], default=Ms3dUi.PROP_DEFAULT_JOINT_TO_BONES, ) - use_extended_normal_handling = BoolProperty( + use_extended_normal_handling: BoolProperty( name=ms3d_str['PROP_NAME_EXTENDED_NORMAL_HANDLING'], description=ms3d_str['PROP_DESC_EXTENDED_NORMAL_HANDLING'], default=Ms3dUi.PROP_DEFAULT_EXTENDED_NORMAL_HANDLING, ) - filename_ext = StringProperty( + filename_ext: StringProperty( default=ms3d_str['FILE_EXT'], options={'HIDDEN', } ) - filter_glob = StringProperty( + filter_glob: StringProperty( default=ms3d_str['FILE_FILTER'], options={'HIDDEN', } ) @@ -434,12 +434,12 @@ class Ms3dExportOperator(Operator, ExportHelper): bl_space_type = 'PROPERTIES' bl_region_type = 'WINDOW' - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', options={'HIDDEN', } ) - verbose = EnumProperty( + verbose: EnumProperty( name=ms3d_str['PROP_NAME_VERBOSE'], description=ms3d_str['PROP_DESC_VERBOSE'], items=( (Ms3dUi.VERBOSE_MODE_NONE, @@ -458,31 +458,31 @@ class Ms3dExportOperator(Operator, ExportHelper): default=Ms3dUi.PROP_DEFAULT_VERBOSE, ) - use_blender_names = BoolProperty( + use_blender_names: BoolProperty( name=ms3d_str['PROP_NAME_USE_BLENDER_NAMES'], description=ms3d_str['PROP_DESC_USE_BLENDER_NAMES'], default=Ms3dUi.PROP_DEFAULT_USE_BLENDER_NAMES, ) - use_blender_materials = BoolProperty( + use_blender_materials: BoolProperty( name=ms3d_str['PROP_NAME_USE_BLENDER_MATERIALS'], description=ms3d_str['PROP_DESC_USE_BLENDER_MATERIALS'], default=Ms3dUi.PROP_DEFAULT_USE_BLENDER_MATERIALS, ) - apply_transform = BoolProperty( + apply_transform: BoolProperty( name=ms3d_str['PROP_NAME_APPLY_TRANSFORM'], description=ms3d_str['PROP_DESC_APPLY_TRANSFORM'], default=Ms3dUi.PROP_DEFAULT_APPLY_TRANSFORM, ) - apply_modifiers = BoolProperty( + apply_modifiers: BoolProperty( name=ms3d_str['PROP_NAME_APPLY_MODIFIERS'], description=ms3d_str['PROP_DESC_APPLY_MODIFIERS'], default=Ms3dUi.PROP_DEFAULT_APPLY_MODIFIERS, ) - apply_modifiers_mode = EnumProperty( + apply_modifiers_mode: EnumProperty( name=ms3d_str['PROP_NAME_APPLY_MODIFIERS_MODE'], description=ms3d_str['PROP_DESC_APPLY_MODIFIERS_MODE'], items=( (Ms3dUi.PROP_ITEM_APPLY_MODIFIERS_MODE_VIEW, @@ -495,41 +495,41 @@ class Ms3dExportOperator(Operator, ExportHelper): default=Ms3dUi.PROP_DEFAULT_APPLY_MODIFIERS_MODE, ) - use_animation = BoolProperty( + use_animation: BoolProperty( name=ms3d_str['PROP_NAME_USE_ANIMATION'], description=ms3d_str['PROP_DESC_USE_ANIMATION'], default=Ms3dUi.PROP_DEFAULT_USE_ANIMATION, ) - normalize_weights = BoolProperty( + normalize_weights: BoolProperty( name=ms3d_str['PROP_NAME_NORMALIZE_WEIGHTS'], description=ms3d_str['PROP_DESC_NORMALIZE_WEIGHTS'], default=Ms3dUi.PROP_DEFAULT_NORMALIZE_WEIGHTS, ) - shrink_to_keys = BoolProperty( + shrink_to_keys: BoolProperty( name=ms3d_str['PROP_NAME_SHRINK_TO_KEYS'], description=ms3d_str['PROP_DESC_SHRINK_TO_KEYS'], default=Ms3dUi.PROP_DEFAULT_SHRINK_TO_KEYS, ) - bake_each_frame = BoolProperty( + bake_each_frame: BoolProperty( name=ms3d_str['PROP_NAME_BAKE_EACH_FRAME'], description=ms3d_str['PROP_DESC_BAKE_EACH_FRAME'], default=Ms3dUi.PROP_DEFAULT_BAKE_EACH_FRAME, ) - check_existing = BoolProperty( + check_existing: BoolProperty( default=False, options={'HIDDEN', } ) - filename_ext = StringProperty( + filename_ext: StringProperty( default=ms3d_str['FILE_EXT'], options={'HIDDEN', } ) - filter_glob = StringProperty( + filter_glob: StringProperty( default=ms3d_str['FILE_FILTER'], options={'HIDDEN', } ) @@ -646,7 +646,7 @@ class Ms3dSetSmoothingGroupOperator(Operator): bl_label = ms3d_str['BL_LABEL_SMOOTHING_GROUP_OPERATOR'] bl_options = {'UNDO', 'INTERNAL', } - smoothing_group_index = IntProperty( + smoothing_group_index: IntProperty( name=ms3d_str['PROP_SMOOTHING_GROUP_INDEX'], options={'HIDDEN', 'SKIP_SAVE', }, ) @@ -722,7 +722,7 @@ class Ms3dGroupOperator(Operator): bl_label = ms3d_str['BL_LABEL_GROUP_OPERATOR'] bl_options = {'UNDO', 'INTERNAL', } - mode = EnumProperty( + mode: EnumProperty( items=( ('', "", ""), ('ADD_GROUP', ms3d_str['ENUM_ADD_GROUP_1'], @@ -813,7 +813,7 @@ class Ms3dMaterialOperator(Operator): bl_label = ms3d_str['BL_LABEL_MATERIAL_OPERATOR'] bl_options = {'UNDO', 'INTERNAL', } - mode = EnumProperty( + mode: EnumProperty( items=( ('', "", ""), ('FROM_BLENDER', ms3d_str['ENUM_FROM_BLENDER_1'], @@ -858,14 +858,14 @@ class Ms3dMaterialOperator(Operator): ############################################################################### class Ms3dGroupProperties(PropertyGroup): - name = StringProperty( + name: StringProperty( name=ms3d_str['PROP_NAME_NAME'], description=ms3d_str['PROP_DESC_GROUP_NAME'], default="", #options={'HIDDEN', }, ) - flags = EnumProperty( + flags: EnumProperty( name=ms3d_str['PROP_NAME_FLAGS'], description=ms3d_str['PROP_DESC_FLAGS_GROUP'], items=(#(Ms3dUi.FLAG_NONE, ms3d_str['ENUM_FLAG_NONE_1'], @@ -904,25 +904,25 @@ class Ms3dGroupProperties(PropertyGroup): options={'ENUM_FLAG', 'ANIMATABLE', }, ) - comment = StringProperty( + comment: StringProperty( name=ms3d_str['PROP_NAME_COMMENT'], description=ms3d_str['PROP_DESC_COMMENT_GROUP'], default="", #options={'HIDDEN', }, ) - id = IntProperty(options={'HIDDEN', },) + id: IntProperty(options={'HIDDEN', },) class Ms3dModelProperties(PropertyGroup): - name = StringProperty( + name: StringProperty( name=ms3d_str['PROP_NAME_NAME'], description=ms3d_str['PROP_DESC_NAME_MODEL'], default="", #options={'HIDDEN', }, ) - joint_size = FloatProperty( + joint_size: FloatProperty( name=ms3d_str['PROP_NAME_JOINT_SIZE'], description=ms3d_str['PROP_DESC_JOINT_SIZE'], min=Ms3dUi.PROP_JOINT_SIZE_MIN, max=Ms3dUi.PROP_JOINT_SIZE_MAX, @@ -933,7 +933,7 @@ class Ms3dModelProperties(PropertyGroup): #options={'HIDDEN', }, ) - transparency_mode = EnumProperty( + transparency_mode: EnumProperty( name=ms3d_str['PROP_NAME_TRANSPARENCY_MODE'], description=ms3d_str['PROP_DESC_TRANSPARENCY_MODE'], items=( (Ms3dUi.MODE_TRANSPARENCY_SIMPLE, @@ -954,7 +954,7 @@ class Ms3dModelProperties(PropertyGroup): #options={'HIDDEN', }, ) - alpha_ref = FloatProperty( + alpha_ref: FloatProperty( name=ms3d_str['PROP_NAME_ALPHA_REF'], description=ms3d_str['PROP_DESC_ALPHA_REF'], min=0, max=1, precision=3, step=0.1, @@ -963,7 +963,7 @@ class Ms3dModelProperties(PropertyGroup): #options={'HIDDEN', }, ) - comment = StringProperty( + comment: StringProperty( name=ms3d_str['PROP_NAME_COMMENT'], description=ms3d_str['PROP_DESC_COMMENT_MODEL'], default="", @@ -973,7 +973,7 @@ class Ms3dModelProperties(PropertyGroup): ########################## # ms3d group handling # - apply_mode = EnumProperty( + apply_mode: EnumProperty( items=( ('ASSIGN', ms3d_str['ENUM_ASSIGN_1'], ms3d_str['ENUM_ASSIGN_2_SMOOTHING_GROUP']), @@ -988,7 +988,7 @@ class Ms3dModelProperties(PropertyGroup): options={'HIDDEN', 'SKIP_SAVE', }, ) - selected_group_index = IntProperty( + selected_group_index: IntProperty( default=-1, min=-1, options={'HIDDEN', 'SKIP_SAVE', }, @@ -997,7 +997,7 @@ class Ms3dModelProperties(PropertyGroup): # ms3d group handling ########################## - groups = CollectionProperty( + groups: CollectionProperty( type=Ms3dGroupProperties, #options={'HIDDEN', }, ) @@ -1025,7 +1025,7 @@ class Ms3dModelProperties(PropertyGroup): class Ms3dArmatureProperties(PropertyGroup): - name = StringProperty( + name: StringProperty( name=ms3d_str['PROP_NAME_NAME'], description=ms3d_str['PROP_DESC_NAME_ARMATURE'], default="", @@ -1034,14 +1034,14 @@ class Ms3dArmatureProperties(PropertyGroup): class Ms3dJointProperties(PropertyGroup): - name = StringProperty( + name: StringProperty( name=ms3d_str['PROP_NAME_NAME'], description=ms3d_str['PROP_DESC_NAME_JOINT'], default="", #options={'HIDDEN', }, ) - flags = EnumProperty( + flags: EnumProperty( name=ms3d_str['PROP_NAME_FLAGS'], description=ms3d_str['PROP_DESC_FLAGS_JOINT'], items=(#(Ms3dUi.FLAG_NONE, @@ -1081,7 +1081,7 @@ class Ms3dJointProperties(PropertyGroup): options={'ENUM_FLAG', 'ANIMATABLE', }, ) - color = FloatVectorProperty( + color: FloatVectorProperty( name=ms3d_str['PROP_NAME_COLOR'], description=ms3d_str['PROP_DESC_COLOR_JOINT'], subtype='COLOR', size=3, min=0, max=1, precision=3, step=0.1, @@ -1089,7 +1089,7 @@ class Ms3dJointProperties(PropertyGroup): #options={'HIDDEN', }, ) - comment = StringProperty( + comment: StringProperty( name=ms3d_str['PROP_NAME_COMMENT'], description=ms3d_str['PROP_DESC_COMMENT_JOINT'], default="", @@ -1185,14 +1185,14 @@ class Ms3dMaterialHelper: class Ms3dMaterialProperties(PropertyGroup): - name = StringProperty( + name: StringProperty( name=ms3d_str['PROP_NAME_NAME'], description=ms3d_str['PROP_DESC_NAME_MATERIAL'], default="", #options={'HIDDEN', }, ) - ambient = FloatVectorProperty( + ambient: FloatVectorProperty( name=ms3d_str['PROP_NAME_AMBIENT'], description=ms3d_str['PROP_DESC_AMBIENT'], subtype='COLOR', size=4, min=0, max=1, precision=3, step=0.1, @@ -1201,7 +1201,7 @@ class Ms3dMaterialProperties(PropertyGroup): #options={'HIDDEN', }, ) - diffuse = FloatVectorProperty( + diffuse: FloatVectorProperty( name=ms3d_str['PROP_NAME_DIFFUSE'], description=ms3d_str['PROP_DESC_DIFFUSE'], subtype='COLOR', size=4, min=0, max=1, precision=3, step=0.1, @@ -1210,7 +1210,7 @@ class Ms3dMaterialProperties(PropertyGroup): #options={'HIDDEN', }, ) - specular = FloatVectorProperty( + specular: FloatVectorProperty( name=ms3d_str['PROP_NAME_SPECULAR'], description=ms3d_str['PROP_DESC_SPECULAR'], subtype='COLOR', size=4, min=0, max=1, precision=3, step=0.1, @@ -1219,7 +1219,7 @@ class Ms3dMaterialProperties(PropertyGroup): #options={'HIDDEN', }, ) - emissive = FloatVectorProperty( + emissive: FloatVectorProperty( name=ms3d_str['PROP_NAME_EMISSIVE'], description=ms3d_str['PROP_DESC_EMISSIVE'], subtype='COLOR', size=4, min=0, max=1, precision=3, step=0.1, @@ -1228,7 +1228,7 @@ class Ms3dMaterialProperties(PropertyGroup): #options={'HIDDEN', }, ) - shininess = FloatProperty( + shininess: FloatProperty( name=ms3d_str['PROP_NAME_SHININESS'], description=ms3d_str['PROP_DESC_SHININESS'], min=0, max=Ms3dSpec.MAX_MATERIAL_SHININESS, precision=3, step=0.1, @@ -1238,7 +1238,7 @@ class Ms3dMaterialProperties(PropertyGroup): #options={'HIDDEN', }, ) - transparency = FloatProperty( + transparency: FloatProperty( name=ms3d_str['PROP_NAME_TRANSPARENCY'], description=ms3d_str['PROP_DESC_TRANSPARENCY'], min=0, max=1, precision=3, step=0.1, @@ -1248,7 +1248,7 @@ class Ms3dMaterialProperties(PropertyGroup): #options={'HIDDEN', }, ) - mode = EnumProperty( + mode: EnumProperty( name=ms3d_str['PROP_NAME_MODE'], description=ms3d_str['PROP_DESC_MODE_TEXTURE'], items=( (Ms3dUi.FLAG_TEXTURE_COMBINE_ALPHA, @@ -1269,7 +1269,7 @@ class Ms3dMaterialProperties(PropertyGroup): options={'ANIMATABLE', 'ENUM_FLAG', }, ) - texture = StringProperty( + texture: StringProperty( name=ms3d_str['PROP_NAME_TEXTURE'], description=ms3d_str['PROP_DESC_TEXTURE'], default="", @@ -1277,7 +1277,7 @@ class Ms3dMaterialProperties(PropertyGroup): #options={'HIDDEN', }, ) - alphamap = StringProperty( + alphamap: StringProperty( name=ms3d_str['PROP_NAME_ALPHAMAP'], description=ms3d_str['PROP_DESC_ALPHAMAP'], default="", @@ -1285,7 +1285,7 @@ class Ms3dMaterialProperties(PropertyGroup): #options={'HIDDEN', }, ) - comment = StringProperty( + comment: StringProperty( name=ms3d_str['PROP_NAME_COMMENT'], description=ms3d_str['PROP_DESC_COMMENT_MATERIAL'], default="", diff --git a/io_scene_vrml2/__init__.py b/io_scene_vrml2/__init__.py index 4a420f7046c2e73625c113657668b7546d40297f..e6d80db900d3fa8d943c5931370b9eef591ed3de 100644 --- a/io_scene_vrml2/__init__.py +++ b/io_scene_vrml2/__init__.py @@ -60,37 +60,37 @@ class ExportVRML(bpy.types.Operator, ExportHelper): bl_label = "Export VRML2" filename_ext = ".wrl" - filter_glob = StringProperty(default="*.wrl", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.wrl", options={'HIDDEN'}) - use_selection = BoolProperty( + use_selection: BoolProperty( name="Selection Only", description="Export selected objects only", default=False, ) - use_mesh_modifiers = BoolProperty( + use_mesh_modifiers: BoolProperty( name="Apply Modifiers", description="Apply Modifiers to the exported mesh", default=True, ) - use_color = BoolProperty( + use_color: BoolProperty( name="Vertex Colors", description="Export the active vertex color layer", default=True, ) - color_type = EnumProperty( + color_type: EnumProperty( name='Color', items=( ('VERTEX', "Vertex Color", ""), ('MATERIAL', "Material Color", "")), ) - use_uv = BoolProperty( + use_uv: BoolProperty( name="Texture/UVs", description="Export the active texture and UV coords", default=True, ) - global_scale = FloatProperty( + global_scale: FloatProperty( name="Scale", min=0.01, max=1000.0, default=1.0, diff --git a/io_scene_x/__init__.py b/io_scene_x/__init__.py index 404d9dc2cf19c118b9ac8df946d9b1337028fc88..c8e2bc732ac49ff2c7095106a404d58ec40c256b 100644 --- a/io_scene_x/__init__.py +++ b/io_scene_x/__init__.py @@ -43,112 +43,112 @@ class ExportDirectX(bpy.types.Operator): bl_idname = "export_scene.x" bl_label = "Export DirectX" - filepath = StringProperty(subtype='FILE_PATH') + filepath: StringProperty(subtype='FILE_PATH') # Export options - SelectedOnly = BoolProperty( + SelectedOnly: BoolProperty( name="Export Selected Objects Only", description="Export only selected objects", default=True) - CoordinateSystem = EnumProperty( + CoordinateSystem: EnumProperty( name="Coordinate System", description="Use the selected coordinate system for export", items=(('LEFT_HANDED', "Left-Handed", "Use a Y up, Z forward system or a Z up, -Y forward system"), ('RIGHT_HANDED', "Right-Handed", "Use a Y up, -Z forward system or a Z up, Y forward system")), default='LEFT_HANDED') - UpAxis = EnumProperty( + UpAxis: EnumProperty( name="Up Axis", description="The selected axis points upward", items=(('Y', "Y", "The Y axis points up"), ('Z', "Z", "The Z axis points up")), default='Y') - ExportMeshes = BoolProperty( + ExportMeshes: BoolProperty( name="Export Meshes", description="Export mesh objects", default=True) - ExportNormals = BoolProperty( + ExportNormals: BoolProperty( name=" Export Normals", description="Export mesh normals", default=True) - FlipNormals = BoolProperty( + FlipNormals: BoolProperty( name=" Flip Normals", description="Flip mesh normals before export", default=False) - ExportUVCoordinates = BoolProperty( + ExportUVCoordinates: BoolProperty( name=" Export UV Coordinates", description="Export mesh UV coordinates, if any", default=True) - ExportMaterials = BoolProperty( + ExportMaterials: BoolProperty( name=" Export Materials", description="Export material properties and reference image textures", default=True) - ExportActiveImageMaterials = BoolProperty( + ExportActiveImageMaterials: BoolProperty( name=" Reference Active Images as Textures", description="Reference the active image of each face as a texture, "\ "as opposed to the image assigned to the material", default=False) - ExportVertexColors = BoolProperty( + ExportVertexColors: BoolProperty( name=" Export Vertex Colors", description="Export mesh vertex colors, if any", default=False) - ExportSkinWeights = BoolProperty( + ExportSkinWeights: BoolProperty( name=" Export Skin Weights", description="Bind mesh vertices to armature bones", default=False) - ApplyModifiers = BoolProperty( + ApplyModifiers: BoolProperty( name=" Apply Modifiers", description="Apply the effects of object modifiers before export", default=False) - ExportArmatureBones = BoolProperty( + ExportArmatureBones: BoolProperty( name="Export Armature Bones", description="Export armatures bones", default=False) - ExportRestBone = BoolProperty( + ExportRestBone: BoolProperty( name=" Export Rest Position", description="Export bones in their rest position (recommended for "\ "animation)", default=False) - ExportAnimation = BoolProperty( + ExportAnimation: BoolProperty( name="Export Animations", description="Export object and bone animations. Data is exported for "\ "every frame", default=False) - IncludeFrameRate = BoolProperty( + IncludeFrameRate: BoolProperty( name=" Include Frame Rate", description="Include the AnimTicksPerSecond template which is "\ "used by some engines to control animation speed", default=False) - ExportActionsAsSets = BoolProperty( + ExportActionsAsSets: BoolProperty( name=" Export Actions as AnimationSets", description="Export each action of each object as a separate "\ "AnimationSet. Otherwise all current actions are lumped "\ "together into a single set", default=False) - AttachToFirstArmature = BoolProperty( + AttachToFirstArmature: BoolProperty( name=" Attach Unused Actions to First Armature", description="Export each unused action as if used by the first "\ "armature object", default=False) - Verbose = BoolProperty( + Verbose: BoolProperty( name="Verbose", description="Run the exporter in debug mode. Check the console for "\ "output", diff --git a/io_scene_x3d/__init__.py b/io_scene_x3d/__init__.py index 06a9a1220fc7c01bf2ae953de86743be66745aea..8115f72e3ac5226b7e32a1ec76db9e3c3e55d404 100644 --- a/io_scene_x3d/__init__.py +++ b/io_scene_x3d/__init__.py @@ -62,7 +62,7 @@ class ImportX3D(bpy.types.Operator, ImportHelper): bl_options = {'PRESET', 'UNDO'} filename_ext = ".x3d" - filter_glob = StringProperty(default="*.x3d;*.wrl", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.x3d;*.wrl", options={'HIDDEN'}) def execute(self, context): from . import import_x3d @@ -87,51 +87,51 @@ class ExportX3D(bpy.types.Operator, ExportHelper): bl_options = {'PRESET'} filename_ext = ".x3d" - filter_glob = StringProperty(default="*.x3d", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.x3d", options={'HIDDEN'}) - use_selection = BoolProperty( + use_selection: BoolProperty( name="Selection Only", description="Export selected objects only", default=False, ) - use_mesh_modifiers = BoolProperty( + use_mesh_modifiers: BoolProperty( name="Apply Modifiers", description="Use transformed mesh data from each object", default=True, ) - use_triangulate = BoolProperty( + use_triangulate: BoolProperty( name="Triangulate", description="Write quads into 'IndexedTriangleSet'", default=False, ) - use_normals = BoolProperty( + use_normals: BoolProperty( name="Normals", description="Write normals with geometry", default=False, ) - use_compress = BoolProperty( + use_compress: BoolProperty( name="Compress", description="Compress the exported file", default=False, ) - use_hierarchy = BoolProperty( + use_hierarchy: BoolProperty( name="Hierarchy", description="Export parent child relationships", default=True, ) - name_decorations = BoolProperty( + name_decorations: BoolProperty( name="Name decorations", description=("Add prefixes to the names of exported nodes to " "indicate their type"), default=True, ) - use_h3d = BoolProperty( + use_h3d: BoolProperty( name="H3D Extensions", description="Export shaders for H3D", default=False, ) - global_scale = FloatProperty( + global_scale: FloatProperty( name="Scale", min=0.01, max=1000.0, default=1.0, diff --git a/io_sequencer_edl/__init__.py b/io_sequencer_edl/__init__.py index 44f04d32d33e6cc6b89d4f6284ee3866b3f8d4b6..5afc1a8dc0a5d8a7df7c0d73fc43cc3a5f3130e8 100644 --- a/io_sequencer_edl/__init__.py +++ b/io_sequencer_edl/__init__.py @@ -96,7 +96,7 @@ class FindReelsEDL(Operator): """ Matching by reel name and existing filename when set""" bl_idname = "sequencer.import_edl_findreel" bl_label = "Find Missing Reel Files" - directory = StringProperty( + directory: StringProperty( subtype='DIR_PATH', ) @@ -246,26 +246,26 @@ class ImportEDL(Operator): # Persistent Scene Data Types (store EDL import info) class EDLReelInfo(bpy.types.PropertyGroup): - name = StringProperty( + name: StringProperty( name="Name", ) - filepath = StringProperty( + filepath: StringProperty( name="Video File", subtype='FILE_PATH', ) - frame_offset = IntProperty( + frame_offset: IntProperty( name="Frame Offset", ) class EDLImportInfo(bpy.types.PropertyGroup): - filepath = StringProperty( + filepath: StringProperty( subtype='FILE_PATH', ) - reels = bpy.props.CollectionProperty( + reels: bpy.props.CollectionProperty( type=EDLReelInfo, ) - frame_offset = IntProperty( + frame_offset: IntProperty( name="Global Frame Offset", ) diff --git a/light_field_tools/__init__.py b/light_field_tools/__init__.py index b749f44ccd29689e91069b0729dab93e4cb4876c..17e32c8bb607933434c1af23135bed23020b8b9e 100644 --- a/light_field_tools/__init__.py +++ b/light_field_tools/__init__.py @@ -54,7 +54,7 @@ from bpy.props import ( # global properties for the script, mainly for UI class LightFieldPropertyGroup(PropertyGroup): - angle = FloatProperty( + angle: FloatProperty( name="Angle", # 40 degrees default=0.69813170079, @@ -65,38 +65,38 @@ class LightFieldPropertyGroup(PropertyGroup): subtype='ANGLE', description="Field of view of camera and angle of beam for spotlights" ) - row_length = IntProperty( + row_length: IntProperty( name="Row Length", default=1, min=1, description="The number of cameras/lights in one row" ) - create_handler = BoolProperty( + create_handler: BoolProperty( name="Handler", default=True, description="Creates an empty object, to which the cameras and spotlights are parented to" ) - do_camera = BoolProperty( + do_camera: BoolProperty( name="Create Camera", default=True, description="A light field camera is created" ) - animate_camera = BoolProperty( + animate_camera: BoolProperty( name="Animate Camera", default=True, description="Animates a single camera, so not multiple cameras get created" ) - do_projection = BoolProperty( + do_projection: BoolProperty( name="Create Projector", default=False, description="A light field projector is created" ) - texture_path = StringProperty( + texture_path: StringProperty( name="Texture Path", description="From this path textures for the spotlights will be loaded", subtype='DIR_PATH' ) - light_intensity = FloatProperty( + light_intensity: FloatProperty( name="Light Intensity", default=2, min=0, @@ -104,7 +104,7 @@ class LightFieldPropertyGroup(PropertyGroup): description="Total intensity of all lamps" ) # blending of the spotlights - spot_blend = FloatProperty( + spot_blend: FloatProperty( name="Blend", default=0, min=0, @@ -113,7 +113,7 @@ class LightFieldPropertyGroup(PropertyGroup): description="Blending of the spotlights" ) # spacing in pixels on the focal plane - spacing = IntProperty( + spacing: IntProperty( name="Spacing", default=10, min=0, @@ -150,7 +150,7 @@ class LFTPreferences(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="Tools", diff --git a/materials_library_vx/__init__.py b/materials_library_vx/__init__.py index 8aa8993f358570da8229af34eaf36dcdab33d553..3569370e2da3edab44a931b8e8f2f2491b96c7bf 100644 --- a/materials_library_vx/__init__.py +++ b/materials_library_vx/__init__.py @@ -145,7 +145,7 @@ class EmptyGroup(PropertyGroup): # bpy.utils.register_class(EmptyGroup) class matlibMaterials(PropertyGroup): - category = StringProperty() + category: StringProperty() # bpy.utils.register_class(matlibMaterials) #bpy.types.Scene.matlib_categories = CollectionProperty(type=EmptyGroup) @@ -283,13 +283,13 @@ class matlibProperties(PropertyGroup): #MATLIB PROPERTIES #libraries are read from the xml - lib_index = IntProperty(min = -1, default = 2, update=update_lib_index) - all_materials = CollectionProperty(type = matlibMaterials) - materials = CollectionProperty(type = matlibMaterials) - mat_index = IntProperty(min = -1, default = -1) - categories = CollectionProperty(type = EmptyGroup) - cat_index = IntProperty(min = -1, default = -1, update=update_cat_index) - search = StringProperty(name="Search", description="Find By Name", update=update_search_index) + lib_index: IntProperty(min = -1, default = 2, update=update_lib_index) + all_materials: CollectionProperty(type = matlibMaterials) + materials: CollectionProperty(type = matlibMaterials) + mat_index: IntProperty(min = -1, default = -1) + categories: CollectionProperty(type = EmptyGroup) + cat_index: IntProperty(min = -1, default = -1, update=update_cat_index) + search: StringProperty(name="Search", description="Find By Name", update=update_search_index) #MATLIB OPTIONS #link: import material linked @@ -299,12 +299,12 @@ class matlibProperties(PropertyGroup): #filter: enable or disable category filter #last selected: store the last selected object to regain focus when apply a material. #hide_search: Hides Search Field - link = BoolProperty(name = "Linked", description="Link the material", default = False) - force_import = BoolProperty(name = "Force Import", description="Use Scene Materials by default", default = False) - filter = BoolProperty(name = "Filter",description="Filter Categories", default = False, update=update_filter) - show_prefs = BoolProperty(name = "show_prefs", description="Preferences", default = False) - last_selected = StringProperty(name="Last Selected") - hide_search = BoolProperty(name="Hide Search", description="Use Blender Search Only") + link: BoolProperty(name = "Linked", description="Link the material", default = False) + force_import: BoolProperty(name = "Force Import", description="Use Scene Materials by default", default = False) + filter: BoolProperty(name = "Filter",description="Filter Categories", default = False, update=update_filter) + show_prefs: BoolProperty(name = "show_prefs", description="Preferences", default = False) + last_selected: StringProperty(name="Last Selected") + hide_search: BoolProperty(name="Hide Search", description="Use Blender Search Only") #import_file = StringProperty("Import File", subtype="FILE_PATH") #path = os.path.dirname(path) #Development only @@ -918,10 +918,10 @@ class MATLIB_OT_operator(Operator): bl_idname = "matlib.operator" __doc__ = "Add, Remove, Reload, Apply, Preview, Clean Material" - category = StringProperty(name="Category") - filepath = StringProperty(options={'HIDDEN'}) - cmd = bpy.props.StringProperty(name="Command", options={'HIDDEN'}) - filter_glob = StringProperty(default="*.blend", options={'HIDDEN'}) + category: StringProperty(name="Category") + filepath: StringProperty(options={'HIDDEN'}) + cmd: bpy.props.StringProperty(name="Command", options={'HIDDEN'}) + filter_glob: StringProperty(default="*.blend", options={'HIDDEN'}) @classmethod def poll(cls, context): return context.active_object is not None @@ -1210,7 +1210,7 @@ def reload_library(self, context): class matlibvxPref(AddonPreferences): bl_idname = __name__ - matlib_path = StringProperty( + matlib_path: StringProperty( name="Additional Path", description="User defined path to .blend libraries files", default="", diff --git a/materials_utils/__init__.py b/materials_utils/__init__.py index 32324ad8e1ae9f11e150bb2d213e439a1c2c1e7a..5e3fba053d043df664b9c257196b66e95a6ce3e0 100644 --- a/materials_utils/__init__.py +++ b/materials_utils/__init__.py @@ -969,12 +969,12 @@ class VIEW3D_OT_assign_material(Operator): bl_property = "matname" bl_options = {'REGISTER', 'UNDO'} - is_existing = BoolProperty( + is_existing: BoolProperty( name="Is it a new Material", options={'HIDDEN'}, default=True, ) - matname = StringProperty( + matname: StringProperty( name="Material Name", description="Name of the Material to Assign", options={'HIDDEN'}, @@ -1171,7 +1171,7 @@ class VIEW3D_OT_select_material_by_name(Operator): bl_description = "Select geometry with this material assigned to it" bl_options = {'REGISTER', 'UNDO'} - matname = StringProperty( + matname: StringProperty( name="Material Name", description="Name of Material to Select", maxlen=63, @@ -1234,23 +1234,23 @@ class VIEW3D_OT_replace_material(Operator): bl_description = "Replace a material by name" bl_options = {'REGISTER', 'UNDO'} - matorg = StringProperty( + matorg: StringProperty( name="Original", description="Material to replace", maxlen=63, ) - matrep = StringProperty( + matrep: StringProperty( name="Replacement", description="Replacement material", maxlen=63, ) - all_objects = BoolProperty( + all_objects: BoolProperty( name="All objects", description="If enabled, replace for all objects in this blend file\n" "If disabled, only selected objects will be affected", default=False, ) - update_selection = BoolProperty( + update_selection: BoolProperty( name="Update Selection", description="Select affected objects and deselect unaffected", default=True, @@ -1286,13 +1286,13 @@ class VIEW3D_OT_fake_user_set(Operator): bl_description = "Enable/disable fake user for materials" bl_options = {'REGISTER', 'UNDO'} - fake_user = EnumProperty( + fake_user: EnumProperty( name="Fake User", description="Turn fake user on or off", items=(('ON', "On", "Enable fake user"), ('OFF', "Off", "Disable fake user")), default='ON', ) - materials = EnumProperty( + materials: EnumProperty( name="Materials", description="Chose what objects and materials to affect", items=(('ACTIVE', "Active object", "Materials of active object only"), @@ -1441,11 +1441,11 @@ class MATERIAL_OT_link_to_base_names(Operator): "Material/Name on All Materials/Objects") bl_options = {'REGISTER', 'UNDO'} - mat_keep = StringProperty( + mat_keep: StringProperty( name="Material to keep", default="", ) - is_auto = BoolProperty( + is_auto: BoolProperty( name="Auto Rename/Replace", description="Automatically Replace names by stripping numerical suffix", default=False, @@ -2160,7 +2160,7 @@ class MATERIAL_OT_converter_report(Operator): bl_description = "Report about done Material Conversions" bl_options = {'REGISTER', 'INTERNAL'} - message = StringProperty(maxlen=8192) + message: StringProperty(maxlen=8192) def draw(self, context): layout = self.layout @@ -2181,62 +2181,62 @@ class MATERIAL_OT_converter_report(Operator): # Scene Properties class material_specials_scene_mats(PropertyGroup): - name = StringProperty() - mat_lib = BoolProperty( + name: StringProperty() + mat_lib: BoolProperty( default=False ) - mat_fake_user = BoolProperty( + mat_fake_user: BoolProperty( default=False ) class material_specials_scene_props(PropertyGroup): - conv_path = StringProperty( + conv_path: StringProperty( name="Save Directory", description="Path to save images during conversion\n" "Default is the location of the blend file", default="//", subtype='DIR_PATH' ) - EXTRACT_ALPHA = BoolProperty( + EXTRACT_ALPHA: BoolProperty( attr="EXTRACT_ALPHA", default=False, description="Extract Alpha channel from non-procedural images\n" "Don't use this option if the image doesn't have Alpha" ) - SET_FAKE_USER = BoolProperty( + SET_FAKE_USER: BoolProperty( attr="SET_FAKE_USER", default=False, description="Set fake user on unused images, so they can be kept in the .blend" ) - EXTRACT_PTEX = BoolProperty( + EXTRACT_PTEX: BoolProperty( attr="EXTRACT_PTEX", default=False, description="Extract procedural images and bake them to jpeg" ) - EXTRACT_OW = BoolProperty( + EXTRACT_OW: BoolProperty( attr="Overwrite", default=False, description="Extract textures again instead of re-using previously extracted textures" ) - SCULPT_PAINT = BoolProperty( + SCULPT_PAINT: BoolProperty( attr="SCULPT_PAINT", default=False, description="Conversion geared towards sculpting and painting.\n" "Creates a diffuse, glossy mixed with layer weight.\n" "Image nodes are not connected" ) - UV_UNWRAP = BoolProperty( + UV_UNWRAP: BoolProperty( attr="UV_UNWRAP", default=False, description="Use automatic Angle based UV Unwrap for the Active Object" ) - enable_report = BoolProperty( + enable_report: BoolProperty( attr="enable_report", default=False, description="Enable Converter Report in the UI" ) - img_bake_size = EnumProperty( + img_bake_size: EnumProperty( name="Bake Image Size", description="Set the resolution size of baked images \n", items=( @@ -2246,7 +2246,7 @@ class material_specials_scene_props(PropertyGroup): ), default='1024' ) - set_material_name = StringProperty( + set_material_name: StringProperty( name="New Material name", description="What Base name pattern to use for a new created Material\n" "It is appended by an automatic numeric pattern depending\n" @@ -2254,12 +2254,12 @@ class material_specials_scene_props(PropertyGroup): default="Material_New", maxlen=128 ) - use_tweak = BoolProperty( + use_tweak: BoolProperty( name="Tweak Settings", description="Open Preview Active Material after new Material creation", default=False ) - index_mat = IntProperty( + index_mat: IntProperty( name="index", options={"HIDDEN"} ) @@ -2269,19 +2269,19 @@ class material_specials_scene_props(PropertyGroup): class VIEW3D_MT_material_utils_pref(AddonPreferences): bl_idname = __name__ - show_warnings = BoolProperty( + show_warnings: BoolProperty( name="Enable Warning messages", default=False, description="Show warning messages when an action is executed or failed" ) - show_remove_mat = BoolProperty( + show_remove_mat: BoolProperty( name="Enable Remove all Materials", default=False, description="Enable Remove all Materials for all Selected Objects\n\n" "Use with care - if you want to keep materials after\n" "closing or reloading Blender, Set Fake User for them" ) - show_mat_preview = BoolProperty( + show_mat_preview: BoolProperty( name="Enable Material Preview", default=True, description="Material Preview of the Active Object\n" @@ -2289,7 +2289,7 @@ class VIEW3D_MT_material_utils_pref(AddonPreferences): "Use nodes, Color, Specular and Transparency\n" "settings depending on the Context and Preferences" ) - set_cleanmatslots = BoolProperty( + set_cleanmatslots: BoolProperty( name="Enable Auto Clean", default=True, description="Enable Automatic Removal of unused Material Slots\n" @@ -2298,18 +2298,18 @@ class VIEW3D_MT_material_utils_pref(AddonPreferences): "adding materials, enabling it can have some\n" "performance impact on very dense meshes" ) - show_separators = BoolProperty( + show_separators: BoolProperty( name="Use Separators in the menus", default=True, description="Use separators in the menus, a trade-off between\n" "readability vs. using more space for displaying items" ) - show_converters = BoolProperty( + show_converters: BoolProperty( name="Enable Converters", default=False, description="Enable Material Converters" ) - set_preview_size = EnumProperty( + set_preview_size: EnumProperty( name="Preview Menu Size", description="Set the preview menu size\n" "depending on the number of materials\n" @@ -2326,7 +2326,7 @@ class VIEW3D_MT_material_utils_pref(AddonPreferences): ), default='3x3' ) - set_preview_type = EnumProperty( + set_preview_type: EnumProperty( name="Preview Menu Type", description="Set the the Preview menu type", items=( @@ -2342,7 +2342,7 @@ class VIEW3D_MT_material_utils_pref(AddonPreferences): ), default='PREVIEW' ) - set_experimental_type = EnumProperty( + set_experimental_type: EnumProperty( name="Experimental Features", description="Set the type of converters enabled", items=( @@ -2355,7 +2355,7 @@ class VIEW3D_MT_material_utils_pref(AddonPreferences): ), default='ALL', ) - set_add_material_menu = EnumProperty( + set_add_material_menu: EnumProperty( name="Add Material Menu", description="Set the type of Add Material menu", items=( diff --git a/materials_utils/materials_cycles_converter.py b/materials_utils/materials_cycles_converter.py index 0ffac4b07a2e19ffe54a010365bb58d6c9f1c731..11d2affae06f06bac98481158cf71efcbf043a60 100644 --- a/materials_utils/materials_cycles_converter.py +++ b/materials_utils/materials_cycles_converter.py @@ -937,12 +937,12 @@ class mlrestore(Operator): "(Doesn't create new nor converts existing materials)") bl_options = {'REGISTER', 'UNDO'} - switcher = BoolProperty( + switcher: BoolProperty( name="Use Nodes", description="When restoring, switch Use Nodes On/Off", default=True ) - renderer = EnumProperty( + renderer: EnumProperty( name="Renderer", description="Choose Cycles or Blender Internal", items=( diff --git a/materials_utils/texture_rename.py b/materials_utils/texture_rename.py index 585a3a7d90cdd90b11a8e85e7e0628598891f5b9..7ca26c4ad76bdb2a94b4a0742983507efaf1a418 100644 --- a/materials_utils/texture_rename.py +++ b/materials_utils/texture_rename.py @@ -28,12 +28,12 @@ class TEXTURE_OT_patern_rename(Operator): def_name = "Texture" # default name is_not_undo = False # prevent drawing props on undo - named = StringProperty( + named: StringProperty( name="Search for name", description="Enter the name pattern or choose the one from the dropdown list below", default=def_name ) - replace_all = BoolProperty( + replace_all: BoolProperty( name="Replace all", description="Replace all the Textures in the data with the names of the images attached", default=False diff --git a/measureit/__init__.py b/measureit/__init__.py index 4944cd142d1ae8ed90f6b338123c4c328a8a4714..fdc64f23aecd63cd8913221a6d859b90eceb680e 100644 --- a/measureit/__init__.py +++ b/measureit/__init__.py @@ -102,7 +102,7 @@ class Measure_Pref(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="Display", diff --git a/mesh_auto_mirror.py b/mesh_auto_mirror.py index 63952b7f1502144d18d022917ab9f89e412ec600..fa0663af8fd645193b01ef16a0c36325530744a6 100644 --- a/mesh_auto_mirror.py +++ b/mesh_auto_mirror.py @@ -208,7 +208,7 @@ class BisectMirror(Panel): class AutoMirrorProperties(PropertyGroup): - axis = EnumProperty( + axis: EnumProperty( name="Axis", items=[ ("x", "X", "", 1), @@ -217,7 +217,7 @@ class AutoMirrorProperties(PropertyGroup): ], description="Axis used by the mirror modifier" ) - orientation = EnumProperty( + orientation: EnumProperty( name="Orientation", items=[ ("positive", "Positive", "", 1), @@ -225,34 +225,34 @@ class AutoMirrorProperties(PropertyGroup): ], description="Choose the side along the axis of the editable part (+/- coordinates)" ) - threshold = FloatProperty( + threshold: FloatProperty( default=0.001, min=0.001, description="Vertices closer than this distance are merged on the loopcut" ) - toggle_edit = BoolProperty( + toggle_edit: BoolProperty( name="Toggle Edit Mode", default=True, description="If not in Edit mode, change mode to it" ) - cut = BoolProperty( + cut: BoolProperty( name="Cut", default=True, description="If enabled, cut the mesh in two parts and mirror it\n" "If not, just make a loopcut" ) - clipping = BoolProperty( + clipping: BoolProperty( default=True ) - use_clip = BoolProperty( + use_clip: BoolProperty( default=True, description="Use clipping for the mirror modifier" ) - show_on_cage = BoolProperty( + show_on_cage: BoolProperty( default=True, description="Enable editing the cage (it's the classical modifier's option)" ) - apply_mirror = BoolProperty( + apply_mirror: BoolProperty( description="Apply the mirror modifier (useful to symmetrise the mesh)" ) diff --git a/mesh_bsurfaces.py b/mesh_bsurfaces.py index c0c1e994142936db469ef837b0eea4f117ea1564..35c3459d336e8942995538425dee456d289230f0 100644 --- a/mesh_bsurfaces.py +++ b/mesh_bsurfaces.py @@ -164,42 +164,42 @@ class GPENCIL_OT_SURFSK_add_surface(Operator): bl_description = "Generates surfaces from grease pencil strokes, bezier curves or loose edges" bl_options = {'REGISTER', 'UNDO'} - edges_U = IntProperty( + edges_U: IntProperty( name="Cross", description="Number of face-loops crossing the strokes", default=1, min=1, max=200 ) - edges_V = IntProperty( + edges_V: IntProperty( name="Follow", description="Number of face-loops following the strokes", default=1, min=1, max=200 ) - cyclic_cross = BoolProperty( + cyclic_cross: BoolProperty( name="Cyclic Cross", description="Make cyclic the face-loops crossing the strokes", default=False ) - cyclic_follow = BoolProperty( + cyclic_follow: BoolProperty( name="Cyclic Follow", description="Make cyclic the face-loops following the strokes", default=False ) - loops_on_strokes = BoolProperty( + loops_on_strokes: BoolProperty( name="Loops on strokes", description="Make the loops match the paths of the strokes", default=False ) - automatic_join = BoolProperty( + automatic_join: BoolProperty( name="Automatic join", description="Join automatically vertices of either surfaces generated " "by crosshatching, or from the borders of closed shapes", default=False ) - join_stretch_factor = FloatProperty( + join_stretch_factor: FloatProperty( name="Stretch", description="Amount of stretching or shrinking allowed for " "edges when joining vertices automatically", @@ -3871,7 +3871,7 @@ class BsurfPreferences(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="Tools", @@ -3889,33 +3889,33 @@ class BsurfPreferences(AddonPreferences): # Properties class BsurfacesProps(PropertyGroup): - SURFSK_cyclic_cross = BoolProperty( + SURFSK_cyclic_cross: BoolProperty( name="Cyclic Cross", description="Make cyclic the face-loops crossing the strokes", default=False ) - SURFSK_cyclic_follow = BoolProperty( + SURFSK_cyclic_follow: BoolProperty( name="Cyclic Follow", description="Make cyclic the face-loops following the strokes", default=False ) - SURFSK_keep_strokes = BoolProperty( + SURFSK_keep_strokes: BoolProperty( name="Keep strokes", description="Keeps the sketched strokes or curves after adding the surface", default=False ) - SURFSK_automatic_join = BoolProperty( + SURFSK_automatic_join: BoolProperty( name="Automatic join", description="Join automatically vertices of either surfaces " "generated by crosshatching, or from the borders of closed shapes", default=True ) - SURFSK_loops_on_strokes = BoolProperty( + SURFSK_loops_on_strokes: BoolProperty( name="Loops on strokes", description="Make the loops match the paths of the strokes", default=True ) - SURFSK_precision = IntProperty( + SURFSK_precision: IntProperty( name="Precision", description="Precision level of the surface calculation", default=2, diff --git a/mesh_carver.py b/mesh_carver.py index cf3b55fd3e9ed03c3117ba6c4402b85b050fcc4a..266b426be78882cd7eb0d46704c81a8fc66cd671 100644 --- a/mesh_carver.py +++ b/mesh_carver.py @@ -470,113 +470,113 @@ UNION = 1 class CarverPrefs(bpy.types.AddonPreferences): bl_idname = __name__ - Enable_Tab_01 = BoolProperty( + Enable_Tab_01: BoolProperty( name="Info", description="Some general information and settings about the add-on", default=False ) - Enable_Tab_02 = BoolProperty( + Enable_Tab_02: BoolProperty( name="Hotkeys", description="List of the shortcuts used during carving", default=False ) - bpy.types.Scene.Key_Create = StringProperty( + bpy.types.Scene.Key_Create: StringProperty( name="Object creation", description="Object creation", maxlen=1, default="C" ) - bpy.types.Scene.Key_Update = StringProperty( + bpy.types.Scene.Key_Update: StringProperty( name="Auto Bevel Update", description="Auto Bevel Update", maxlen=1, default="A", ) - bpy.types.Scene.Key_Bool = StringProperty( + bpy.types.Scene.Key_Bool: StringProperty( name="Boolean type", description="Boolean operation type", maxlen=1, default="T", ) - bpy.types.Scene.Key_Brush = StringProperty( + bpy.types.Scene.Key_Brush: StringProperty( name="Brush Mode", description="Brush Mode", maxlen=1, default="B", ) - bpy.types.Scene.Key_Help = StringProperty( + bpy.types.Scene.Key_Help: StringProperty( name="Help display", description="Help display", maxlen=1, default="H", ) - bpy.types.Scene.Key_Instant = StringProperty( + bpy.types.Scene.Key_Instant: StringProperty( name="Instantiate", description="Instantiate object", maxlen=1, default="I", ) - bpy.types.Scene.Key_Close = StringProperty( + bpy.types.Scene.Key_Close: StringProperty( name="Close polygonal shape", description="Close polygonal shape", maxlen=1, default="X", ) - bpy.types.Scene.Key_Apply = StringProperty( + bpy.types.Scene.Key_Apply: StringProperty( name="Apply operation", description="Apply operation", maxlen=1, default="Q", ) - bpy.types.Scene.Key_Scale = StringProperty( + bpy.types.Scene.Key_Scale: StringProperty( name="Scale object", description="Scale object", maxlen=1, default="S", ) - bpy.types.Scene.Key_Gapy = StringProperty( + bpy.types.Scene.Key_Gapy: StringProperty( name="Gap rows", description="Scale gap between columns", maxlen=1, default="J", ) - bpy.types.Scene.Key_Gapx = StringProperty( + bpy.types.Scene.Key_Gapx: StringProperty( name="Gap columns", description="Scale gap between columns", maxlen=1, default="U", ) - bpy.types.Scene.Key_Depth = StringProperty( + bpy.types.Scene.Key_Depth: StringProperty( name="Depth", description="Cursor depth or solidify pattern", maxlen=1, default="D", ) - bpy.types.Scene.Key_BrushDepth = StringProperty( + bpy.types.Scene.Key_BrushDepth: StringProperty( name="Brush Depth", description="Brush depth", maxlen=1, default="C", ) - bpy.types.Scene.Key_Subadd = StringProperty( + bpy.types.Scene.Key_Subadd: StringProperty( name="Add subdivision", description="Add subdivision", maxlen=1, default="X", ) - bpy.types.Scene.Key_Subrem = StringProperty( + bpy.types.Scene.Key_Subrem: StringProperty( name="Remove subdivision", description="Remove subdivision", maxlen=1, default="W", ) - bpy.types.Scene.Key_Randrot = StringProperty( + bpy.types.Scene.Key_Randrot: StringProperty( name="Random rotation", description="Random rotation", maxlen=1, default="R", ) - bpy.types.Scene.ProfilePrefix = StringProperty( + bpy.types.Scene.ProfilePrefix: StringProperty( name="Profile prefix", description="Prefix to look for profiles with", default="Carver_Profile-" @@ -3408,23 +3408,23 @@ class Carver(bpy.types.Operator): class CarverProperties(bpy.types.PropertyGroup): - DepthCursor = BoolProperty( + DepthCursor: BoolProperty( name="DepthCursor", default=False ) - OInstanciate = BoolProperty( + OInstanciate: BoolProperty( name="Obj_Instantiate", default=False ) - ORandom = BoolProperty( + ORandom: BoolProperty( name="Random_Rotation", default=False ) - DontApply = BoolProperty( + DontApply: BoolProperty( name="Dont_Apply", default=False ) - nProfile = IntProperty( + nProfile: IntProperty( name="Num_Profile", default=0 ) diff --git a/mesh_extra_tools/__init__.py b/mesh_extra_tools/__init__.py index 8c7ec76421a903aa1a5ea1a8602c23ed3cde9672..3685079e59bcc8d7fba34465762b31fc2ba4de2c 100644 --- a/mesh_extra_tools/__init__.py +++ b/mesh_extra_tools/__init__.py @@ -745,7 +745,7 @@ class MeshExtraToolsSceneProps(PropertyGroup): size=4, ) # Vertex align - vert_align_store_axis = FloatVectorProperty( + vert_align_store_axis: FloatVectorProperty( name="Define Custom Coordinates", description="Store the values of coordinates, for repeated use\n" "as a starting point", @@ -755,12 +755,12 @@ class MeshExtraToolsSceneProps(PropertyGroup): subtype='XYZ', precision=3 ) - vert_align_use_stored = BoolProperty( + vert_align_use_stored: BoolProperty( name="Use Stored Coordinates", description="Use starting point coordinates for alignment", default=False ) - vert_align_to = EnumProperty( + vert_align_to: EnumProperty( items=(('vertex', "Original vertex", "Use the stored vertex coordinates for aligning"), ('coordinates', "Custom coordinates", @@ -775,14 +775,14 @@ class MeshExtraToolsSceneProps(PropertyGroup): size=3, ) # Mesh Info select - mesh_info_show = BoolProperty( + mesh_info_show: BoolProperty( name="Show Face Info", description="Display the Object's Face Count information\n" "Note: it can have some performance impact on dense meshes\n" "Leave it closed if not needed or set the Delay to a higher value", default=False ) - mesh_info_delay = FloatProperty( + mesh_info_delay: FloatProperty( name="Delay", description="Set the Update time Delay in seconds\n" "Set to zero to update with the UI refresh\n" @@ -799,12 +799,12 @@ class MeshExtraToolsSceneProps(PropertyGroup): class mesh_extra_tools_pref(AddonPreferences): bl_idname = __name__ - show_info = BoolProperty( + show_info: BoolProperty( name="Info", default=False, description="Some general information about the add-on", ) - show_shortcuts = BoolProperty( + show_shortcuts: BoolProperty( name="Hot Keys", default=False, description="List of the shortcuts used for the included various tools", diff --git a/mesh_extra_tools/face_inset_fillet.py b/mesh_extra_tools/face_inset_fillet.py index eb3e34c2094773969dab86483b08913ff2e15c67..b6d38d59512753ebe19caec77cde5c28602e21a9 100644 --- a/mesh_extra_tools/face_inset_fillet.py +++ b/mesh_extra_tools/face_inset_fillet.py @@ -224,7 +224,7 @@ class MESH_OT_face_inset_fillet(Operator): bl_options = {"REGISTER", "UNDO"} # inset amount - inset_amount = FloatProperty( + inset_amount: FloatProperty( name="Inset amount", description="Define the size of the Inset relative to the selection", default=0.04, @@ -233,7 +233,7 @@ class MESH_OT_face_inset_fillet(Operator): precision=3 ) # number of sides - number_of_sides = IntProperty( + number_of_sides: IntProperty( name="Number of sides", description="Define the roundness of the corners by specifying\n" "the subdivision count", @@ -241,7 +241,7 @@ class MESH_OT_face_inset_fillet(Operator): min=1, max=100, step=1 ) - distance = FloatProperty( + distance: FloatProperty( name="", description="Use distance or radius for corners' size calculation", default=0.04, @@ -249,24 +249,24 @@ class MESH_OT_face_inset_fillet(Operator): step=1, precision=3 ) - out = BoolProperty( + out: BoolProperty( name="Outside", description="Inset the Faces outwards in relation to the selection\n" "Note: depending on the geometry, can give unsatisfactory results", default=False ) - radius = BoolProperty( + radius: BoolProperty( name="Radius", description="Use radius for corners' size calculation", default=False ) - type_enum = EnumProperty( + type_enum: EnumProperty( items=(('opt0', "N-gon", "N-gon corners - Keep the corner Faces uncut"), ('opt1', "Triangle", "Triangulate corners")), name="Corner Type", default="opt0" ) - kp = BoolProperty( + kp: BoolProperty( name="Keep faces", description="Do not delete the inside Faces\n" "Only available if the Out option is checked", diff --git a/mesh_extra_tools/mesh_check.py b/mesh_extra_tools/mesh_check.py index c3d42837a379a57a839bafce958db09cddaa85cf..2acfe184bde1591671d2944819a27e45a1203e53 100644 --- a/mesh_extra_tools/mesh_check.py +++ b/mesh_extra_tools/mesh_check.py @@ -253,7 +253,7 @@ class FaceTypeSelect(Operator): bl_description = "Select Triangles and / or Ngons on the Active Object" bl_options = {'REGISTER', 'UNDO'} - face_type = EnumProperty( + face_type: EnumProperty( name="Face Type", items=(('tris', "Tris", "Colorize Triangles in the Mesh"), ('ngons', "Ngons", "Colorize Ngons in the Mesh")), @@ -278,19 +278,19 @@ class FaceTypeSelect(Operator): class MeshCheckCollectionGroup(PropertyGroup): - mesh_check_use = BoolProperty( + mesh_check_use: BoolProperty( name="Mesh Check", description="Display Mesh Check options", default=False, update=updateBGLData ) - display_faces = BoolProperty( + display_faces: BoolProperty( name="Display Faces", description="Use BGL to display Ngons and Tris of the mesh", default=False, update=updateBGLData ) - edge_width = FloatProperty( + edge_width: FloatProperty( name="Width", description="Drawn Edges width in pixels", min=1.0, @@ -299,13 +299,13 @@ class MeshCheckCollectionGroup(PropertyGroup): subtype='PIXEL', update=updateBGLData ) - finer_lines_behind_use = BoolProperty( + finer_lines_behind_use: BoolProperty( name="Finer Lines behind", description="Display partially hidden edges finer in non-occlude mode", default=True, update=updateBGLData ) - custom_tri_color = FloatVectorProperty( + custom_tri_color: FloatVectorProperty( name="Tri Color", description="Custom color for the Triangles", min=0.0, @@ -315,7 +315,7 @@ class MeshCheckCollectionGroup(PropertyGroup): subtype='COLOR', update=updateBGLData ) - custom_ngons_color = FloatVectorProperty( + custom_ngons_color: FloatVectorProperty( name="Ngons Color", description="Custom color for the Ngons", min=0.0, @@ -325,7 +325,7 @@ class MeshCheckCollectionGroup(PropertyGroup): subtype='COLOR', update=updateBGLData ) - face_opacity = FloatProperty( + face_opacity: FloatProperty( name="Face Opacity", description="Opacity of the color for the face", min=0.0, diff --git a/mesh_extra_tools/mesh_cut_faces.py b/mesh_extra_tools/mesh_cut_faces.py index cd710a070a6609670aa17bb1508cdd525df8ec43..195d491f9ba49e8545e1a9f4dd249506c5ad6f99 100644 --- a/mesh_extra_tools/mesh_cut_faces.py +++ b/mesh_extra_tools/mesh_cut_faces.py @@ -118,7 +118,7 @@ class MESH_xOT_deselect_boundary(Operator): "so the tool will not have results") bl_options = {'REGISTER', 'UNDO'} - keep_cap_edges = BoolProperty( + keep_cap_edges: BoolProperty( name="Keep Cap Edges", description="Keep quad strip cap edges selected", default=False @@ -164,19 +164,19 @@ class MESH_xOT_cut_faces(Operator): SUBD_FAN = 2 SUBD_STRAIGHT_CUT = 3 - num_cuts = IntProperty( + num_cuts: IntProperty( name="Number of Cuts", default=1, min=1, max=100, subtype='UNSIGNED' ) - use_single_edge = BoolProperty( + use_single_edge: BoolProperty( name="Quad/Tri Mode", description="Cut boundary faces", default=False ) - corner_type = EnumProperty( + corner_type: EnumProperty( items=[('SUBD_INNERVERT', "Inner Vert", ""), ('SUBD_PATH', "Path", ""), ('SUBD_FAN', "Fan", ""), @@ -186,7 +186,7 @@ class MESH_xOT_cut_faces(Operator): description="How to subdivide quad corners", default='SUBD_STRAIGHT_CUT' ) - use_grid_fill = BoolProperty( + use_grid_fill: BoolProperty( name="Use Grid Fill", description="Fill fully enclosed faces with a grid", default=True diff --git a/mesh_extra_tools/mesh_edge_roundifier.py b/mesh_extra_tools/mesh_edge_roundifier.py index 609d0df7e9e696d84cdf91eeda33a12f2d41875a..0ab20a693238261dc63a4118985bbb90320fd481 100644 --- a/mesh_extra_tools/mesh_edge_roundifier.py +++ b/mesh_extra_tools/mesh_edge_roundifier.py @@ -264,7 +264,7 @@ class EdgeRoundifier(Operator): threshold = 0.0005 obj = None - edgeScaleFactor = FloatProperty( + edgeScaleFactor: FloatProperty( name="", description="Set the Factor of scaling", default=1.0, @@ -272,7 +272,7 @@ class EdgeRoundifier(Operator): step=0.5, precision=5 ) - r = FloatProperty( + r: FloatProperty( name="", description="User Defined arc steepness by a Radius\n" "Enabled only if Entry mode is set to Radius\n", @@ -281,7 +281,7 @@ class EdgeRoundifier(Operator): step=0.1, precision=3 ) - a = FloatProperty( + a: FloatProperty( name="", description="User defined arc steepness calculated from an Angle\n" "Enabled only if Entry mode is set to Angle and\n" @@ -291,74 +291,74 @@ class EdgeRoundifier(Operator): step=0.5, precision=1 ) - n = IntProperty( + n: IntProperty( name="", description="Arc subdivision level", default=4, min=1, max=100, step=1 ) - flip = BoolProperty( + flip: BoolProperty( name="Flip", description="If True, flip the side of the selected edges where the arcs are drawn", default=False ) - invertAngle = BoolProperty( + invertAngle: BoolProperty( name="Invert", description="If True, uses an inverted angle to draw the arc (360 degrees - angle)", default=False ) - fullCircles = BoolProperty( + fullCircles: BoolProperty( name="Circles", description="If True, uses an angle of 360 degrees to draw the arcs", default=False ) - bothSides = BoolProperty( + bothSides: BoolProperty( name="Both sides", description="If True, draw arcs on both sides of the selected edges", default=False ) - drawArcCenters = BoolProperty( + drawArcCenters: BoolProperty( name="Centers", description="If True, draws a vertex for each spin center", default=False ) - removeEdges = BoolProperty( + removeEdges: BoolProperty( name="Edges", description="If True removes the Original selected edges", default=False ) - removeScaledEdges = BoolProperty( + removeScaledEdges: BoolProperty( name="Scaled edges", description="If True removes the Scaled edges (not part of the arcs)", default=False ) - connectArcWithEdge = BoolProperty( + connectArcWithEdge: BoolProperty( name="Arc - Edge", description="Connect Arcs to Edges", default=False ) - connectArcs = BoolProperty( + connectArcs: BoolProperty( name="Arcs", description="Connect subsequent Arcs", default=False ) - connectScaledAndBase = BoolProperty( + connectScaledAndBase: BoolProperty( name="Scaled - Base Edge", description="Connect Scaled to Base Edge", default=False ) - connectArcsFlip = BoolProperty( + connectArcsFlip: BoolProperty( name="Flip Arcs", description="Flip the connection of subsequent Arcs", default=False ) - connectArcWithEdgeFlip = BoolProperty( + connectArcWithEdgeFlip: BoolProperty( name="Flip Arc - Edge", description="Flip the connection of the Arcs to Edges", default=False ) - axisAngle = FloatProperty( + axisAngle: FloatProperty( name="", description="Rotate Arc around the perpendicular axis", default=0.0, @@ -366,7 +366,7 @@ class EdgeRoundifier(Operator): step=0.5, precision=1 ) - edgeAngle = FloatProperty( + edgeAngle: FloatProperty( name="", description="Rotate Arc around the Edge (Edge acts like as the axis)", default=0.0, @@ -374,7 +374,7 @@ class EdgeRoundifier(Operator): step=0.5, precision=1 ) - offset = FloatProperty( + offset: FloatProperty( name="", description="Offset Arc perpendicular the Edge", default=0.0, @@ -382,7 +382,7 @@ class EdgeRoundifier(Operator): step=0.1, precision=5 ) - offset2 = FloatProperty( + offset2: FloatProperty( name="", description="Offset Arc in parallel to the Edge", default=0.0, @@ -390,7 +390,7 @@ class EdgeRoundifier(Operator): step=0.1, precision=5 ) - ellipticFactor = FloatProperty( + ellipticFactor: FloatProperty( name="", description="Make Arc elliptic", default=0.0, @@ -399,7 +399,7 @@ class EdgeRoundifier(Operator): precision=5 ) workModeItems = [("Normal", "Normal", ""), ("Reset", "Reset", "")] - workMode = EnumProperty( + workMode: EnumProperty( items=workModeItems, name="", default='Normal', @@ -407,7 +407,7 @@ class EdgeRoundifier(Operator): "Reset - changes back the parameters to their default values" ) entryModeItems = [("Radius", "Radius", ""), ("Angle", "Angle", "")] - entryMode = EnumProperty( + entryMode: EnumProperty( items=entryModeItems, name="", default='Angle', @@ -418,14 +418,14 @@ class EdgeRoundifier(Operator): ("Spin", "Spin", ""), ("V1", "V1", ""), ("Edge", "Edge", ""), ("V2", "V2", "") ] - rotateCenter = EnumProperty( + rotateCenter: EnumProperty( items=rotateCenterItems, name="", default='Edge', description="Rotate center for spin axis rotate" ) arcModeItems = [("FullEdgeArc", "Full", "Full"), ('HalfEdgeArc', "Half", "Half")] - arcMode = EnumProperty( + arcMode: EnumProperty( items=arcModeItems, name="", default='FullEdgeArc', @@ -437,7 +437,7 @@ class EdgeRoundifier(Operator): ('72', "72", "PentagonCircle (5 sides)"), ('60', "60", "HexagonCircle (6 sides)"), ('45', "45", "OctagonCircle (8 sides)"), ('30', "30", "DodecagonCircle (12 sides)") ] - angleEnum = EnumProperty( + angleEnum: EnumProperty( items=angleItems, name="", default='180', @@ -445,7 +445,7 @@ class EdgeRoundifier(Operator): ) refItems = [('ORG', "Origin", "Use Origin Location"), ('CUR', "3D Cursor", "Use 3DCursor Location"), ('EDG', "Edge", "Use Individual Edge Reference")] - referenceLocation = EnumProperty( + referenceLocation: EnumProperty( items=refItems, name="", default='ORG', @@ -456,7 +456,7 @@ class EdgeRoundifier(Operator): (YZ, "YZ", "YZ Plane (X=0)"), (XZ, "XZ", "XZ Plane (Y=0)") ] - planeEnum = EnumProperty( + planeEnum: EnumProperty( items=planeItems, name="", default='XY', @@ -467,7 +467,7 @@ class EdgeRoundifier(Operator): ('CENTER', "Center", "Center of the Edge"), ('V2', "V2", "v2 - Second Edge's Vertex") ] - edgeScaleCenterEnum = EnumProperty( + edgeScaleCenterEnum: EnumProperty( items=edgeScaleCenterItems, name="Edge scale center", default='CENTER', diff --git a/mesh_extra_tools/mesh_edges_floor_plan.py b/mesh_extra_tools/mesh_edges_floor_plan.py index bc4b16105f3d744bce67a03a3cb1dd0f847368b2..1804c79aa66049bf385ddd69ead2bdbcb42064c5 100644 --- a/mesh_extra_tools/mesh_edges_floor_plan.py +++ b/mesh_extra_tools/mesh_edges_floor_plan.py @@ -55,24 +55,24 @@ class MESH_OT_edges_floor_plan(Operator): bl_description = "Top View, Extrude Flat Along Edges" bl_options = {'REGISTER', 'UNDO'} - wid = FloatProperty( + wid: FloatProperty( name="Wall width:", description="Set the width of the generated walls\n", default=0.1, min=0.001, max=30000 ) - depth = FloatProperty( + depth: FloatProperty( name="Inner height:", description="Set the height of the inner wall edges", default=0.0, min=0, max=10 ) - connect_ends = BoolProperty( + connect_ends: BoolProperty( name="Connect Ends", description="Connect the ends of the boundary Edge loops", default=False ) - repeat_cleanup = IntProperty( + repeat_cleanup: IntProperty( name="Recursive Prepare", description="Number of times that the preparation phase runs\n" "at the start of the script\n" @@ -94,25 +94,25 @@ class MESH_OT_edges_floor_plan(Operator): "Useful for complex meshes, however works best on flat surfaces\n" "as the extrude direction has to be defined") ] - fill_type = EnumProperty( + fill_type: EnumProperty( name="Fill Type", items=fill_items, description="Choose the method for creating geometry", default='SOLIDIFY' ) - keep_faces = BoolProperty( + keep_faces: BoolProperty( name="Keep Faces", description="Keep or not the fill faces\n" "Can depend on Remove Ngons state", default=False ) - tri_faces = BoolProperty( + tri_faces: BoolProperty( name="Triangulate Faces", description="Triangulate the created fill faces\n" "Sometimes can lead to unsatisfactory results", default=False ) - initial_extrude = FloatVectorProperty( + initial_extrude: FloatVectorProperty( name="Initial Extrude", description="", default=(0.0, 0.0, 0.1), @@ -121,7 +121,7 @@ class MESH_OT_edges_floor_plan(Operator): precision=3, size=3 ) - remove_ngons = BoolProperty( + remove_ngons: BoolProperty( name="Remove Ngons", description="Keep or not the Ngon Faces\n" "Note about limitations:\n" @@ -129,13 +129,13 @@ class MESH_OT_edges_floor_plan(Operator): "Removing the Ngons can lead to no geometry created", default=True ) - offset = FloatProperty( + offset: FloatProperty( name="Wall Offset:", description="Set the offset for the Solidify modifier", default=0.0, min=-1.0, max=1.0 ) - only_rim = BoolProperty( + only_rim: BoolProperty( name="Rim Only", description="Solidify Fill Rim only option", default=False diff --git a/mesh_extra_tools/mesh_edges_length.py b/mesh_extra_tools/mesh_edges_length.py index 0c1f3cb43552d4f6efd6523e06b4609d7793cda0..eac31a2fa3ba2de39c9f2ff42b981221d7b378b2 100644 --- a/mesh_extra_tools/mesh_edges_length.py +++ b/mesh_extra_tools/mesh_edges_length.py @@ -64,11 +64,11 @@ class LengthSet(Operator): "Note: works only with Edges that not share a vertex") bl_options = {'REGISTER', 'UNDO'} - old_length = FloatProperty( + old_length: FloatProperty( name="Original length", options={'HIDDEN'}, ) - set_length_type = EnumProperty( + set_length_type: EnumProperty( items=[ ('manual', "Manual", "Input manually the desired Target Length"), @@ -77,14 +77,14 @@ class LengthSet(Operator): ], name="Set Type of Input", ) - target_length = FloatProperty( + target_length: FloatProperty( name="Target Length", description="Input a value for an Edges Length target", default=1.00, unit='LENGTH', precision=5 ) - existing_length = EnumProperty( + existing_length: EnumProperty( items=[ ('min', "Shortest", "Set all to shortest Edge of selection"), @@ -98,7 +98,7 @@ class LengthSet(Operator): ], name="Existing length" ) - mode = EnumProperty( + mode: EnumProperty( items=[ ('fixed', "Fixed", "Fixed"), ('increment', "Increment", "Increment"), @@ -106,7 +106,7 @@ class LengthSet(Operator): ], name="Mode" ) - behaviour = EnumProperty( + behaviour: EnumProperty( items=[ ('proportional', "Proportional", "Move vertex locations proportionally to the center of the Edge"), diff --git a/mesh_extra_tools/mesh_edgetools.py b/mesh_extra_tools/mesh_edgetools.py index cfd6c75e32040cdb20a29600d17298734f0ee838..08959e7b5b69c2661760775504d0588a5587ef7b 100644 --- a/mesh_extra_tools/mesh_edgetools.py +++ b/mesh_extra_tools/mesh_edgetools.py @@ -654,17 +654,17 @@ class Extend(Operator): bl_description = "Extend the selected edges of vertex pairs" bl_options = {'REGISTER', 'UNDO'} - di1 = BoolProperty( + di1: BoolProperty( name="Forwards", description="Extend the edge forwards", default=True ) - di2 = BoolProperty( + di2: BoolProperty( name="Backwards", description="Extend the edge backwards", default=False ) - length = FloatProperty( + length: FloatProperty( name="Length", description="Length to extend the edge", min=0.0, max=1024.0, @@ -776,7 +776,7 @@ class Spline(Operator): bl_description = "Create a spline interplopation between two edges" bl_options = {'REGISTER', 'UNDO'} - alg = EnumProperty( + alg: EnumProperty( name="Spline Algorithm", items=[('Blender', "Blender", "Interpolation provided through mathutils.geometry"), ('Hermite', "C-Spline", "C-spline interpolation"), @@ -784,31 +784,31 @@ class Spline(Operator): ('B-Spline', "B-Spline", "B-Spline interpolation")], default='Bezier' ) - segments = IntProperty( + segments: IntProperty( name="Segments", description="Number of segments to use in the interpolation", min=2, max=4096, soft_max=1024, default=32 ) - flip1 = BoolProperty( + flip1: BoolProperty( name="Flip Edge", description="Flip the direction of the spline on Edge 1", default=False ) - flip2 = BoolProperty( + flip2: BoolProperty( name="Flip Edge", description="Flip the direction of the spline on Edge 2", default=False ) - ten1 = FloatProperty( + ten1: FloatProperty( name="Tension", description="Tension on Edge 1", min=-4096.0, max=4096.0, soft_min=-8.0, soft_max=8.0, default=1.0 ) - ten2 = FloatProperty( + ten2: FloatProperty( name="Tension", description="Tension on Edge 2", min=-4096.0, max=4096.0, @@ -947,50 +947,50 @@ class Ortho(Operator): bl_description = "Creates new edges within an angle from vertices of selected edges" bl_options = {'REGISTER', 'UNDO'} - vert1 = BoolProperty( + vert1: BoolProperty( name="Vertice 1", description="Enable edge creation for Vertice 1", default=True ) - vert2 = BoolProperty( + vert2: BoolProperty( name="Vertice 2", description="Enable edge creation for Vertice 2", default=True ) - vert3 = BoolProperty( + vert3: BoolProperty( name="Vertice 3", description="Enable edge creation for Vertice 3", default=True ) - vert4 = BoolProperty( + vert4: BoolProperty( name="Vertice 4", description="Enable edge creation for Vertice 4", default=True ) - pos = BoolProperty( + pos: BoolProperty( name="Positive", description="Enable creation of positive direction edges", default=True ) - neg = BoolProperty( + neg: BoolProperty( name="Negative", description="Enable creation of negative direction edges", default=True ) - angle = FloatProperty( + angle: FloatProperty( name="Angle", description="Define the angle off of the originating edge", min=0.0, max=180.0, default=90.0 ) - length = FloatProperty( + length: FloatProperty( name="Length", description="Length of created edges", min=0.0, max=1024.0, default=1.0 ) # For when only one edge is selected (Possible feature to be testd): - plane = EnumProperty( + plane: EnumProperty( name="Plane", items=[("XY", "X-Y Plane", "Use the X-Y plane as the plane of creation"), ("XZ", "X-Z Plane", "Use the X-Z plane as the plane of creation"), @@ -1146,7 +1146,7 @@ class Shaft(Operator): shaftType = 0 # For tracking if the user has changed selection: - last_edge = IntProperty( + last_edge: IntProperty( name="Last Edge", description="Tracks if user has changed selected edges", min=0, max=1, @@ -1154,36 +1154,36 @@ class Shaft(Operator): ) last_flip = False - edge = IntProperty( + edge: IntProperty( name="Edge", description="Edge to shaft around", min=0, max=1, default=0 ) - flip = BoolProperty( + flip: BoolProperty( name="Flip Second Edge", description="Flip the perceived direction of the second edge", default=False ) - radius = FloatProperty( + radius: FloatProperty( name="Radius", description="Shaft Radius", min=0.0, max=1024.0, default=1.0 ) - start = FloatProperty( + start: FloatProperty( name="Starting Angle", description="Angle to start the shaft at", min=-360.0, max=360.0, default=0.0 ) - finish = FloatProperty( + finish: FloatProperty( name="Ending Angle", description="Angle to end the shaft at", min=-360.0, max=360.0, default=360.0 ) - segments = IntProperty( + segments: IntProperty( name="Shaft Segments", description="Number of segments to use in the shaft", min=1, max=4096, @@ -1451,22 +1451,22 @@ class Slice(Operator): bl_description = "Cut edges at the plane defined by a selected face" bl_options = {'REGISTER', 'UNDO'} - make_copy = BoolProperty( + make_copy: BoolProperty( name="Make Copy", description="Make new vertices at intersection points instead of splitting the edge", default=False ) - rip = BoolProperty( + rip: BoolProperty( name="Rip", description="Split into two edges that DO NOT share an intersection vertex", default=True ) - pos = BoolProperty( + pos: BoolProperty( name="Positive", description="Remove the portion on the side of the face normal", default=False ) - neg = BoolProperty( + neg: BoolProperty( name="Negative", description="Remove the portion on the side opposite of the face normal", default=False @@ -1641,7 +1641,7 @@ class Project(Operator): "(Active is projected onto the rest)") bl_options = {'REGISTER', 'UNDO'} - make_copy = BoolProperty( + make_copy: BoolProperty( name="Make Copy", description="Make duplicates of the vertices instead of altering them", default=False @@ -1719,22 +1719,22 @@ class Project_End(Operator): "edges closest to a plane onto that plane") bl_options = {'REGISTER', 'UNDO'} - make_copy = BoolProperty( + make_copy: BoolProperty( name="Make Copy", description="Make a duplicate of the vertice instead of moving it", default=False ) - keep_length = BoolProperty( + keep_length: BoolProperty( name="Keep Edge Length", description="Maintain edge lengths", default=False ) - use_force = BoolProperty( + use_force: BoolProperty( name="Use opposite vertices", description="Force the usage of the vertices at the other end of the edge", default=False ) - use_normal = BoolProperty( + use_normal: BoolProperty( name="Project along normal", description="Use the plane's normal as the projection direction", default=False diff --git a/mesh_extra_tools/mesh_fastloop.py b/mesh_extra_tools/mesh_fastloop.py index 0bfcc40510b3e59c67575357cff25811b0f49e08..6fd08de248408c57813ae12ad0203aee676503a1 100644 --- a/mesh_extra_tools/mesh_fastloop.py +++ b/mesh_extra_tools/mesh_fastloop.py @@ -68,7 +68,7 @@ class OBJECT_OT_FastLoop(Operator): bl_description = ("Create multiple edge loops in succession\n" "Runs modal until ESC is pressed twice") - active = BoolProperty( + active: BoolProperty( name="active", default=False ) diff --git a/mesh_extra_tools/mesh_filletplus.py b/mesh_extra_tools/mesh_filletplus.py index f3c9cbdfab5581a21c0728d479245c320e56a4e8..bc38d2ea2f48ab92c5685ef2f0f80a0071bdb6e0 100644 --- a/mesh_extra_tools/mesh_filletplus.py +++ b/mesh_extra_tools/mesh_filletplus.py @@ -297,7 +297,7 @@ class MESH_OT_fillet_plus(Operator): "Note: Works on a mesh whose all faces share the same normal") bl_options = {"REGISTER", "UNDO"} - adj = FloatProperty( + adj: FloatProperty( name="", description="Size of the filleted corners", default=0.1, @@ -305,25 +305,25 @@ class MESH_OT_fillet_plus(Operator): step=1, precision=3 ) - n = IntProperty( + n: IntProperty( name="", description="Subdivision of the filleted corners", default=3, min=1, max=50, step=1 ) - out = BoolProperty( + out: BoolProperty( name="Outside", description="Fillet towards outside", default=False ) - flip = BoolProperty( + flip: BoolProperty( name="Flip", description="Flip the direction of the Fillet\n" "Only available if Outside option is not active", default=False ) - radius = BoolProperty( + radius: BoolProperty( name="Radius", description="Use radius for the size of the filleted corners", default=False diff --git a/mesh_extra_tools/mesh_help.py b/mesh_extra_tools/mesh_help.py index 5df8560066a95f4ca7f4ca9a7e8572c3fb327c98..30047a8b6e562088b4146b5d5b91d5bd3c2282dd 100644 --- a/mesh_extra_tools/mesh_help.py +++ b/mesh_extra_tools/mesh_help.py @@ -24,12 +24,12 @@ class MESH_OT_extra_tools_help(Operator): bl_description = "Tool Help - click to read some basic information" bl_options = {'REGISTER'} - help_ids = StringProperty( + help_ids: StringProperty( name="ID of the Operator to display", options={'HIDDEN'}, default="default" ) - popup_size = IntProperty( + popup_size: IntProperty( name="Size of the Help Pop-up Menu", default=350, min=100, diff --git a/mesh_extra_tools/mesh_mextrude_plus.py b/mesh_extra_tools/mesh_mextrude_plus.py index de5f561b7854bf000bfc71306ba6e3e42ec97faa..5fa2aa2b7636c59c7d25937e932840176784155d 100644 --- a/mesh_extra_tools/mesh_mextrude_plus.py +++ b/mesh_extra_tools/mesh_mextrude_plus.py @@ -84,42 +84,42 @@ class MExtrude(Operator): "Scaling, Variation, Randomization") bl_options = {"REGISTER", "UNDO", "PRESET"} - off = FloatProperty( + off: FloatProperty( name="Offset", soft_min=0.001, soft_max=10, min=-100, max=100, default=1.0, description="Translation" ) - offx = FloatProperty( + offx: FloatProperty( name="Loc X", soft_min=-10.0, soft_max=10.0, min=-100.0, max=100.0, default=0.0, description="Global Translation X" ) - offy = FloatProperty( + offy: FloatProperty( name="Loc Y", soft_min=-10.0, soft_max=10.0, min=-100.0, max=100.0, default=0.0, description="Global Translation Y" ) - offz = FloatProperty( + offz: FloatProperty( name="Loc Z", soft_min=-10.0, soft_max=10.0, min=-100.0, max=100.0, default=0.0, description="Global Translation Z" ) - rotx = FloatProperty( + rotx: FloatProperty( name="Rot X", min=-85, max=85, soft_min=-30, soft_max=30, default=0, description="X Rotation" ) - roty = FloatProperty( + roty: FloatProperty( name="Rot Y", min=-85, max=85, soft_min=-30, @@ -127,96 +127,96 @@ class MExtrude(Operator): default=0, description="Y Rotation" ) - rotz = FloatProperty( + rotz: FloatProperty( name="Rot Z", min=-85, max=85, soft_min=-30, soft_max=30, default=-0, description="Z Rotation" ) - nrotx = FloatProperty( + nrotx: FloatProperty( name="N Rot X", min=-85, max=85, soft_min=-30, soft_max=30, default=0, description="Normal X Rotation" ) - nroty = FloatProperty( + nroty: FloatProperty( name="N Rot Y", min=-85, max=85, soft_min=-30, soft_max=30, default=0, description="Normal Y Rotation" ) - nrotz = FloatProperty( + nrotz: FloatProperty( name="N Rot Z", min=-85, max=85, soft_min=-30, soft_max=30, default=-0, description="Normal Z Rotation" ) - sca = FloatProperty( + sca: FloatProperty( name="Scale", min=0.01, max=10, soft_min=0.5, soft_max=1.5, default=1.0, description="Scaling of the selected faces after extrusion" ) - var1 = FloatProperty( + var1: FloatProperty( name="Offset Var", min=-10, max=10, soft_min=-1, soft_max=1, default=0, description="Offset variation" ) - var2 = FloatProperty( + var2: FloatProperty( name="Rotation Var", min=-10, max=10, soft_min=-1, soft_max=1, default=0, description="Rotation variation" ) - var3 = FloatProperty( + var3: FloatProperty( name="Scale Noise", min=-10, max=10, soft_min=-1, soft_max=1, default=0, description="Scaling noise" ) - var4 = IntProperty( + var4: IntProperty( name="Probability", min=0, max=100, default=100, description="Probability, chance of extruding a face" ) - num = IntProperty( + num: IntProperty( name="Repeat", min=1, max=500, soft_max=100, default=5, description="Repetitions" ) - ran = IntProperty( + ran: IntProperty( name="Seed", min=-9999, max=9999, default=0, description="Seed to feed random values" ) - opt1 = BoolProperty( + opt1: BoolProperty( name="Polygon coordinates", default=True, description="Polygon coordinates, Object coordinates" ) - opt2 = BoolProperty( + opt2: BoolProperty( name="Proportional offset", default=False, description="Scale * Offset" ) - opt3 = BoolProperty( + opt3: BoolProperty( name="Per step rotation noise", default=False, description="Per step rotation noise, Initial rotation noise" ) - opt4 = BoolProperty( + opt4: BoolProperty( name="Per step scale noise", default=False, description="Per step scale noise, Initial scale noise" diff --git a/mesh_extra_tools/mesh_offset_edges.py b/mesh_extra_tools/mesh_offset_edges.py index e92c5430e5a010f315aaf679a23194171676e172..b6d760b16b8922ba280c480c5fa62cfec436d0b0 100644 --- a/mesh_extra_tools/mesh_offset_edges.py +++ b/mesh_extra_tools/mesh_offset_edges.py @@ -509,7 +509,7 @@ class OffsetEdges(Operator): "Operates only on separate Edge loops selections") bl_options = {'REGISTER', 'UNDO'} - geometry_mode = EnumProperty( + geometry_mode: EnumProperty( items=[('offset', "Offset", "Offset edges"), ('extrude', "Extrude", "Extrude edges"), ('move', "Move", "Move selected edges")], @@ -517,38 +517,38 @@ class OffsetEdges(Operator): default='offset', update=use_cashes ) - width = FloatProperty( + width: FloatProperty( name="Width", default=.2, precision=4, step=1, update=use_cashes ) - flip_width = BoolProperty( + flip_width: BoolProperty( name="Flip Width", default=False, description="Flip width direction", update=use_cashes ) - depth = FloatProperty( + depth: FloatProperty( name="Depth", default=.0, precision=4, step=1, update=use_cashes ) - flip_depth = BoolProperty( + flip_depth: BoolProperty( name="Flip Depth", default=False, description="Flip depth direction", update=use_cashes ) - depth_mode = EnumProperty( + depth_mode: EnumProperty( items=[('angle', "Angle", "Angle"), ('depth', "Depth", "Depth")], name="Depth mode", default='angle', update=use_cashes ) - angle = FloatProperty( + angle: FloatProperty( name="Angle", default=0, precision=3, step=.1, min=-2 * pi, max=2 * pi, @@ -556,33 +556,33 @@ class OffsetEdges(Operator): description="Angle", update=use_cashes ) - flip_angle = BoolProperty( + flip_angle: BoolProperty( name="Flip Angle", default=False, description="Flip Angle", update=use_cashes ) - follow_face = BoolProperty( + follow_face: BoolProperty( name="Follow Face", default=False, description="Offset along faces around" ) - mirror_modifier = BoolProperty( + mirror_modifier: BoolProperty( name="Mirror Modifier", default=False, description="Take into account of Mirror modifier" ) - edge_rail = BoolProperty( + edge_rail: BoolProperty( name="Edge Rail", default=False, description="Align vertices along inner edges" ) - edge_rail_only_end = BoolProperty( + edge_rail_only_end: BoolProperty( name="Edge Rail Only End", default=False, description="Apply edge rail to end verts only" ) - threshold = FloatProperty( + threshold: FloatProperty( name="Flat Face Threshold", default=radians(0.05), precision=5, step=1.0e-4, subtype='ANGLE', @@ -590,12 +590,12 @@ class OffsetEdges(Operator): "below this value, those faces are regarded as flat", options={'HIDDEN'} ) - caches_valid = BoolProperty( + caches_valid: BoolProperty( name="Caches Valid", default=False, options={'HIDDEN'} ) - angle_presets = EnumProperty( + angle_presets: EnumProperty( items=[('0°', "0°", "0°"), ('15°', "15°", "15°"), ('30°', "30°", "30°"), diff --git a/mesh_extra_tools/mesh_pen_tool.py b/mesh_extra_tools/mesh_pen_tool.py index cd11f5823f8c26e78efc203ae0bc6789e0961ca4..13e5708191c8c1bcdf5743e45b52f7aa8075d1b3 100644 --- a/mesh_extra_tools/mesh_pen_tool.py +++ b/mesh_extra_tools/mesh_pen_tool.py @@ -258,7 +258,7 @@ def draw_callback_px(self, context): class pen_tool_properties(PropertyGroup): - a = FloatProperty( + a: FloatProperty( name="Alpha", description="Set Font Alpha", default=1.0, @@ -266,29 +266,29 @@ class pen_tool_properties(PropertyGroup): step=10, precision=1 ) - fs = IntProperty( + fs: IntProperty( name="Size", description="Set Font Size", default=14, min=12, max=40, step=1 ) - b0 = BoolProperty( + b0: BoolProperty( name="Angles", description="Display All Angles on Drawn Edges", default=False ) - b1 = BoolProperty( + b1: BoolProperty( name="Edge Length", description="Display All Lengths of Drawn Edges", default=False ) - b2 = BoolProperty( + b2: BoolProperty( name="Mouse Location 3D", description="Display the location coordinates of the mouse cursor", default=False ) - restore_view = BoolProperty( + restore_view: BoolProperty( name="Restore View", description="After the tool has finished, is the Viewport restored\n" "to it's previous state", @@ -351,7 +351,7 @@ class pen_tool_operator(Operator): bl_label = "Pen Tool" bl_options = {"REGISTER", "UNDO", "INTERNAL"} - text_location = IntProperty( + text_location: IntProperty( name="", default=0, options={'HIDDEN'} diff --git a/mesh_extra_tools/mesh_select_tools/mesh_index_select.py b/mesh_extra_tools/mesh_select_tools/mesh_index_select.py index 492ff825702ad6ad66cd2b61ba3c44f48a625937..bc894924d22334caf9f9048876f9c3bcba3d0657 100644 --- a/mesh_extra_tools/mesh_select_tools/mesh_index_select.py +++ b/mesh_extra_tools/mesh_select_tools/mesh_index_select.py @@ -25,7 +25,7 @@ class SelVertEdgeFace(Operator): bl_description = "Select Vertices, Edges, Faces by their indices" bl_options = {"REGISTER", "UNDO"} - select_type = EnumProperty( + select_type: EnumProperty( items=[ ('VERT', "Vertices", "Select Vertices by index"), ('EDGE', "Edges", "Select Edges by index"), @@ -35,7 +35,7 @@ class SelVertEdgeFace(Operator): description="", default='VERT', ) - indice = FloatProperty( + indice: FloatProperty( name="Selected", default=0, min=0, max=100, @@ -43,17 +43,17 @@ class SelVertEdgeFace(Operator): precision=2, subtype="PERCENTAGE" ) - delta = BoolProperty( + delta: BoolProperty( name="Use Parameter", default=False, description="Select by Index / Parameter" ) - flip = BoolProperty( + flip: BoolProperty( name="Reverse Order", default=False, description="Reverse selecting order" ) - start_new = BoolProperty( + start_new: BoolProperty( name="Fresh Start", default=False, description="Start from no previous selection\n" diff --git a/mesh_extra_tools/mesh_select_tools/mesh_select_by_direction.py b/mesh_extra_tools/mesh_select_tools/mesh_select_by_direction.py index 799f600258633cb5ead8b754ff91cdb65f27b4d4..cf25cf6fc4f011745129dcc051551f4b361ecf92 100644 --- a/mesh_extra_tools/mesh_select_tools/mesh_select_by_direction.py +++ b/mesh_extra_tools/mesh_select_tools/mesh_select_by_direction.py @@ -162,7 +162,7 @@ class Select_init(Operator): "defined by a vector with coordinates X, Y, Z") bl_options = {'REGISTER', 'UNDO'} - direction = FloatVectorProperty( + direction: FloatVectorProperty( name="Direction", description="Define a vector from the inputs axis X, Y, Z\n" "Used to define the normals direction", @@ -172,7 +172,7 @@ class Select_init(Operator): step=100, precision=2 ) - divergence = FloatProperty( + divergence: FloatProperty( name="Divergence", description="The number of degrees the selection may differ from the Vector\n" "(Input is converted to radians)", @@ -183,14 +183,14 @@ class Select_init(Operator): precision=2, subtype='ANGLE' ) - extend = BoolProperty( + extend: BoolProperty( name="Extend", description="Extend the current selection", default=False ) # The spaces we use spaces = (('LOC', 'Local', ''), ('GLO', 'Global', '')) - space = EnumProperty( + space: EnumProperty( items=spaces, name="Space", description="The space to interpret the directions in", diff --git a/mesh_extra_tools/mesh_select_tools/mesh_select_by_edge_length.py b/mesh_extra_tools/mesh_select_tools/mesh_select_by_edge_length.py index 3ae489d5987b793f47e3c1ab08f3f29e1716c468..cea9976f2e02d8836528bea4255f58f4644d854d 100644 --- a/mesh_extra_tools/mesh_select_tools/mesh_select_by_edge_length.py +++ b/mesh_extra_tools/mesh_select_tools/mesh_select_by_edge_length.py @@ -183,7 +183,7 @@ class Select_init(bpy.types.Operator): "Does not work in Vertex Select mode") bl_options = {'REGISTER', 'UNDO'} - edgeLength = FloatProperty( + edgeLength: FloatProperty( name="Edge length", description="The comparison scale in Blender units", default=1.0, @@ -196,18 +196,18 @@ class Select_init(bpy.types.Operator): sizes = (('SMALL', 'Smaller', "Select items smaller or equal the size setting"), ('BIG', 'Bigger', "Select items bigger or equal to the size setting"), ('EQUAL', 'Equal', "Select edges equal to the size setting")) - edgeSize = EnumProperty( + edgeSize: EnumProperty( items=sizes, name="Edge comparison", description="Choose the relation to set edge length", default='EQUAL' ) - extend = BoolProperty( + extend: BoolProperty( name="Extend", description="Extend the current selection", default=False ) - start_new = BoolProperty( + start_new: BoolProperty( name="Fresh Start", default=False, description="Start from no previous selection" @@ -215,7 +215,7 @@ class Select_init(bpy.types.Operator): # The spaces we use spaces = (('LOC', 'Local', "Use Local space"), ('GLO', 'Global', "Use Global Space")) - space = EnumProperty( + space: EnumProperty( items=spaces, name="Space", description="The space to interpret the directions in", diff --git a/mesh_extra_tools/mesh_select_tools/mesh_select_by_pi.py b/mesh_extra_tools/mesh_select_tools/mesh_select_by_pi.py index f002d0d1c82e778a1871b386f2cf50ea7f2f28bd..cecf564c89f29fd8fe53cbfee60dca63871b2832 100644 --- a/mesh_extra_tools/mesh_select_tools/mesh_select_by_pi.py +++ b/mesh_extra_tools/mesh_select_tools/mesh_select_by_pi.py @@ -164,22 +164,22 @@ class Select_init(Operator): "Number Pi (3.14 etc.) or e (2.71828 - Euler's number)") bl_options = {'REGISTER', 'UNDO'} - e = BoolProperty( + e: BoolProperty( name="Use e", description="Use e as the base of selection instead of pi", default=False ) - invert = BoolProperty( + invert: BoolProperty( name="Invert", description="Invert the selection result", default=False ) - extend = BoolProperty( + extend: BoolProperty( name="Extend", description="Extend the current selection", default=False ) - start_new = BoolProperty( + start_new: BoolProperty( name="Fresh Start", default=False, description="Start from no previous selection" diff --git a/mesh_extra_tools/mesh_select_tools/mesh_select_by_type.py b/mesh_extra_tools/mesh_select_tools/mesh_select_by_type.py index 534740a11709f5a1ecd2f7470f286bd20e386d02..7afe80fe2e1caaddca7747f6d5b65d94363dd338 100644 --- a/mesh_extra_tools/mesh_select_tools/mesh_select_by_type.py +++ b/mesh_extra_tools/mesh_select_tools/mesh_select_by_type.py @@ -32,14 +32,14 @@ class DATA_OP_facetype_select(Operator): bl_description = "Select all faces of a certain type" bl_options = {'REGISTER', 'UNDO'} - face_type = EnumProperty( + face_type: EnumProperty( name="Select faces:", items=(("3", "Triangles", "Faces made up of 3 vertices"), ("4", "Quads", "Faces made up of 4 vertices"), ("5", "Ngons", "Faces made up of 5 and more vertices")), default="5" ) - extend = BoolProperty( + extend: BoolProperty( name="Extend", description="Extend Selection", default=False diff --git a/mesh_extra_tools/mesh_select_tools/mesh_select_connected_faces.py b/mesh_extra_tools/mesh_select_tools/mesh_select_connected_faces.py index 1198f9ff980e3bad6f2f63c632f6211dc99ab37e..2c574f2df7d1e172db8824f70c42ee3e96d5fcf4 100644 --- a/mesh_extra_tools/mesh_select_tools/mesh_select_connected_faces.py +++ b/mesh_extra_tools/mesh_select_tools/mesh_select_connected_faces.py @@ -107,14 +107,14 @@ class Select_init(Operator): bl_options = {'REGISTER', 'UNDO'} # Iterations - iterations = IntProperty( + iterations: IntProperty( name="Iterations", description="Run the selection the given number of times", default=1, min=0, max=300, soft_min=0, soft_max=100 ) - extend = BoolProperty( + extend: BoolProperty( name="Extend", description="Extend the current selection", default=False diff --git a/mesh_extra_tools/mesh_vertex_chamfer.py b/mesh_extra_tools/mesh_vertex_chamfer.py index a80ba270c893aac9d672bee342d4ea554997c862..d3a4bc7b03a9ef920ba5023305ca0105712851ff 100644 --- a/mesh_extra_tools/mesh_vertex_chamfer.py +++ b/mesh_extra_tools/mesh_vertex_chamfer.py @@ -44,26 +44,26 @@ class VertexChamfer(Operator): bl_description = "Tri chamfer selected vertices" bl_options = {'REGISTER', 'UNDO'} - factor = FloatProperty( + factor: FloatProperty( name="Factor", description="Size of the Champfer", default=0.1, min=0.0, soft_max=1.0 ) - relative = BoolProperty( + relative: BoolProperty( name="Relative", description="If Relative, Champfer size is relative to the edge length", default=True ) - dissolve = BoolProperty( + dissolve: BoolProperty( name="Remove", description="Remove/keep the original selected vertices\n" "Remove creates a new triangle face between the Champfer edges,\n" "similar to the Dissolve Vertices operator", default=True ) - displace = FloatProperty( + displace: FloatProperty( name="Displace", description="Active only if Remove option is disabled\n" "Displaces the original selected vertices along the normals\n" diff --git a/mesh_extra_tools/pkhg_faces.py b/mesh_extra_tools/pkhg_faces.py index 08faf560b6f78e2d50dea3d6fe3e73f9a9d574f6..52ecdbc9c364ee38d81f60844b78833752af5dd1 100644 --- a/mesh_extra_tools/pkhg_faces.py +++ b/mesh_extra_tools/pkhg_faces.py @@ -31,111 +31,111 @@ class MESH_OT_add_faces_to_object(Operator): bl_description = "Set parameters and build object with added faces" bl_options = {'REGISTER', 'UNDO', 'PRESET'} - reverse_faces = BoolProperty( + reverse_faces: BoolProperty( name="Reverse Faces", default=False, description="Revert the normals of selected faces" ) - name_source_object = StringProperty( + name_source_object: StringProperty( name="Mesh", description="Choose a Source Mesh", default="Cube" ) - remove_start_faces = BoolProperty( + remove_start_faces: BoolProperty( name="Remove Start Faces", default=True, description="Make a choice about removal of Original Faces" ) - base_height = FloatProperty( + base_height: FloatProperty( name="Base Height", min=-20, soft_max=10, max=20, default=0.2, description="Set general Base Height" ) - use_relative_base_height = BoolProperty( + use_relative_base_height: BoolProperty( name="Relative Base Height", default=False, description="Relative or absolute Base Height" ) - second_height = FloatProperty( + second_height: FloatProperty( name="2nd height", min=-5, soft_max=5, max=20, default=0.2, description="Second height for various shapes" ) - width = FloatProperty( + width: FloatProperty( name="Width Faces", min=-20, max=20, default=0.5, description="Set general width" ) - repeat_extrude = IntProperty( + repeat_extrude: IntProperty( name="Repeat", min=1, soft_max=5, max=20, description="For longer base" ) - move_inside = FloatProperty( + move_inside: FloatProperty( name="Move Inside", min=0.0, max=1.0, default=0.5, description="How much move to inside" ) - thickness = FloatProperty( + thickness: FloatProperty( name="Thickness", soft_min=0.01, min=0, soft_max=5.0, max=20.0, default=0 ) - depth = FloatProperty( + depth: FloatProperty( name="Depth", min=-5, soft_max=5.0, max=20.0, default=0 ) - collapse_edges = BoolProperty( + collapse_edges: BoolProperty( name="Make Point", default=False, description="Collapse the vertices of edges" ) - spike_base_width = FloatProperty( + spike_base_width: FloatProperty( name="Spike Base Width", default=0.4, min=-4.0, soft_max=1, max=20, description="Base width of a spike" ) - base_height_inset = FloatProperty( + base_height_inset: FloatProperty( name="Base Height Inset", default=0.0, min=-5, max=5, description="To elevate or drop the Base height Inset" ) - top_spike = FloatProperty( + top_spike: FloatProperty( name="Top Spike", default=1.0, min=-10.0, max=10.0, description="The Base Height of a spike" ) - top_extra_height = FloatProperty( + top_extra_height: FloatProperty( name="Top Extra Height", default=0.0, min=-10.0, max=10.0, description="Add extra height" ) - step_with_real_spike = BoolProperty( + step_with_real_spike: BoolProperty( name="Step with Real Spike", default=False, description="In stepped, use a real spike" ) - use_relative = BoolProperty( + use_relative: BoolProperty( name="Use Relative", default=False, description="Change size using area, min or max" ) - face_types = EnumProperty( + face_types: EnumProperty( name="Face Types", description="Different types of Faces", default="no", @@ -151,36 +151,36 @@ class MESH_OT_add_faces_to_object(Operator): ('bar', "Bar", "Bar"), ] ) - strange_boxed_effect = BoolProperty( + strange_boxed_effect: BoolProperty( name="Strange Effect", default=False, description="Do not show one extrusion" ) - use_boundary = BoolProperty( + use_boundary: BoolProperty( name="Use Boundary", default=True ) - use_even_offset = BoolProperty( + use_even_offset: BoolProperty( name="Even Offset", default=True ) - use_relative_offset = BoolProperty( + use_relative_offset: BoolProperty( name="Relative Offset", default=True ) - use_edge_rail = BoolProperty( + use_edge_rail: BoolProperty( name="Edge Rail", default=False ) - use_outset = BoolProperty( + use_outset: BoolProperty( name="Outset", default=False ) - use_select_inset = BoolProperty( + use_select_inset: BoolProperty( name="Inset", default=False ) - use_interpolate = BoolProperty( + use_interpolate: BoolProperty( name="Interpolate", default=True ) diff --git a/mesh_extra_tools/random_vertices.py b/mesh_extra_tools/random_vertices.py index cf0ee22435dba5abdf3660ea9f69719e914ffb44..bd8782188fdef418aa70c4d93caf73afb758db84 100644 --- a/mesh_extra_tools/random_vertices.py +++ b/mesh_extra_tools/random_vertices.py @@ -94,12 +94,12 @@ class MESH_OT_random_vertices(Operator): "or a multiplication of them and the Vertex Weights") bl_options = {'REGISTER', 'UNDO'} - vgfilter = BoolProperty( + vgfilter: BoolProperty( name="Vertex Group", description="Use Vertex Weight defined in the Active Group", default=False ) - factor = FloatProperty( + factor: FloatProperty( name="Factor", description="Base Multiplier of the randomization effect", default=1 diff --git a/mesh_extra_tools/split_solidify.py b/mesh_extra_tools/split_solidify.py index 6b830543285b3e5293dfb1a3acedd0a05ca8fb34..4f4aaedfadbd197a33930e8d30e27618076197ce 100644 --- a/mesh_extra_tools/split_solidify.py +++ b/mesh_extra_tools/split_solidify.py @@ -109,7 +109,7 @@ class MESH_OT_split_solidify(Operator): bl_description = "Split and Solidify selected Faces" bl_options = {"REGISTER", "UNDO"} - distance = FloatProperty( + distance: FloatProperty( name="", description="Distance of the splitted Faces to the original geometry", default=0.4, @@ -117,7 +117,7 @@ class MESH_OT_split_solidify(Operator): step=1, precision=3 ) - thickness = FloatProperty( + thickness: FloatProperty( name="", description="Thickness of the splitted Faces", default=0.04, @@ -125,7 +125,7 @@ class MESH_OT_split_solidify(Operator): step=1, precision=3 ) - random_dist = FloatProperty( + random_dist: FloatProperty( name="", description="Randomization factor of the splitted Faces' location", default=0.06, @@ -133,16 +133,16 @@ class MESH_OT_split_solidify(Operator): step=1, precision=3 ) - loc_random = BoolProperty( + loc_random: BoolProperty( name="Random", description="Randomize the locations of splitted faces", default=False ) - del_original = BoolProperty( + del_original: BoolProperty( name="Delete original faces", default=True ) - normal_extr = EnumProperty( + normal_extr: EnumProperty( items=(('opt0', "Face", "Solidify along Face Normals"), ('opt1', "Vertex", "Solidify along Vertex Normals")), name="Normal", diff --git a/mesh_extra_tools/vertex_align.py b/mesh_extra_tools/vertex_align.py index e5570fd1fbde9aa783d20e1286cf61bcd4dc4cba..6b9d2a51c8b9e1361945fc7498050df8fa3915a5 100644 --- a/mesh_extra_tools/vertex_align.py +++ b/mesh_extra_tools/vertex_align.py @@ -203,7 +203,7 @@ class Vertex_align_coord_menu(Operator): bl_description = "Change the custom coordinates for aligning" bl_options = {'REGISTER', 'UNDO'} - def_axis_coord = FloatVectorProperty( + def_axis_coord: FloatVectorProperty( name="", description="Enter the values of coordinates", default=(0.0, 0.0, 0.0), diff --git a/mesh_inset/__init__.py b/mesh_inset/__init__.py index 973b57c4f21c0df022bbe5164286cd9d9a010620..94c9327dfb7e0aaca8dcdb937f163d9feb060993 100644 --- a/mesh_inset/__init__.py +++ b/mesh_inset/__init__.py @@ -58,7 +58,7 @@ class Inset(bpy.types.Operator): bl_description = "Make an inset polygon inside selection" bl_options = {'REGISTER', 'UNDO'} - inset_amount = FloatProperty(name="Amount", + inset_amount: FloatProperty(name="Amount", description="Amount to move inset edges", default=5.0, min=0.0, @@ -66,7 +66,7 @@ class Inset(bpy.types.Operator): soft_min=0.0, soft_max=100.0, unit='LENGTH') - inset_height = FloatProperty(name="Height", + inset_height: FloatProperty(name="Height", description="Amount to raise inset faces", default=0.0, min=-10000.0, @@ -74,10 +74,10 @@ class Inset(bpy.types.Operator): soft_min=-500.0, soft_max=500.0, unit='LENGTH') - region = BoolProperty(name="Region", + region: BoolProperty(name="Region", description="Inset selection as one region?", default=True) - scale = EnumProperty(name="Scale", + scale: EnumProperty(name="Scale", description="Scale for amount", items=[ ('PERCENT', "Percent", diff --git a/mesh_relax.py b/mesh_relax.py index 1b177023c80310ada6b3f8949b3dbd4b2f1081ca..2d8022fcdac2dfe7e846e555f2d839a40bc1f70e 100644 --- a/mesh_relax.py +++ b/mesh_relax.py @@ -97,7 +97,7 @@ class Relax(bpy.types.Operator): bl_label = 'Relax' bl_options = {'REGISTER', 'UNDO'} - iterations = IntProperty(name="Relax iterations", + iterations: IntProperty(name="Relax iterations", default=1, min=0, max=100, soft_min=0, soft_max=10) @classmethod diff --git a/mesh_tissue/colors_groups_exchanger.py b/mesh_tissue/colors_groups_exchanger.py index 9b48b2fa45761dbea9dbda705ce0fa7f9a952626..a511e951bc4fa7a4e4cf8ee4564a68613d0dc680 100644 --- a/mesh_tissue/colors_groups_exchanger.py +++ b/mesh_tissue/colors_groups_exchanger.py @@ -65,27 +65,27 @@ class vertex_colors_to_vertex_groups(Operator): bl_description = ("Convert the active Vertex Color into a Vertex Group") bl_options = {'REGISTER', 'UNDO'} - red = BoolProperty( + red: BoolProperty( name="Red Channel", default=False, description="Convert Red Channel" ) - green = BoolProperty( + green: BoolProperty( name="Green Channel", default=False, description="Convert Green Channel" ) - blue = BoolProperty( + blue: BoolProperty( name="Blue Channel", default=False, description="Convert Blue Channel" ) - value = BoolProperty( + value: BoolProperty( name="Value Channel", default=True, description="Convert Value Channel" ) - invert = BoolProperty( + invert: BoolProperty( name="Invert", default=False, description="Invert all Color Channels" @@ -184,7 +184,7 @@ class vertex_group_to_vertex_colors(Operator): bl_description = ("Convert the active Vertex Group into a Vertex Color") bl_options = {'REGISTER', 'UNDO'} - channel = EnumProperty( + channel: EnumProperty( items=[('Blue', 'Blue Channel', 'Convert to Blue Channel'), ('Green', 'Green Channel', 'Convert to Green Channel'), ('Red', 'Red Channel', 'Convert to Red Channel'), @@ -196,7 +196,7 @@ class vertex_group_to_vertex_colors(Operator): options={'LIBRARY_EDITABLE'} ) - invert = BoolProperty( + invert: BoolProperty( name="Invert", default=False, description="Invert Color Channel" @@ -282,26 +282,26 @@ class curvature_to_vertex_groups(Operator): "mesh. Is based on Dirty Vertex Color") bl_options = {'REGISTER', 'UNDO'} - invert = BoolProperty( + invert: BoolProperty( name="Invert", default=False, description="Invert Values" ) - blur_strength = FloatProperty( + blur_strength: FloatProperty( name="Blur Strength", default=1, min=0.001, max=1, description="Blur strength per iteration" ) - blur_iterations = IntProperty( + blur_iterations: IntProperty( name="Blur Iterations", default=1, min=0, max=40, description="Number of times to blur the values" ) - min_angle = FloatProperty( + min_angle: FloatProperty( name="Min Angle", default=0, min=0, @@ -309,7 +309,7 @@ class curvature_to_vertex_groups(Operator): subtype='ANGLE', description="Minimum angle" ) - max_angle = FloatProperty( + max_angle: FloatProperty( name="Max Angle", default=pi, min=pi / 2, @@ -317,7 +317,7 @@ class curvature_to_vertex_groups(Operator): subtype='ANGLE', description="Maximum angle" ) - invert = BoolProperty( + invert: BoolProperty( name="Invert", default=False, description="Invert the curvature map" @@ -362,7 +362,7 @@ class face_area_to_vertex_groups(Operator): "faces") bl_options = {'REGISTER', 'UNDO'} - invert = BoolProperty( + invert: BoolProperty( name="Invert", default=False, description="Invert Values" @@ -425,35 +425,35 @@ class harmonic_weight(Operator): bl_description = "Create an harmonic variation of the active Vertex Group" bl_options = {'REGISTER', 'UNDO'} - freq = FloatProperty( + freq: FloatProperty( name="Frequency", default=20, soft_min=0, soft_max=100, description="Wave frequency" ) - amp = FloatProperty( + amp: FloatProperty( name="Amplitude", default=1, soft_min=0, soft_max=10, description="Wave amplitude" ) - midlevel = FloatProperty( + midlevel: FloatProperty( name="Midlevel", default=0, min=-1, max=1, description="Midlevel" ) - add = FloatProperty( + add: FloatProperty( name="Add", default=0, min=-1, max=1, description="Add to the Weight" ) - mult = FloatProperty( + mult: FloatProperty( name="Multiply", default=0, min=0, diff --git a/mesh_tissue/dual_mesh.py b/mesh_tissue/dual_mesh.py index 3b20e138b05eba8ca6ae3533dfdf189a22042e3c..97f0123e8c53480208cda3c912405bde03325af6 100644 --- a/mesh_tissue/dual_mesh.py +++ b/mesh_tissue/dual_mesh.py @@ -55,7 +55,7 @@ class dual_mesh(Operator): bl_description = ("Convert a generic mesh into a polygonal mesh") bl_options = {'REGISTER', 'UNDO'} - quad_method = EnumProperty( + quad_method: EnumProperty( items=[('BEAUTY', 'Beauty', 'Split the quads in nice triangles, slower method'), ('FIXED', 'Fixed', @@ -70,7 +70,7 @@ class dual_mesh(Operator): default="FIXED", options={'LIBRARY_EDITABLE'} ) - polygon_method = EnumProperty( + polygon_method: EnumProperty( items=[ ('BEAUTY', 'Beauty', 'Arrange the new triangles evenly'), ('CLIP', 'Clip', @@ -80,12 +80,12 @@ class dual_mesh(Operator): default="BEAUTY", options={'LIBRARY_EDITABLE'} ) - preserve_borders = BoolProperty( + preserve_borders: BoolProperty( name="Preserve Borders", default=True, description="Preserve original borders" ) - apply_modifiers = BoolProperty( + apply_modifiers: BoolProperty( name="Apply Modifiers", default=True, description="Apply object's modifiers" diff --git a/mesh_tissue/lattice.py b/mesh_tissue/lattice.py index 737b4c870e8ec4a2e1e7011409f5dc4facc842c3..73f4c33ccca5a42c9db235ef032a2d4a09606b12 100644 --- a/mesh_tissue/lattice.py +++ b/mesh_tissue/lattice.py @@ -173,80 +173,80 @@ class lattice_along_surface(Operator): "Lattice's topology") bl_options = {'REGISTER', 'UNDO'} - set_parent = BoolProperty( + set_parent: BoolProperty( name="Set Parent", default=True, description="Automatically set the Lattice as parent" ) - flipNormals = BoolProperty( + flipNormals: BoolProperty( name="Flip Normals", default=False, description="Flip normals direction" ) - swapUV = BoolProperty( + swapUV: BoolProperty( name="Swap UV", default=False, description="Flip grid's U and V" ) - flipU = BoolProperty( + flipU: BoolProperty( name="Flip U", default=False, description="Flip grid's U") - flipV = BoolProperty( + flipV: BoolProperty( name="Flip V", default=False, description="Flip grid's V" ) - flipW = BoolProperty( + flipW: BoolProperty( name="Flip W", default=False, description="Flip grid's W" ) - use_groups = BoolProperty( + use_groups: BoolProperty( name="Vertex Group", default=False, description="Use active Vertex Group for lattice's thickness" ) - high_quality_lattice = BoolProperty( + high_quality_lattice: BoolProperty( name="High quality", default=True, description="Increase the the subdivisions in normal direction for a " "more correct result" ) - hide_lattice = BoolProperty( + hide_lattice: BoolProperty( name="Hide Lattice", default=True, description="Automatically hide the Lattice object" ) - scale_x = FloatProperty( + scale_x: FloatProperty( name="Scale X", default=1, min=0.001, max=1, description="Object scale" ) - scale_y = FloatProperty( + scale_y: FloatProperty( name="Scale Y", default=1, min=0.001, max=1, description="Object scale" ) - scale_z = FloatProperty( + scale_z: FloatProperty( name="Scale Z", default=1, min=0.001, max=1, description="Object scale" ) - thickness = FloatProperty( + thickness: FloatProperty( name="Thickness", default=1, soft_min=0, soft_max=5, description="Lattice thickness" ) - displace = FloatProperty( + displace: FloatProperty( name="Displace", default=0, soft_min=-1, diff --git a/mesh_tissue/tessellate_numpy.py b/mesh_tissue/tessellate_numpy.py index d2361cb46db2d7035cb9caef7aecdd25818181e5..f6fb97c03058e5349df6265dc328a4c1d2428525 100644 --- a/mesh_tissue/tessellate_numpy.py +++ b/mesh_tissue/tessellate_numpy.py @@ -432,24 +432,24 @@ def store_parameters(operator, ob): class tissue_tessellate_prop(PropertyGroup): - generator = StringProperty() - component = StringProperty() - offset = FloatProperty() - zscale = FloatProperty(default=1) - merge = BoolProperty() - merge_thres = FloatProperty() - gen_modifiers = BoolProperty() - com_modifiers = BoolProperty() - mode = StringProperty() - rotation_mode = StringProperty() - scale_mode = StringProperty() - fill_mode = StringProperty() - bool_random = BoolProperty() - random_seed = IntProperty() - vertexgroup = StringProperty() - bool_vertex_group = BoolProperty() - bool_selection = BoolProperty() - bool_shapekeys = BoolProperty() + generator: StringProperty() + component: StringProperty() + offset: FloatProperty() + zscale: FloatProperty(default=1) + merge: BoolProperty() + merge_thres: FloatProperty() + gen_modifiers: BoolProperty() + com_modifiers: BoolProperty() + mode: StringProperty() + rotation_mode: StringProperty() + scale_mode: StringProperty() + fill_mode: StringProperty() + bool_random: BoolProperty() + random_seed: IntProperty() + vertexgroup: StringProperty() + bool_vertex_group: BoolProperty() + bool_selection: BoolProperty() + bool_shapekeys: BoolProperty() class tessellate(Operator): @@ -459,23 +459,23 @@ class tessellate(Operator): "faces, adapting the shape to the different faces") bl_options = {'REGISTER', 'UNDO'} - object_name = StringProperty( + object_name: StringProperty( name="", description="Name of the generated object" ) - zscale = FloatProperty( + zscale: FloatProperty( name="Scale", default=1, soft_min=0, soft_max=10, description="Scale factor for the component thickness" ) - scale_mode = EnumProperty( + scale_mode: EnumProperty( items=(('CONSTANT', "Constant", ""), ('ADAPTIVE', "Proportional", "")), default='CONSTANT', name="Z-Scale according to faces size" ) - offset = FloatProperty( + offset: FloatProperty( name="Surface Offset", default=0, min=-1, max=1, @@ -483,77 +483,77 @@ class tessellate(Operator): soft_max=1, description="Surface offset" ) - mode = EnumProperty( + mode: EnumProperty( items=(('CONSTANT', "Constant", ""), ('ADAPTIVE', "Adaptive", "")), default='ADAPTIVE', name="Component Mode" ) - rotation_mode = EnumProperty( + rotation_mode: EnumProperty( items=(('RANDOM', "Random", ""), ('UV', "Active UV", ""), ('DEFAULT', "Default", "")), default='DEFAULT', name="Component Rotation" ) - fill_mode = EnumProperty( + fill_mode: EnumProperty( items=(('QUAD', "Quad", ""), ('FAN', "Fan", "")), default='QUAD', name="Fill Mode" ) - gen_modifiers = BoolProperty( + gen_modifiers: BoolProperty( name="Generator Modifiers", default=False, description="Apply modifiers to base object" ) - com_modifiers = BoolProperty( + com_modifiers: BoolProperty( name="Component Modifiers", default=False, description="Apply modifiers to component object" ) - merge = BoolProperty( + merge: BoolProperty( name="Merge", default=False, description="Merge vertices in adjacent duplicates" ) - merge_thres = FloatProperty( + merge_thres: FloatProperty( name="Distance", default=0.001, soft_min=0, soft_max=10, description="Limit below which to merge vertices" ) - generator = StringProperty( + generator: StringProperty( name="", description="Base object for the tessellation" ) - component = StringProperty( + component: StringProperty( name="", description="Component object for the tessellation" ) - bool_random = BoolProperty( + bool_random: BoolProperty( name="Randomize", default=False, description="Randomize component rotation" ) - random_seed = IntProperty( + random_seed: IntProperty( name="Seed", default=0, soft_min=0, soft_max=10, description="Random seed" ) - bool_vertex_group = BoolProperty( + bool_vertex_group: BoolProperty( name="Map Vertex Group", default=False, description="Map the active " "Vertex Group from the Base object to generated geometry" ) - bool_selection = BoolProperty( + bool_selection: BoolProperty( name="On selected Faces", default=False, description="Create Tessellation only on selected faces" ) - bool_shapekeys = BoolProperty( + bool_shapekeys: BoolProperty( name="Use Shape Keys", default=False, description="Use component's active Shape Key according to " @@ -1046,23 +1046,23 @@ class settings_tessellate(Operator): "Allow also to change tessellation's parameters") bl_options = {'REGISTER', 'UNDO'} - object_name = StringProperty( + object_name: StringProperty( name="", description="Name of the generated object" ) - zscale = FloatProperty( + zscale: FloatProperty( name="Scale", default=1, soft_min=0, soft_max=10, description="Scale factor for the component thickness" ) - scale_mode = EnumProperty( + scale_mode: EnumProperty( items=(('CONSTANT', "Constant", ""), ('ADAPTIVE', "Proportional", "")), default='ADAPTIVE', name="Scale variation" ) - offset = FloatProperty( + offset: FloatProperty( name="Surface Offset", default=0, min=-1, max=1, @@ -1070,76 +1070,76 @@ class settings_tessellate(Operator): soft_max=1, description="Surface offset" ) - mode = EnumProperty( + mode: EnumProperty( items=(('CONSTANT', "Constant", ""), ('ADAPTIVE', "Adaptive", "")), default='ADAPTIVE', name="Component Mode" ) - rotation_mode = EnumProperty( + rotation_mode: EnumProperty( items=(('RANDOM', "Random", ""), ('UV', "Active UV", ""), ('DEFAULT', "Default", "")), default='DEFAULT', name="Component Rotation" ) - fill_mode = EnumProperty( + fill_mode: EnumProperty( items=(('QUAD', "Quad", ""), ('FAN', "Fan", "")), default='QUAD', name="Fill Mode" ) - gen_modifiers = BoolProperty( + gen_modifiers: BoolProperty( name="Generator Modifiers", default=False, description="Apply modifiers to base object" ) - com_modifiers = BoolProperty( + com_modifiers: BoolProperty( name="Component Modifiers", default=False, description="Apply modifiers to component object" ) - merge = BoolProperty( + merge: BoolProperty( name="Merge", default=False, description="Merge vertices in adjacent duplicates" ) - merge_thres = FloatProperty( + merge_thres: FloatProperty( name="Distance", default=0.001, soft_min=0, soft_max=10, description="Limit below which to merge vertices" ) - generator = StringProperty( + generator: StringProperty( name="", description="Base object for the tessellation" ) - component = StringProperty( + component: StringProperty( name="", description="Component object for the tessellation" ) - bool_random = BoolProperty( + bool_random: BoolProperty( name="Randomize", default=False, description="Randomize component rotation" ) - random_seed = IntProperty( + random_seed: IntProperty( name="Seed", default=0, soft_min=0, soft_max=10, description="Random seed" ) - bool_vertex_group = BoolProperty( + bool_vertex_group: BoolProperty( name="Map Vertex Group", default=False, description="Map on generated " "geometry the active Vertex Group from the base object" ) - bool_selection = BoolProperty( + bool_selection: BoolProperty( name="On selected Faces", default=False, description="Create Tessellation only on select faces" ) - bool_shapekeys = BoolProperty( + bool_shapekeys: BoolProperty( name="Use Shape Keys", default=False, description="Use component's active Shape Key according to active " diff --git a/mesh_tissue/uv_to_mesh.py b/mesh_tissue/uv_to_mesh.py index f502c1478b84d2aa71e12cc81746729816e14172..928fa3f5fa01bc28b4ffb1cfb2f85079f2c658dd 100644 --- a/mesh_tissue/uv_to_mesh.py +++ b/mesh_tissue/uv_to_mesh.py @@ -53,22 +53,22 @@ class uv_to_mesh(Operator): bl_description = ("Create a new Mesh based on active UV") bl_options = {'REGISTER', 'UNDO'} - apply_modifiers = BoolProperty( + apply_modifiers: BoolProperty( name="Apply Modifiers", default=False, description="Apply object's modifiers" ) - vertex_groups = BoolProperty( + vertex_groups: BoolProperty( name="Keep Vertex Groups", default=False, description="Transfer all the Vertex Groups" ) - materials = BoolProperty( + materials: BoolProperty( name="Keep Materials", default=True, description="Transfer all the Materials" ) - auto_scale = BoolProperty( + auto_scale: BoolProperty( name="Resize", default=True, description="Scale the new object in order to preserve the average surface area" diff --git a/mocap/__init__.py b/mocap/__init__.py index d2a1c57b04c1b57db6f8e22a72969d108cccc72e..ca5fe32f7d6ed7833e519b0d0c8222cdb8e9bc0b 100644 --- a/mocap/__init__.py +++ b/mocap/__init__.py @@ -73,99 +73,99 @@ def hasIKConstraint(pose_bone): class MocapConstraint(bpy.types.PropertyGroup): - name = StringProperty(name="Name", + name: StringProperty(name="Name", default="Mocap Fix", description="Name of Mocap Fix", update=mocap_constraints.setConstraint) - constrained_bone = StringProperty(name="Bone", + constrained_bone: StringProperty(name="Bone", default="", description="Constrained Bone", update=mocap_constraints.updateConstraintBoneType) - constrained_boneB = StringProperty(name="Bone (2)", + constrained_boneB: StringProperty(name="Bone (2)", default="", description="Other Constrained Bone (optional, depends on type)", update=mocap_constraints.setConstraint) - s_frame = IntProperty(name="S", + s_frame: IntProperty(name="S", default=0, description="Start frame of Fix", update=mocap_constraints.setConstraint) - e_frame = IntProperty(name="E", + e_frame: IntProperty(name="E", default=100, description="End frame of Fix", update=mocap_constraints.setConstraint) - smooth_in = IntProperty(name="In", + smooth_in: IntProperty(name="In", default=10, description="Number of frames to smooth in", update=mocap_constraints.setConstraint, min=0) - smooth_out = IntProperty(name="Out", + smooth_out: IntProperty(name="Out", default=10, description="Number of frames to smooth out", update=mocap_constraints.setConstraint, min=0) - targetMesh = StringProperty(name="Mesh", + targetMesh: StringProperty(name="Mesh", default="", description="Target of Fix - Mesh (optional, depends on type)", update=mocap_constraints.setConstraint) - active = BoolProperty(name="Active", + active: BoolProperty(name="Active", default=True, description="Fix is active", update=mocap_constraints.setConstraint) - show_expanded = BoolProperty(name="Show Expanded", + show_expanded: BoolProperty(name="Show Expanded", default=True, description="Fix is fully shown") - targetPoint = FloatVectorProperty(name="Point", size=3, + targetPoint: FloatVectorProperty(name="Point", size=3, subtype="XYZ", default=(0.0, 0.0, 0.0), description="Target of Fix - Point", update=mocap_constraints.setConstraint) - targetDist = FloatProperty(name="Offset", + targetDist: FloatProperty(name="Offset", default=0.0, description="Distance and Floor Fixes - Desired offset", update=mocap_constraints.setConstraint) - targetSpace = EnumProperty( + targetSpace: EnumProperty( items=[("WORLD", "World Space", "Evaluate target in global space"), ("LOCAL", "Object space", "Evaluate target in object space"), ("constrained_boneB", "Other Bone Space", "Evaluate target in specified other bone space")], name="Space", description="In which space should Point type target be evaluated", update=mocap_constraints.setConstraint) - type = EnumProperty(name="Type of constraint", + type: EnumProperty(name="Type of constraint", items=[("point", "Maintain Position", "Bone is at a specific point"), ("freeze", "Maintain Position at frame", "Bone does not move from location specified in target frame"), ("floor", "Stay above", "Bone does not cross specified mesh object eg floor"), ("distance", "Maintain distance", "Target bones maintained specified distance")], description="Type of Fix", update=mocap_constraints.updateConstraintBoneType) - real_constraint = StringProperty() - real_constraint_bone = StringProperty() + real_constraint: StringProperty() + real_constraint_bone: StringProperty() # Animation Stitch Settings, used for animation stitching of 2 retargeted animations. class AnimationStitchSettings(bpy.types.PropertyGroup): - first_action = StringProperty(name="Action 1", + first_action: StringProperty(name="Action 1", description="First action in stitch") - second_action = StringProperty(name="Action 2", + second_action: StringProperty(name="Action 2", description="Second action in stitch") - blend_frame = IntProperty(name="Stitch frame", + blend_frame: IntProperty(name="Stitch frame", description="Frame to locate stitch on") - blend_amount = IntProperty(name="Blend amount", + blend_amount: IntProperty(name="Blend amount", description="Size of blending transition, on both sides of the stitch", default=10) - second_offset = IntProperty(name="Second offset", + second_offset: IntProperty(name="Second offset", description="Frame offset for 2nd animation, where it should start", default=10) - stick_bone = StringProperty(name="Stick Bone", + stick_bone: StringProperty(name="Stick Bone", description="Bone to freeze during transition", default="") # MocapNLA Tracks. Stores which tracks/actions are associated with each retargeted animation. class MocapNLATracks(bpy.types.PropertyGroup): - name = StringProperty() - base_track = StringProperty() - auto_fix_track = StringProperty() - manual_fix_track = StringProperty() - stride_action = StringProperty() + name: StringProperty() + base_track: StringProperty() + auto_fix_track: StringProperty() + manual_fix_track: StringProperty() + stride_action: StringProperty() #Update function for Advanced Retarget boolean variable. @@ -231,7 +231,7 @@ def toggleIKBone(self, context): #MocapMap class for storing mapping on enduser performer, # where a bone may be linked to more than one on the performer class MocapMapping(bpy.types.PropertyGroup): - name = StringProperty() + name: StringProperty() # Disabling for now [#28933] - campbell ''' @@ -543,7 +543,7 @@ class OBJECT_OT_SelectMapBoneButton(bpy.types.Operator): """Select a bone for faster mapping""" bl_idname = "mocap.selectmap" bl_label = "Select Mapping Bone" - perf_bone = StringProperty() + perf_bone: StringProperty() def execute(self, context): enduser_obj = bpy.context.active_object @@ -706,7 +706,7 @@ class MOCAP_OT_AddMocapFix(bpy.types.Operator): """artifacts following the retarget""" bl_idname = "mocap.addmocapfix" bl_label = "Add Mocap Fix" - type = EnumProperty(name="Type of Fix", + type: EnumProperty(name="Type of Fix", items=[("point", "Maintain Position", "Bone is at a specific point"), ("freeze", "Maintain Position at frame", "Bone does not move from location specified in target frame"), ("floor", "Stay above", "Bone does not cross specified mesh object eg floor"), @@ -731,7 +731,7 @@ class OBJECT_OT_RemoveMocapConstraint(bpy.types.Operator): """Remove this post-retarget fix""" bl_idname = "mocap.removeconstraint" bl_label = "Remove Mocap Fix" - constraint = IntProperty() + constraint: IntProperty() def execute(self, context): enduser_obj = bpy.context.active_object diff --git a/netrender/ui.py b/netrender/ui.py index bcd83197dd8193d7dbba4f73bb4777e6afcec4a5..0fe0ac84805dbcb0c5e852159efa15f2d5f02b9e 100644 --- a/netrender/ui.py +++ b/netrender/ui.py @@ -374,7 +374,7 @@ class NetRenderSlave(bpy.types.PropertyGroup): @classmethod def register(NetRenderSlave): - NetRenderSlave.name = StringProperty( + NetRenderSlave.name: StringProperty( name="Name of the slave", description="", maxlen = 64, @@ -384,7 +384,7 @@ class NetRenderJob(bpy.types.PropertyGroup): @classmethod def register(NetRenderJob): - NetRenderJob.name = StringProperty( + NetRenderJob.name: StringProperty( name="Name of the job", description="", maxlen = 128, @@ -398,78 +398,78 @@ class NetRenderSettings(bpy.types.PropertyGroup): netsettings = context.scene.network_render verify_address(netsettings, True) - NetRenderSettings.server_address = StringProperty( + NetRenderSettings.server_address: StringProperty( name="Server address", description="IP or name of the master render server", maxlen = 128, default = "[default]", update = address_update_callback) - NetRenderSettings.server_port = IntProperty( + NetRenderSettings.server_port: IntProperty( name="Server port", description="port of the master render server", default = 8000, min=1, max=65535) - NetRenderSettings.use_master_broadcast = BoolProperty( + NetRenderSettings.use_master_broadcast: BoolProperty( name="Broadcast", description="broadcast master server address on local network", default = True) - NetRenderSettings.use_ssl = BoolProperty( + NetRenderSettings.use_ssl: BoolProperty( name="use ssl", description="use ssl encryption for communication", default = False) - NetRenderSettings.cert_path = StringProperty( + NetRenderSettings.cert_path: StringProperty( name="CertPath", description="Path to ssl certificate", maxlen = 128, default = "", subtype='FILE_PATH') - NetRenderSettings.key_path = StringProperty( + NetRenderSettings.key_path: StringProperty( name="key", description="Path to ssl key file", maxlen = 128, default = "", subtype='FILE_PATH') - NetRenderSettings.use_slave_clear = BoolProperty( + NetRenderSettings.use_slave_clear: BoolProperty( name="Clear on exit", description="delete downloaded files on exit", default = True) - NetRenderSettings.use_slave_thumb = BoolProperty( + NetRenderSettings.use_slave_thumb: BoolProperty( name="Generate thumbnails", description="Generate thumbnails on slaves instead of master", default = False) - NetRenderSettings.slave_tags = StringProperty( + NetRenderSettings.slave_tags: StringProperty( name="Tags", description="Tags to associate with the slave (semi-colon separated)", maxlen = 256, default = "") - NetRenderSettings.use_slave_output_log = BoolProperty( + NetRenderSettings.use_slave_output_log: BoolProperty( name="Output render log on console", description="Output render text log to console as well as sending it to the master", default = True) - NetRenderSettings.slave_render = BoolProperty( + NetRenderSettings.slave_render: BoolProperty( name="Render on slave", description="Use slave for render jobs", default = True) - NetRenderSettings.slave_bake = BoolProperty( + NetRenderSettings.slave_bake: BoolProperty( name="Bake on slave", description="Use slave for baking jobs", default = True) - NetRenderSettings.use_master_clear = BoolProperty( + NetRenderSettings.use_master_clear: BoolProperty( name="Clear on exit", description="Delete saved files on exit", default = False) - NetRenderSettings.use_master_force_upload = BoolProperty( + NetRenderSettings.use_master_force_upload: BoolProperty( name="Force Dependency Upload", description="Force client to upload dependency files to master", default = False) @@ -484,14 +484,14 @@ class NetRenderSettings(bpy.types.PropertyGroup): elif not default_path.endswith(os.sep): default_path += os.sep - NetRenderSettings.path = StringProperty( + NetRenderSettings.path: StringProperty( name="Path", description="Path for temporary files", maxlen = 128, default = default_path, subtype='FILE_PATH') - NetRenderSettings.job_type = EnumProperty( + NetRenderSettings.job_type: EnumProperty( items=( ("JOB_BLENDER", "Blender", "Standard Blender Job"), ("JOB_PROCESS", "Process", "Custom Process Job"), @@ -501,25 +501,25 @@ class NetRenderSettings(bpy.types.PropertyGroup): description="Type of render job", default="JOB_BLENDER") - NetRenderSettings.job_name = StringProperty( + NetRenderSettings.job_name: StringProperty( name="Job name", description="Name of the job", maxlen = 128, default = "[default]") - NetRenderSettings.job_category = StringProperty( + NetRenderSettings.job_category: StringProperty( name="Job category", description="Category of the job", maxlen = 128, default = "") - NetRenderSettings.job_tags = StringProperty( + NetRenderSettings.job_tags: StringProperty( name="Tags", description="Tags to associate with the job (semi-colon separated)", maxlen = 256, default = "") - NetRenderSettings.job_render_engine = EnumProperty( + NetRenderSettings.job_render_engine: EnumProperty( items = ( ("BLENDER_RENDER", "BLENDER", "Standard Blender Render"), ("CYCLES", "CYCLES", "Cycle Render"), @@ -529,83 +529,83 @@ class NetRenderSettings(bpy.types.PropertyGroup): description="Render engine used to render this job", default="BLENDER_RENDER") - NetRenderSettings.job_render_engine_other = StringProperty( + NetRenderSettings.job_render_engine_other: StringProperty( name="Render engine", description="Render engine other than the builtin defaults (POVRAY_RENDER, ...)", maxlen = 128, default = "") - NetRenderSettings.save_before_job = BoolProperty( + NetRenderSettings.save_before_job: BoolProperty( name="Save Before Job", description="Save current file before sending a job", default = False) - NetRenderSettings.chunks = IntProperty( + NetRenderSettings.chunks: IntProperty( name="Chunks", description="Number of frame to dispatch to each slave in one chunk", default = 5, min=1, max=65535) - NetRenderSettings.priority = IntProperty( + NetRenderSettings.priority: IntProperty( name="Priority", description="Priority of the job", default = 1, min=1, max=10) - NetRenderSettings.vcs_wpath = StringProperty( + NetRenderSettings.vcs_wpath: StringProperty( name="Working Copy", description="Path of the local working copy", maxlen = 1024, default = "") - NetRenderSettings.vcs_rpath = StringProperty( + NetRenderSettings.vcs_rpath: StringProperty( name="Remote Path", description="Path of the server copy (protocol specific)", maxlen = 1024, default = "") - NetRenderSettings.vcs_revision = StringProperty( + NetRenderSettings.vcs_revision: StringProperty( name="Revision", description="Revision for this job", maxlen = 256, default = "") - NetRenderSettings.vcs_system = EnumProperty( + NetRenderSettings.vcs_system: EnumProperty( items= netrender.versioning.ITEMS, name="VCS mode", description="Version Control System", default=netrender.versioning.ITEMS[0][0]) - NetRenderSettings.job_id = StringProperty( + NetRenderSettings.job_id: StringProperty( name="Network job id", description="id of the last sent render job", maxlen = 64, default = "") - NetRenderSettings.active_slave_index = IntProperty( + NetRenderSettings.active_slave_index: IntProperty( name="Index of the active slave", description="", default = -1, min= -1, max=65535) - NetRenderSettings.active_blacklisted_slave_index = IntProperty( + NetRenderSettings.active_blacklisted_slave_index: IntProperty( name="Index of the active slave", description="", default = -1, min= -1, max=65535) - NetRenderSettings.active_job_index = IntProperty( + NetRenderSettings.active_job_index: IntProperty( name="Index of the active job", description="", default = -1, min= -1, max=65535) - NetRenderSettings.mode = EnumProperty( + NetRenderSettings.mode: EnumProperty( items=( ("RENDER_CLIENT", "Client", "Act as render client"), ("RENDER_MASTER", "Master", "Act as render master"), @@ -615,9 +615,9 @@ class NetRenderSettings(bpy.types.PropertyGroup): description="Mode of operation of this instance", default="RENDER_CLIENT") - NetRenderSettings.slaves = CollectionProperty(type=NetRenderSlave, name="Slaves", description="") - NetRenderSettings.slaves_blacklist = CollectionProperty(type=NetRenderSlave, name="Slaves Blacklist", description="") - NetRenderSettings.jobs = CollectionProperty(type=NetRenderJob, name="Job List", description="") + NetRenderSettings.slaves: CollectionProperty(type=NetRenderSlave, name="Slaves", description="") + NetRenderSettings.slaves_blacklist: CollectionProperty(type=NetRenderSlave, name="Slaves Blacklist", description="") + NetRenderSettings.jobs: CollectionProperty(type=NetRenderJob, name="Job List", description="") bpy.types.Scene.network_render = PointerProperty(type=NetRenderSettings, name="Network Render", description="Network Render Settings") diff --git a/object_fracture/fracture_ops.py b/object_fracture/fracture_ops.py index d2f88159d9b0b23053fc9a1948d77c41e1ab7025..9cfcfb826729df25430d535478dc541a2879471f 100644 --- a/object_fracture/fracture_ops.py +++ b/object_fracture/fracture_ops.py @@ -346,21 +346,21 @@ class FractureSimple(bpy.types.Operator): bl_label = "Fracture Object" bl_options = {'REGISTER', 'UNDO'} - exe = BoolProperty(name="Execute", + exe: BoolProperty(name="Execute", description="If it shall actually run, for optimal performance", default=False) - hierarchy = BoolProperty(name="Generate hierarchy", + hierarchy: BoolProperty(name="Generate hierarchy", description="Hierarchy is useful for simulation of objects" \ " breaking in motion", default=False) - nshards = IntProperty(name="Number of shards", + nshards: IntProperty(name="Number of shards", description="Number of shards the object should be split into", min=2, default=5) - crack_type = EnumProperty(name='Crack type', + crack_type: EnumProperty(name='Crack type', items=( ('FLAT', 'Flat', 'a'), ('FLAT_ROUGH', 'Flat rough', 'a'), @@ -369,7 +369,7 @@ class FractureSimple(bpy.types.Operator): description='Look of the fracture surface', default='FLAT') - roughness = FloatProperty(name="Roughness", + roughness: FloatProperty(name="Roughness", description="Roughness of the fracture surface", min=0.0, max=3.0, @@ -399,11 +399,11 @@ class FractureGroup(bpy.types.Operator): bl_label = "Fracture Object (Group)" bl_options = {'REGISTER', 'UNDO'} - exe = BoolProperty(name="Execute", + exe: BoolProperty(name="Execute", description="If it shall actually run, for optimal performance", default=False) - group = StringProperty(name="Group", + group: StringProperty(name="Group", description="Specify the group used for fracturing") # e = [] diff --git a/object_fracture_cell/__init__.py b/object_fracture_cell/__init__.py index f845ccf12fd186b32f4cb823109b283e9e3f1116..6f46d3173e11d32dea8566a08debc90c5f82506b 100644 --- a/object_fracture_cell/__init__.py +++ b/object_fracture_cell/__init__.py @@ -250,7 +250,7 @@ class FractureCell(Operator): # ------------------------------------------------------------------------- # Source Options - source = EnumProperty( + source: EnumProperty( name="Source", items=(('VERT_OWN', "Own Verts", "Use own vertices"), ('VERT_CHILD', "Child Verts", "Use child object vertices"), @@ -264,21 +264,21 @@ class FractureCell(Operator): default={'PARTICLE_OWN'}, ) - source_limit = IntProperty( + source_limit: IntProperty( name="Source Limit", description="Limit the number of input points, 0 for unlimited", min=0, max=5000, default=100, ) - source_noise = FloatProperty( + source_noise: FloatProperty( name="Noise", description="Randomize point distribution", min=0.0, max=1.0, default=0.0, ) - cell_scale = FloatVectorProperty( + cell_scale: FloatVectorProperty( name="Scale", description="Scale Cell Shape", size=3, @@ -289,35 +289,35 @@ class FractureCell(Operator): # ------------------------------------------------------------------------- # Recursion - recursion = IntProperty( + recursion: IntProperty( name="Recursion", description="Break shards recursively", min=0, max=5000, default=0, ) - recursion_source_limit = IntProperty( + recursion_source_limit: IntProperty( name="Source Limit", description="Limit the number of input points, 0 for unlimited (applies to recursion only)", min=0, max=5000, default=8, ) - recursion_clamp = IntProperty( + recursion_clamp: IntProperty( name="Clamp Recursion", description="Finish recursion when this number of objects is reached (prevents recursing for extended periods of time), zero disables", min=0, max=10000, default=250, ) - recursion_chance = FloatProperty( + recursion_chance: FloatProperty( name="Random Factor", description="Likelihood of recursion", min=0.0, max=1.0, default=0.25, ) - recursion_chance_select = EnumProperty( + recursion_chance_select: EnumProperty( name="Recurse Over", items=(('RANDOM', "Random", ""), ('SIZE_MIN', "Small", "Recursively subdivide smaller objects"), @@ -331,49 +331,49 @@ class FractureCell(Operator): # ------------------------------------------------------------------------- # Mesh Data Options - use_smooth_faces = BoolProperty( + use_smooth_faces: BoolProperty( name="Smooth Faces", default=False, ) - use_sharp_edges = BoolProperty( + use_sharp_edges: BoolProperty( name="Sharp Edges", description="Set sharp edges when disabled", default=True, ) - use_sharp_edges_apply = BoolProperty( + use_sharp_edges_apply: BoolProperty( name="Apply Split Edge", description="Split sharp hard edges", default=True, ) - use_data_match = BoolProperty( + use_data_match: BoolProperty( name="Match Data", description="Match original mesh materials and data layers", default=True, ) - use_island_split = BoolProperty( + use_island_split: BoolProperty( name="Split Islands", description="Split disconnected meshes", default=True, ) - margin = FloatProperty( + margin: FloatProperty( name="Margin", description="Gaps for the fracture (gives more stable physics)", min=0.0, max=1.0, default=0.001, ) - material_index = IntProperty( + material_index: IntProperty( name="Material", description="Material index for interior faces", default=0, ) - use_interior_vgroup = BoolProperty( + use_interior_vgroup: BoolProperty( name="Interior VGroup", description="Create a vertex group for interior verts", default=False, @@ -382,7 +382,7 @@ class FractureCell(Operator): # ------------------------------------------------------------------------- # Physics Options - mass_mode = EnumProperty( + mass_mode: EnumProperty( name="Mass Mode", items=(('VOLUME', "Volume", "Objects get part of specified mass based on their volume"), ('UNIFORM', "Uniform", "All objects get the specified mass"), @@ -390,7 +390,7 @@ class FractureCell(Operator): default='VOLUME', ) - mass = FloatProperty( + mass: FloatProperty( name="Mass", description="Mass to give created objects", min=0.001, max=1000.0, @@ -401,13 +401,13 @@ class FractureCell(Operator): # ------------------------------------------------------------------------- # Object Options - use_recenter = BoolProperty( + use_recenter: BoolProperty( name="Recenter", description="Recalculate the center points after splitting", default=True, ) - use_remove_original = BoolProperty( + use_remove_original: BoolProperty( name="Remove Original", description="Removes the parents used to create the shatter", default=True, @@ -419,20 +419,20 @@ class FractureCell(Operator): # .. different from object options in that this controls how the objects # are setup in the scene. - use_layer_index = IntProperty( + use_layer_index: IntProperty( name="Layer Index", description="Layer to add the objects into or 0 for existing", default=0, min=0, max=20, ) - use_layer_next = BoolProperty( + use_layer_next: BoolProperty( name="Next Layer", description="At the object into the next layer (layer index overrides)", default=True, ) - group_name = StringProperty( + group_name: StringProperty( name="Group", description="Create objects int a group " "(use existing or create new)", @@ -440,19 +440,19 @@ class FractureCell(Operator): # ------------------------------------------------------------------------- # Debug - use_debug_points = BoolProperty( + use_debug_points: BoolProperty( name="Debug Points", description="Create mesh data showing the points used for fracture", default=False, ) - use_debug_redraw = BoolProperty( + use_debug_redraw: BoolProperty( name="Show Progress Realtime", description="Redraw as fracture is done", default=True, ) - use_debug_bool = BoolProperty( + use_debug_bool: BoolProperty( name="Debug Boolean", description="Skip applying the boolean modifier", default=False, diff --git a/object_fracture_crack/__init__.py b/object_fracture_crack/__init__.py index d3cd095d51961b80658ded44ac05878ad22a8153..3e3ec838fd82061ef527d089fe43d76e3f984345 100644 --- a/object_fracture_crack/__init__.py +++ b/object_fracture_crack/__init__.py @@ -53,54 +53,54 @@ class CrackItProperties(PropertyGroup): # In Panel subclass, In bpy.types.Operator subclass, # reference them by context.scene.crackit - fracture_childverts = BoolProperty( + fracture_childverts: BoolProperty( name="From Child Verts", description="Use child object's vertices and position for origin of crack", default=False ) - fracture_scalex = FloatProperty( + fracture_scalex: FloatProperty( name="Scale X", description="Scale X", default=1.00, min=0.00, max=1.00 ) - fracture_scaley = FloatProperty( + fracture_scaley: FloatProperty( name="Scale Y", description="Scale Y", default=1.00, min=0.00, max=1.00 ) - fracture_scalez = FloatProperty( + fracture_scalez: FloatProperty( name="Scale Z", description="Scale Z", default=1.00, min=0.00, max=1.00 ) - fracture_div = IntProperty( + fracture_div: IntProperty( name="Max Crack", description="Max Crack", default=100, min=0, max=10000 ) - fracture_margin = FloatProperty( + fracture_margin: FloatProperty( name="Margin Size", description="Margin Size", default=0.001, min=0.000, max=1.000 ) - extrude_offset = FloatProperty( + extrude_offset: FloatProperty( name="Offset", description="Extrude Offset", default=0.10, min=0.00, max=2.00 ) - extrude_random = FloatProperty( + extrude_random: FloatProperty( name="Random", description="Extrude Random", default=0.30, @@ -112,7 +112,7 @@ class CrackItProperties(PropertyGroup): # Selection of material preset # Note: you can choose the original name in the library blend # or the prop name - material_preset = EnumProperty( + material_preset: EnumProperty( name="Preset", description="Material Preset", items=[ @@ -124,7 +124,7 @@ class CrackItProperties(PropertyGroup): ('crackit_rock1', "Rock", "Rock Material") ] ) - material_lib_name = BoolProperty( + material_lib_name: BoolProperty( name="Library Name", description="Use the original Material name from the .blend library\n" "instead of the one defined in the Preset", diff --git a/object_skinify.py b/object_skinify.py index 730a82a7b353380194447feb37df69c2ed10ee6d..83b3fd114e3d7ba7473f42aca497885fcc762bb6 100644 --- a/object_skinify.py +++ b/object_skinify.py @@ -707,50 +707,50 @@ class BONE_PT_custom_shape(Panel): # define the scene properties in a group - call them with context.scene.skinify class Skinify_Properties(PropertyGroup): - sub_level = IntProperty( + sub_level: IntProperty( name="Sub level", min=0, max=4, default=1, description="Mesh density" ) - thickness = FloatProperty( + thickness: FloatProperty( name="Thickness", min=0.01, default=0.8, description="Adjust shape thickness" ) - finger_thickness = FloatProperty( + finger_thickness: FloatProperty( name="Finger Thickness", min=0.01, max=1.0, default=0.25, description="Adjust finger thickness relative to body" ) - connect_mesh = BoolProperty( + connect_mesh: BoolProperty( name="Solid Shape", default=False, description="Makes solid shape from bone chains" ) - connect_parents = BoolProperty( + connect_parents: BoolProperty( name="Fill Gaps", default=False, description="Fills the gaps between parented bones" ) - generate_all = BoolProperty( + generate_all: BoolProperty( name="All Shapes", default=False, description="Generates shapes from all bones" ) - head_ornaments = BoolProperty( + head_ornaments: BoolProperty( name="Head Ornaments", default=False, description="Includes head ornaments" ) - apply_mod = BoolProperty( + apply_mod: BoolProperty( name="Apply Modifiers", default=True, description="Applies Modifiers to mesh" ) - parent_armature = BoolProperty( + parent_armature: BoolProperty( name="Parent Armature", default=True, description="Applies mesh to Armature" diff --git a/paint_palette.py b/paint_palette.py index 320163ad901d675cf0b2679842685aa40ee80d14..0d2f32e59225424bda9a546db7d5426ad2b90f25 100644 --- a/paint_palette.py +++ b/paint_palette.py @@ -163,12 +163,12 @@ class PALETTE_OT_load_gimp_palette(Operator): bl_idname = "palette.load_gimp_palette" bl_label = "Load a Gimp palette" - filepath = StringProperty( + filepath: StringProperty( name="Path", description="Path of the .gpl file to load", default="" ) - menu_idname = StringProperty( + menu_idname: StringProperty( name="Menu ID Name", description="ID name of the menu this was called from", default="" @@ -263,14 +263,14 @@ class WriteGimpPalette(): - preset_subdir """ bl_options = {'REGISTER'} # only because invoke_props_popup requires - name = StringProperty( + name: StringProperty( name="Name", description="Name of the preset, used to make the path name", maxlen=64, options={'SKIP_SAVE'}, default="" ) - remove_active = BoolProperty( + remove_active: BoolProperty( default=False, options={'HIDDEN'} ) @@ -444,7 +444,7 @@ class IMAGE_OT_select_color(Operator): bl_description = "Select this color" bl_options = {'UNDO'} - color_index = IntProperty() + color_index: IntProperty() def invoke(self, context, event): palette_props = context.scene.palette_props @@ -559,7 +559,7 @@ class VIEW3D_OT_select_weight(Operator): bl_description = "Select this weight value slot" bl_options = {'UNDO'} - weight_index = IntProperty() + weight_index: IntProperty() def current_weight(self): pp = bpy.context.scene.palette_props @@ -690,7 +690,7 @@ class VIEW3D_PT_weight_palette(PaintPanel, Panel): class PALETTE_Colors(PropertyGroup): """Class for colors CollectionProperty""" - color = FloatVectorProperty( + color: FloatVectorProperty( name="", description="", default=(0.8, 0.8, 0.8), @@ -746,54 +746,54 @@ class PALETTE_Props(PropertyGroup): bpy.context.tool_settings.unified_paint_settings.weight = weight return None - palette_name = StringProperty( + palette_name: StringProperty( name="Palette Name", default="Preset", subtype='FILE_NAME' ) - color_name = StringProperty( + color_name: StringProperty( name="", description="Color Name", default="Untitled", update=update_color_name ) - columns = IntProperty( + columns: IntProperty( name="Columns", description="Number of Columns", min=0, max=16, default=0 ) - index = IntProperty( + index: IntProperty( name="Index", description="Move Selected Color", min=0, update=move_color ) - notes = StringProperty( + notes: StringProperty( name="Palette Notes", default="#\n" ) - current_color_index = IntProperty( + current_color_index: IntProperty( name="Current Color Index", description="", default=0, min=0 ) - current_weight_index = IntProperty( + current_weight_index: IntProperty( name="Current Color Index", description="", default=10, min=-1 ) - presets_folder = StringProperty(name="", + presets_folder: StringProperty(name="", description="Palettes Folder", subtype="DIR_PATH", default="//" ) - colors = CollectionProperty( + colors: CollectionProperty( type=PALETTE_Colors ) - weight = FloatProperty( + weight: FloatProperty( name="Weight", description="Modify the active Weight preset slot value", default=0.0, @@ -801,57 +801,57 @@ class PALETTE_Props(PropertyGroup): precision=3, update=update_weight ) - weight_0 = FloatProperty( + weight_0: FloatProperty( default=0.0, min=0.0, max=1.0, precision=3 ) - weight_1 = FloatProperty( + weight_1: FloatProperty( default=0.1, min=0.0, max=1.0, precision=3 ) - weight_2 = FloatProperty( + weight_2: FloatProperty( default=0.25, min=0.0, max=1.0, precision=3 ) - weight_3 = FloatProperty( + weight_3: FloatProperty( default=0.333, min=0.0, max=1.0, precision=3 ) - weight_4 = FloatProperty( + weight_4: FloatProperty( default=0.4, min=0.0, max=1.0, precision=3 ) - weight_5 = FloatProperty( + weight_5: FloatProperty( default=0.5, min=0.0, max=1.0, precision=3 ) - weight_6 = FloatProperty( + weight_6: FloatProperty( default=0.6, min=0.0, max=1.0, precision=3 ) - weight_7 = FloatProperty( + weight_7: FloatProperty( default=0.6666, min=0.0, max=1.0, precision=3 ) - weight_8 = FloatProperty( + weight_8: FloatProperty( default=0.75, min=0.0, max=1.0, precision=3 ) - weight_9 = FloatProperty( + weight_9: FloatProperty( default=0.9, min=0.0, max=1.0, precision=3 ) - weight_10 = FloatProperty( + weight_10: FloatProperty( default=1.0, min=0.0, max=1.0, precision=3 diff --git a/render_auto_tile_size.py b/render_auto_tile_size.py index 8de8e99f26106f9b8b8056128a3e5ff11b10f4dd..f6feb0cf8c56f38cea7f21722bcccdfb459b20d7 100644 --- a/render_auto_tile_size.py +++ b/render_auto_tile_size.py @@ -68,28 +68,28 @@ def _update_tile_size(self, context): class AutoTileSizeSettings(PropertyGroup): - gpu_choice = EnumProperty( + gpu_choice: EnumProperty( name="Target GPU Tile Size", items=TILE_SIZES, default='256', description="Square dimensions of tiles for GPU rendering", update=_update_tile_size ) - cpu_choice = EnumProperty( + cpu_choice: EnumProperty( name="Target CPU Tile Size", items=TILE_SIZES, default='32', description="Square dimensions of tiles for CPU rendering", update=_update_tile_size ) - bi_choice = EnumProperty( + bi_choice: EnumProperty( name="Target CPU Tile Size", items=TILE_SIZES, default='64', description="Square dimensions of tiles", update=_update_tile_size ) - gpu_custom = IntProperty( + gpu_custom: IntProperty( name="Target Size", default=256, min=8, # same as blender's own limits @@ -97,7 +97,7 @@ class AutoTileSizeSettings(PropertyGroup): description="Custom target tile size for GPU rendering", update=_update_tile_size ) - cpu_custom = IntProperty( + cpu_custom: IntProperty( name="Target Size", default=32, min=8, # same as blender's own limits @@ -105,7 +105,7 @@ class AutoTileSizeSettings(PropertyGroup): description="Custom target tile size for CPU rendering", update=_update_tile_size ) - bi_custom = IntProperty( + bi_custom: IntProperty( name="Target Size", default=64, min=8, # same as blender's own limits @@ -113,7 +113,7 @@ class AutoTileSizeSettings(PropertyGroup): description="Custom target tile size", update=_update_tile_size ) - target_type = EnumProperty( + target_type: EnumProperty( name="Target tile size", items=( ('po2', "Po2", "A choice between powers of 2 (16, 32, 64...)"), @@ -122,26 +122,26 @@ class AutoTileSizeSettings(PropertyGroup): description="Method of choosing the target tile size", update=_update_tile_size ) - use_optimal = BoolProperty( + use_optimal: BoolProperty( name="Optimal Tiles", default=True, description="Try to find a similar tile size for best performance, " "instead of using exact selected one", update=_update_tile_size ) - is_enabled = BoolProperty( + is_enabled: BoolProperty( name="Auto Tile Size", default=True, description="Calculate the best tile size based on factors of the " "render size and the chosen target", update=_update_tile_size ) - use_advanced_ui = BoolProperty( + use_advanced_ui: BoolProperty( name="Advanced Settings", default=False, description="Show extra options for more control over the calculated tile size" ) - thread_error_correct = BoolProperty( + thread_error_correct: BoolProperty( name="Fix", default=True, description="Reduce the tile size so that all your available threads are used", @@ -149,11 +149,11 @@ class AutoTileSizeSettings(PropertyGroup): ) # Internally used props (not for GUI) - first_run = BoolProperty( + first_run: BoolProperty( default=True, options={'HIDDEN'} ) - threads_error = BoolProperty( + threads_error: BoolProperty( options={'HIDDEN'} ) num_tiles = IntVectorProperty( @@ -161,15 +161,15 @@ class AutoTileSizeSettings(PropertyGroup): size=2, options={'HIDDEN'} ) - prev_choice = StringProperty( + prev_choice: StringProperty( default='', options={'HIDDEN'} ) - prev_engine = StringProperty( + prev_engine: StringProperty( default='', options={'HIDDEN'} ) - prev_device = StringProperty( + prev_device: StringProperty( default='', options={'HIDDEN'} ) @@ -178,11 +178,11 @@ class AutoTileSizeSettings(PropertyGroup): size=2, options={'HIDDEN'} ) - prev_border = BoolProperty( + prev_border: BoolProperty( default=False, options={'HIDDEN'} ) - prev_border_res = FloatVectorProperty( + prev_border_res: FloatVectorProperty( default=(0, 0, 0, 0), size=4, options={'HIDDEN'} @@ -192,7 +192,7 @@ class AutoTileSizeSettings(PropertyGroup): size=2, options={'HIDDEN'} ) - prev_threads = IntProperty( + prev_threads: IntProperty( default=0, options={'HIDDEN'} ) diff --git a/render_freestyle_svg.py b/render_freestyle_svg.py index 7e1ffc19dda62d8233c487897d7cdfb28353792f..3e3634b1809fe76d1aace3ae3ad870961c3f41f4 100644 --- a/render_freestyle_svg.py +++ b/render_freestyle_svg.py @@ -218,19 +218,19 @@ class SVGExport(bpy.types.PropertyGroup): """Implements the properties for the SVG exporter""" bl_idname = "RENDER_PT_svg_export" - use_svg_export = BoolProperty( + use_svg_export: BoolProperty( name="SVG Export", description="Export Freestyle edges to an .svg format", ) - split_at_invisible = BoolProperty( + split_at_invisible: BoolProperty( name="Split at Invisible", description="Split the stroke at an invisible vertex", ) - object_fill = BoolProperty( + object_fill: BoolProperty( name="Fill Contours", description="Fill the contour with the object's material color", ) - mode = EnumProperty( + mode: EnumProperty( name="Mode", items=( ('FRAME', "Frame", "Export a single frame", 0), @@ -238,7 +238,7 @@ class SVGExport(bpy.types.PropertyGroup): ), default='FRAME', ) - line_join_type = EnumProperty( + line_join_type: EnumProperty( name="Linejoin", items=( ('MITER', "Miter", "Corners are sharp", 0), diff --git a/render_povray/__init__.py b/render_povray/__init__.py index 9d7254ea43f4a45e2655b56228aa27ff9931c7c1..b8b2f4e558ca698a71349d0a2de095113d93a31e 100644 --- a/render_povray/__init__.py +++ b/render_povray/__init__.py @@ -74,77 +74,77 @@ def string_strip_hyphen(name): ############################################################################### class RenderPovSettingsScene(PropertyGroup): #Linux SDL-window enable - sdl_window_enable = BoolProperty( + sdl_window_enable: BoolProperty( name="Enable SDL window", description="Enable the SDL window in Linux OS", default=True) # File Options - text_block = StringProperty( + text_block: StringProperty( name="Text Scene Name", description="Name of POV-Ray scene to use. " "Set when clicking Run to render current text only", maxlen=1024) - tempfiles_enable = BoolProperty( + tempfiles_enable: BoolProperty( name="Enable Tempfiles", description="Enable the OS-Tempfiles. Otherwise set the path where" " to save the files", default=True) - pov_editor = BoolProperty( + pov_editor: BoolProperty( name="POV-Ray editor", description="Don't Close POV-Ray editor after rendering (Overridden" " by /EXIT command)", default=False) - deletefiles_enable = BoolProperty( + deletefiles_enable: BoolProperty( name="Delete files", description="Delete files after rendering. " "Doesn't work with the image", default=True) - scene_name = StringProperty( + scene_name: StringProperty( name="Scene Name", description="Name of POV-Ray scene to create. Empty name will use " "the name of the blend file", maxlen=1024) - scene_path = StringProperty( + scene_path: StringProperty( name="Export scene path", # Bug in POV-Ray RC3 # description="Path to directory where the exported scene " # "(POV and INI) is created", description="Path to directory where the files are created", maxlen=1024, subtype="DIR_PATH") - renderimage_path = StringProperty( + renderimage_path: StringProperty( name="Rendered image path", description="Full path to directory where the rendered image is " "saved", maxlen=1024, subtype="DIR_PATH") - list_lf_enable = BoolProperty( + list_lf_enable: BoolProperty( name="LF in lists", description="Enable line breaks in lists (vectors and indices). " "Disabled: lists are exported in one line", default=True) # Not a real pov option, just to know if we should write - radio_enable = BoolProperty( + radio_enable: BoolProperty( name="Enable Radiosity", description="Enable POV-Rays radiosity calculation", default=True) - radio_display_advanced = BoolProperty( + radio_display_advanced: BoolProperty( name="Advanced Options", description="Show advanced options", default=False) - media_enable = BoolProperty( + media_enable: BoolProperty( name="Enable Media", description="Enable POV-Rays atmospheric media", default=False) - media_samples = IntProperty( + media_samples: IntProperty( name="Samples", description="Number of samples taken from camera to first object " "encountered along ray path for media calculation", min=1, max=100, default=35) - media_scattering_type = EnumProperty( + media_scattering_type: EnumProperty( name="Scattering Type", description="Scattering model", items=(('1', "1 Isotropic", "The simplest form of scattering because" @@ -184,32 +184,32 @@ class RenderPovSettingsScene(PropertyGroup): " scattering.")), default='1') - media_diffusion_scale = FloatProperty( + media_diffusion_scale: FloatProperty( name="Scale", description="Scale factor of Media Diffusion Color", precision=12, step=0.00000001, min=0.000000001, max=1.0, default=(1.0)) - media_diffusion_color = FloatVectorProperty( + media_diffusion_color: FloatVectorProperty( name="Media Diffusion Color", description="The atmospheric media color", precision=4, step=0.01, min=0, soft_max=1, default=(0.001, 0.001, 0.001), options={'ANIMATABLE'}, subtype='COLOR') - media_absorption_scale = FloatProperty( + media_absorption_scale: FloatProperty( name="Scale", description="Scale factor of Media Absorption Color. " "use 1/depth of media volume in meters", precision=12, step=0.000001, min=0.000000001, max=1.0, default=(0.00002)) - media_absorption_color = FloatVectorProperty( + media_absorption_color: FloatVectorProperty( name="Media Absorption Color", description="The atmospheric media absorption color", precision=4, step=0.01, min=0, soft_max=1, default=(0.0, 0.0, 0.0), options={'ANIMATABLE'}, subtype='COLOR') - media_eccentricity = FloatProperty( + media_eccentricity: FloatProperty( name="Media Eccenticity Factor", description="Positive values lead" " to scattering in the direction of the light and negative " "values lead to scattering in the opposite direction of the " @@ -219,40 +219,40 @@ class RenderPovSettingsScene(PropertyGroup): default=(0.0), options={'ANIMATABLE'}) - baking_enable = BoolProperty( + baking_enable: BoolProperty( name="Enable Baking", description="Enable POV-Rays texture baking", default=False) - indentation_character = EnumProperty( + indentation_character: EnumProperty( name="Indentation", description="Select the indentation type", items=(('NONE', "None", "No indentation"), ('TAB', "Tabs", "Indentation with tabs"), ('SPACE', "Spaces", "Indentation with spaces")), default='SPACE') - indentation_spaces = IntProperty( + indentation_spaces: IntProperty( name="Quantity of spaces", description="The number of spaces for indentation", min=1, max=10, default=4) - comments_enable = BoolProperty( + comments_enable: BoolProperty( name="Enable Comments", description="Add comments to pov file", default=True) # Real pov options - command_line_switches = StringProperty( + command_line_switches: StringProperty( name="Command Line Switches", description="Command line switches consist of a + (plus) or - " "(minus) sign, followed by one or more alphabetic " "characters and possibly a numeric value", maxlen=500) - antialias_enable = BoolProperty( + antialias_enable: BoolProperty( name="Anti-Alias", description="Enable Anti-Aliasing", default=True) - antialias_method = EnumProperty( + antialias_method: EnumProperty( name="Method", description="AA-sampling method. Type 1 is an adaptive, " "non-recursive, super-sampling method. Type 2 is an " @@ -263,77 +263,77 @@ class RenderPovSettingsScene(PropertyGroup): ("2", "stochastic AA", "Type 3 Sampling in UberPOV")), default="1") - antialias_confidence = FloatProperty( + antialias_confidence: FloatProperty( name="Antialias Confidence", description="how surely the computed color " "of a given pixel is indeed" "within the threshold error margin", min=0.0001, max=1.0000, default=0.9900, precision=4) - antialias_depth = IntProperty( + antialias_depth: IntProperty( name="Antialias Depth", description="Depth of pixel for sampling", min=1, max=9, default=3) - antialias_threshold = FloatProperty( + antialias_threshold: FloatProperty( name="Antialias Threshold", description="Tolerance for sub-pixels", min=0.0, max=1.0, soft_min=0.05, soft_max=0.5, default=0.03) - jitter_enable = BoolProperty( + jitter_enable: BoolProperty( name="Jitter", description="Enable Jittering. Adds noise into the sampling " "process (it should be avoided to use jitter in " "animation)", default=False) - jitter_amount = FloatProperty( + jitter_amount: FloatProperty( name="Jitter Amount", description="Amount of jittering", min=0.0, max=1.0, soft_min=0.01, soft_max=1.0, default=1.0) - antialias_gamma = FloatProperty( + antialias_gamma: FloatProperty( name="Antialias Gamma", description="POV-Ray compares gamma-adjusted values for super " "sampling. Antialias Gamma sets the Gamma before " "comparison", min=0.0, max=5.0, soft_min=0.01, soft_max=2.5, default=2.5) - max_trace_level = IntProperty( + max_trace_level: IntProperty( name="Max Trace Level", description="Number of reflections/refractions allowed on ray " "path", min=1, max=256, default=5) #######NEW from Lanuhum - adc_bailout_enable = BoolProperty( + adc_bailout_enable: BoolProperty( name="Enable", description="", default=False) - adc_bailout = FloatProperty( + adc_bailout: FloatProperty( name="ADC Bailout", description="", min=0.0, max=1000.0,default=0.00392156862745, precision=3) - ambient_light_enable = BoolProperty( + ambient_light_enable: BoolProperty( name="Enable", description="", default=False) - ambient_light = FloatVectorProperty( + ambient_light: FloatVectorProperty( name="Ambient Light", description="Ambient light is used to simulate the effect of inter-diffuse reflection", precision=4, step=0.01, min=0, soft_max=1, default=(1, 1, 1), options={'ANIMATABLE'}, subtype='COLOR', ) - global_settings_advanced = BoolProperty( + global_settings_advanced: BoolProperty( name="Advanced", description="", default=False) - irid_wavelength_enable = BoolProperty( + irid_wavelength_enable: BoolProperty( name="Enable", description="", default=False) - irid_wavelength = FloatVectorProperty( + irid_wavelength: FloatVectorProperty( name="Irid Wavelength", description=( "Iridescence calculations depend upon the dominant " @@ -342,7 +342,7 @@ class RenderPovSettingsScene(PropertyGroup): precision=4, step=0.01, min=0, soft_max=1, default=(0.25,0.18,0.14), options={'ANIMATABLE'}, subtype='COLOR') - charset = EnumProperty( + charset: EnumProperty( name="Charset", description="This allows you to specify the assumed character set of all text strings", items=(("ascii", "ASCII", ""), @@ -350,22 +350,22 @@ class RenderPovSettingsScene(PropertyGroup): ("sys", "SYS", "")), default="utf8") - max_intersections_enable = BoolProperty( + max_intersections_enable: BoolProperty( name="Enable", description="", default=False) - max_intersections = IntProperty( + max_intersections: IntProperty( name="Max Intersections", description="POV-Ray uses a set of internal stacks to collect ray/object intersection points", min=2, max=1024, default=64) - number_of_waves_enable = BoolProperty( + number_of_waves_enable: BoolProperty( name="Enable", description="", default=False) - number_of_waves = IntProperty( + number_of_waves: IntProperty( name="Number Waves", description=( "The waves and ripples patterns are generated by summing a series of waves, " @@ -373,62 +373,62 @@ class RenderPovSettingsScene(PropertyGroup): ), min=1, max=10, default=1000) - noise_generator_enable = BoolProperty( + noise_generator_enable: BoolProperty( name="Enable", description="", default=False) - noise_generator = IntProperty( + noise_generator: IntProperty( name="Noise Generator", description="There are three noise generators implemented", min=1, max=3, default=2) ########################### PHOTONS ####################################### - photon_enable = BoolProperty( + photon_enable: BoolProperty( name="Photons", description="Enable global photons", default=False) - photon_enable_count = BoolProperty( + photon_enable_count: BoolProperty( name="Spacing / Count", description="Enable count photons", default=False) - photon_count = IntProperty( + photon_count: IntProperty( name="Count", description="Photons count", min=1, max=100000000, default=20000) - photon_spacing = FloatProperty( + photon_spacing: FloatProperty( name="Spacing", description="Average distance between photons on surfaces. half " "this get four times as many surface photons", min=0.001, max=1.000, default=0.005, soft_min=0.001, soft_max=1.000, precision=3) - photon_max_trace_level = IntProperty( + photon_max_trace_level: IntProperty( name="Max Trace Level", description="Number of reflections/refractions allowed on ray " "path", min=1, max=256, default=5) - photon_adc_bailout = FloatProperty( + photon_adc_bailout: FloatProperty( name="ADC Bailout", description="The adc_bailout for photons. Use adc_bailout = " "0.01 / brightest_ambient_object for good results", min=0.0, max=1000.0, default=0.1, soft_min=0.0, soft_max=1.0, precision=3) - photon_gather_min = IntProperty( + photon_gather_min: IntProperty( name="Gather Min", description="Minimum number of photons gathered" "for each point", min=1, max=256, default=20) - photon_gather_max = IntProperty( + photon_gather_max: IntProperty( name="Gather Max", description="Maximum number of photons gathered for each point", min=1, max=256, default=100) - photon_map_file_save_load = EnumProperty( + photon_map_file_save_load: EnumProperty( name="Operation", description="Load or Save photon map file", items=(("NONE", "None", ""), @@ -436,107 +436,107 @@ class RenderPovSettingsScene(PropertyGroup): ("load", "Load", "")), default="NONE") - photon_map_filename = StringProperty( + photon_map_filename: StringProperty( name="Filename", description="", maxlen=1024) - photon_map_dir = StringProperty( + photon_map_dir: StringProperty( name="Directory", description="", maxlen=1024, subtype="DIR_PATH") - photon_map_file = StringProperty( + photon_map_file: StringProperty( name="File", description="", maxlen=1024, subtype="FILE_PATH") #########RADIOSITY######## - radio_adc_bailout = FloatProperty( + radio_adc_bailout: FloatProperty( name="ADC Bailout", description="The adc_bailout for radiosity rays. Use " "adc_bailout = 0.01 / brightest_ambient_object for good results", min=0.0, max=1000.0, soft_min=0.0, soft_max=1.0, default=0.0039, precision=4) - radio_always_sample = BoolProperty( + radio_always_sample: BoolProperty( name="Always Sample", description="Only use the data from the pretrace step and not gather " "any new samples during the final radiosity pass", default=False) - radio_brightness = FloatProperty( + radio_brightness: FloatProperty( name="Brightness", description="Amount objects are brightened before being returned " "upwards to the rest of the system", min=0.0, max=1000.0, soft_min=0.0, soft_max=10.0, default=1.0) - radio_count = IntProperty( + radio_count: IntProperty( name="Ray Count", description="Number of rays for each new radiosity value to be calculated " "(halton sequence over 1600)", min=1, max=10000, soft_max=1600, default=35) - radio_error_bound = FloatProperty( + radio_error_bound: FloatProperty( name="Error Bound", description="One of the two main speed/quality tuning values, " "lower values are more accurate", min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default=1.8) - radio_gray_threshold = FloatProperty( + radio_gray_threshold: FloatProperty( name="Gray Threshold", description="One of the two main speed/quality tuning values, " "lower values are more accurate", min=0.0, max=1.0, soft_min=0, soft_max=1, default=0.0) - radio_low_error_factor = FloatProperty( + radio_low_error_factor: FloatProperty( name="Low Error Factor", description="Just enough samples is slightly blotchy. Low error changes error " "tolerance for less critical last refining pass", min=0.000001, max=1.0, soft_min=0.000001, soft_max=1.0, default=0.5) - radio_media = BoolProperty( + radio_media: BoolProperty( name="Media", description="Radiosity estimation can be affected by media", default=True) - radio_subsurface = BoolProperty( + radio_subsurface: BoolProperty( name="Subsurface", description="Radiosity estimation can be affected by Subsurface Light Transport", default=False) - radio_minimum_reuse = FloatProperty( + radio_minimum_reuse: FloatProperty( name="Minimum Reuse", description="Fraction of the screen width which sets the minimum radius of reuse " "for each sample point (At values higher than 2% expect errors)", min=0.0, max=1.0, soft_min=0.1, soft_max=0.1, default=0.015, precision=3) - radio_maximum_reuse = FloatProperty( + radio_maximum_reuse: FloatProperty( name="Maximum Reuse", description="The maximum reuse parameter works in conjunction with, and is similar to that of minimum reuse, " "the only difference being that it is an upper bound rather than a lower one", min=0.0, max=1.0,default=0.2, precision=3) - radio_nearest_count = IntProperty( + radio_nearest_count: IntProperty( name="Nearest Count", description="Number of old ambient values blended together to " "create a new interpolated value", min=1, max=20, default=5) - radio_normal = BoolProperty( + radio_normal: BoolProperty( name="Normals", description="Radiosity estimation can be affected by normals", default=False) - radio_recursion_limit = IntProperty( + radio_recursion_limit: IntProperty( name="Recursion Limit", description="how many recursion levels are used to calculate " "the diffuse inter-reflection", min=1, max=20, default=1) - radio_pretrace_start = FloatProperty( + radio_pretrace_start: FloatProperty( name="Pretrace Start", description="Fraction of the screen width which sets the size of the " "blocks in the mosaic preview first pass", min=0.01, max=1.00, soft_min=0.02, soft_max=1.0, default=0.08) - radio_pretrace_end = FloatProperty( + radio_pretrace_end: FloatProperty( name="Pretrace End", description="Fraction of the screen width which sets the size of the blocks " "in the mosaic preview last pass", @@ -546,30 +546,30 @@ class RenderPovSettingsScene(PropertyGroup): # Material POV properties. ############################################################################### class RenderPovSettingsMaterial(PropertyGroup): - irid_enable = BoolProperty( + irid_enable: BoolProperty( name="Iridescence coating", description="Newton's thin film interference (like an oil slick on a puddle of " "water or the rainbow hues of a soap bubble.)", default=False) - mirror_use_IOR = BoolProperty( + mirror_use_IOR: BoolProperty( name="Correct Reflection", description="Use same IOR as raytrace transparency to calculate mirror reflections. " "More physically correct", default=False) - mirror_metallic = BoolProperty( + mirror_metallic: BoolProperty( name="Metallic Reflection", description="mirror reflections get colored as diffuse (for metallic materials)", default=False) - conserve_energy = BoolProperty( + conserve_energy: BoolProperty( name="Conserve Energy", description="Light transmitted is more correctly reduced by mirror reflections, " "also the sum of diffuse and translucency gets reduced below one ", default=True) - irid_amount = FloatProperty( + irid_amount: FloatProperty( name="amount", description="Contribution of the iridescence effect to the overall surface color. " "As a rule of thumb keep to around 0.25 (25% contribution) or less, " @@ -577,60 +577,60 @@ class RenderPovSettingsMaterial(PropertyGroup): "the diffuse and possibly the ambient values of the surface", min=0.0, max=1.0, soft_min=0.01, soft_max=1.0, default=0.25) - irid_thickness = FloatProperty( + irid_thickness: FloatProperty( name="thickness", description="A very thin film will have a high frequency of color changes while a " "thick film will have large areas of color", min=0.0, max=1000.0, soft_min=0.1, soft_max=10.0, default=1) - irid_turbulence = FloatProperty( + irid_turbulence: FloatProperty( name="turbulence", description="This parameter varies the thickness", min=0.0, max=10.0, soft_min=0.000, soft_max=1.0, default=0) - interior_fade_color = FloatVectorProperty( + interior_fade_color: FloatVectorProperty( name="Interior Fade Color", description="Color of filtered attenuation for transparent " "materials", precision=4, step=0.01, min=0.0, soft_max=1.0, default=(0, 0, 0), options={'ANIMATABLE'}, subtype='COLOR') - caustics_enable = BoolProperty( + caustics_enable: BoolProperty( name="Caustics", description="use only fake refractive caustics (default) or photon based " "reflective/refractive caustics", default=True) - fake_caustics = BoolProperty( + fake_caustics: BoolProperty( name="Fake Caustics", description="use only (Fast) fake refractive caustics", default=True) - fake_caustics_power = FloatProperty( + fake_caustics_power: FloatProperty( name="Fake caustics power", description="Values typically range from 0.0 to 1.0 or higher. Zero is no caustics. " "Low, non-zero values give broad hot-spots while higher values give " "tighter, smaller simulated focal points", min=0.00, max=10.0, soft_min=0.00, soft_max=5.0, default=0.07) - refraction_caustics = BoolProperty( + refraction_caustics: BoolProperty( name="Refractive Caustics", description="hotspots of light focused when going through the material", default=True) - photons_dispersion = FloatProperty( + photons_dispersion: FloatProperty( name="Chromatic Dispersion", description="Light passing through will be separated according to wavelength. " "This ratio of refractive indices for violet to red controls how much " "the colors are spread out 1 = no dispersion, good values are 1.01 to 1.1", min=1.0000, max=10.000, soft_min=1.0000, soft_max=1.1000, precision=4, default=1.0000) - photons_dispersion_samples = IntProperty( + photons_dispersion_samples: IntProperty( name="Dispersion Samples", description="Number of color-steps for dispersion", min=2, max=128, default=7) - photons_reflection = BoolProperty( + photons_reflection: BoolProperty( name="Reflective Photon Caustics", description="Use this to make your Sauron's ring ;-P", default=False) - refraction_type = EnumProperty( + refraction_type: EnumProperty( items=[ ("1", "Fake Caustics", "use fake caustics"), ("2", "Photons Caustics", "use photons for refractive caustics")], @@ -639,7 +639,7 @@ class RenderPovSettingsMaterial(PropertyGroup): default="1") ##################################CustomPOV Code############################ - replacement_text = StringProperty( + replacement_text: StringProperty( name="Declared name:", description="Type the declared name in custom POV code or an external " ".inc it points at. texture {} expected", @@ -737,13 +737,13 @@ class RenderPovSettingsMaterial(PropertyGroup): else: ob.pov.mesh_write_as = ob.pov.mesh_write_as_old - material_use_nodes = BoolProperty(name="Use nodes", description="", update=use_material_nodes_callback, default=False) - material_active_node = EnumProperty(name="Active node", description="", items=node_enum_callback, update=node_active_callback) - preview_settings = BoolProperty(name="Preview Settings", description="",default=False) - object_preview_transform = BoolProperty(name="Transform object", description="",default=False) - object_preview_scale = FloatProperty(name="XYZ", min=0.5, max=2.0, default=1.0) - object_preview_rotate = FloatVectorProperty(name="Rotate", description="", min=-180.0, max=180.0,default=(0.0,0.0,0.0), subtype='XYZ') - object_preview_bgcontrast = FloatProperty(name="Contrast", min=0.0, max=1.0, default=0.5) + material_use_nodes: BoolProperty(name="Use nodes", description="", update=use_material_nodes_callback, default=False) + material_active_node: EnumProperty(name="Active node", description="", items=node_enum_callback, update=node_active_callback) + preview_settings: BoolProperty(name="Preview Settings", description="",default=False) + object_preview_transform: BoolProperty(name="Transform object", description="",default=False) + object_preview_scale: FloatProperty(name="XYZ", min=0.5, max=2.0, default=1.0) + object_preview_rotate: FloatVectorProperty(name="Rotate", description="", min=-180.0, max=180.0,default=(0.0,0.0,0.0), subtype='XYZ') + object_preview_bgcontrast: FloatProperty(name="Contrast", min=0.0, max=1.0, default=0.5) ############################################################################### @@ -752,13 +752,13 @@ class RenderPovSettingsMaterial(PropertyGroup): class PovraySocketUniversal(bpy.types.NodeSocket): bl_idname = 'PovraySocketUniversal' bl_label = 'Povray Socket' - value_unlimited = bpy.props.FloatProperty(default=0.0) - value_0_1 = bpy.props.FloatProperty(min=0.0,max=1.0,default=0.0) - value_0_10 = bpy.props.FloatProperty(min=0.0,max=10.0,default=0.0) - value_000001_10 = bpy.props.FloatProperty(min=0.000001,max=10.0,default=0.0) - value_1_9 = bpy.props.IntProperty(min=1,max=9,default=1) - value_0_255 = bpy.props.IntProperty(min=0,max=255,default=0) - percent = bpy.props.FloatProperty(min=0.0,max=100.0,default=0.0) + value_unlimited: bpy.props.FloatProperty(default=0.0) + value_0_1: bpy.props.FloatProperty(min=0.0,max=1.0,default=0.0) + value_0_10: bpy.props.FloatProperty(min=0.0,max=10.0,default=0.0) + value_000001_10: bpy.props.FloatProperty(min=0.000001,max=10.0,default=0.0) + value_1_9: bpy.props.IntProperty(min=1,max=9,default=1) + value_0_255: bpy.props.IntProperty(min=0,max=255,default=0) + percent: bpy.props.FloatProperty(min=0.0,max=100.0,default=0.0) def draw(self, context, layout, node, text): space = context.space_data tree = space.edit_tree @@ -805,7 +805,7 @@ class PovraySocketUniversal(bpy.types.NodeSocket): class PovraySocketFloat_0_1(bpy.types.NodeSocket): bl_idname = 'PovraySocketFloat_0_1' bl_label = 'Povray Socket' - default_value = bpy.props.FloatProperty(description="Input node Value_0_1",min=0,max=1,default=0) + default_value: bpy.props.FloatProperty(description="Input node Value_0_1",min=0,max=1,default=0) def draw(self, context, layout, node, text): if self.is_linked: layout.label(text) @@ -818,7 +818,7 @@ class PovraySocketFloat_0_1(bpy.types.NodeSocket): class PovraySocketFloat_0_10(bpy.types.NodeSocket): bl_idname = 'PovraySocketFloat_0_10' bl_label = 'Povray Socket' - default_value = bpy.props.FloatProperty(description="Input node Value_0_10",min=0,max=10,default=0) + default_value: bpy.props.FloatProperty(description="Input node Value_0_10",min=0,max=10,default=0) def draw(self, context, layout, node, text): if node.bl_idname == 'ShaderNormalMapNode' and node.inputs[2].is_linked: layout.label('') @@ -833,7 +833,7 @@ class PovraySocketFloat_0_10(bpy.types.NodeSocket): class PovraySocketFloat_10(bpy.types.NodeSocket): bl_idname = 'PovraySocketFloat_10' bl_label = 'Povray Socket' - default_value = bpy.props.FloatProperty(description="Input node Value_10",min=-10,max=10,default=0) + default_value: bpy.props.FloatProperty(description="Input node Value_10",min=-10,max=10,default=0) def draw(self, context, layout, node, text): if node.bl_idname == 'ShaderNormalMapNode' and node.inputs[2].is_linked: layout.label('') @@ -848,7 +848,7 @@ class PovraySocketFloat_10(bpy.types.NodeSocket): class PovraySocketFloatPositive(bpy.types.NodeSocket): bl_idname = 'PovraySocketFloatPositive' bl_label = 'Povray Socket' - default_value = bpy.props.FloatProperty(description="Input Node Value Positive", min=0.0, default=0) + default_value: bpy.props.FloatProperty(description="Input Node Value Positive", min=0.0, default=0) def draw(self, context, layout, node, text): if self.is_linked: layout.label(text) @@ -860,7 +860,7 @@ class PovraySocketFloatPositive(bpy.types.NodeSocket): class PovraySocketFloat_000001_10(bpy.types.NodeSocket): bl_idname = 'PovraySocketFloat_000001_10' bl_label = 'Povray Socket' - default_value = bpy.props.FloatProperty(min=0.000001,max=10,default=0.000001) + default_value: bpy.props.FloatProperty(min=0.000001,max=10,default=0.000001) def draw(self, context, layout, node, text): if self.is_output or self.is_linked: layout.label(text) @@ -872,7 +872,7 @@ class PovraySocketFloat_000001_10(bpy.types.NodeSocket): class PovraySocketFloatUnlimited(bpy.types.NodeSocket): bl_idname = 'PovraySocketFloatUnlimited' bl_label = 'Povray Socket' - default_value = bpy.props.FloatProperty(default = 0.0) + default_value: bpy.props.FloatProperty(default = 0.0) def draw(self, context, layout, node, text): if self.is_linked: layout.label(text) @@ -884,7 +884,7 @@ class PovraySocketFloatUnlimited(bpy.types.NodeSocket): class PovraySocketInt_1_9(bpy.types.NodeSocket): bl_idname = 'PovraySocketInt_1_9' bl_label = 'Povray Socket' - default_value = bpy.props.IntProperty(description="Input node Value_1_9",min=1,max=9,default=6) + default_value: bpy.props.IntProperty(description="Input node Value_1_9",min=1,max=9,default=6) def draw(self, context, layout, node, text): if self.is_linked: layout.label(text) @@ -896,7 +896,7 @@ class PovraySocketInt_1_9(bpy.types.NodeSocket): class PovraySocketInt_0_256(bpy.types.NodeSocket): bl_idname = 'PovraySocketInt_0_256' bl_label = 'Povray Socket' - default_value = bpy.props.IntProperty(min=0,max=255,default=0) + default_value: bpy.props.IntProperty(min=0,max=255,default=0) def draw(self, context, layout, node, text): if self.is_linked: layout.label(text) @@ -910,7 +910,7 @@ class PovraySocketPattern(bpy.types.NodeSocket): bl_idname = 'PovraySocketPattern' bl_label = 'Povray Socket' - default_value = bpy.props.EnumProperty( + default_value: bpy.props.EnumProperty( name="Pattern", description="Select the pattern", items=(('boxed', "Boxed", ""),('brick', "Brick", ""),('cells', "Cells", ""), ('checker', "Checker", ""), @@ -934,7 +934,7 @@ class PovraySocketColor(bpy.types.NodeSocket): bl_idname = 'PovraySocketColor' bl_label = 'Povray Socket' - default_value = bpy.props.FloatVectorProperty( + default_value: bpy.props.FloatVectorProperty( precision=4, step=0.01, min=0, soft_max=1, default=(0.0, 0.0, 0.0), options={'ANIMATABLE'}, subtype='COLOR') @@ -951,11 +951,11 @@ class PovraySocketColorRGBFT(bpy.types.NodeSocket): bl_idname = 'PovraySocketColorRGBFT' bl_label = 'Povray Socket' - default_value = bpy.props.FloatVectorProperty( + default_value: bpy.props.FloatVectorProperty( precision=4, step=0.01, min=0, soft_max=1, default=(0.0, 0.0, 0.0), options={'ANIMATABLE'}, subtype='COLOR') - f = bpy.props.FloatProperty(default = 0.0,min=0.0,max=1.0) - t = bpy.props.FloatProperty(default = 0.0,min=0.0,max=1.0) + f: bpy.props.FloatProperty(default = 0.0,min=0.0,max=1.0) + t: bpy.props.FloatProperty(default = 0.0,min=0.0,max=1.0) def draw(self, context, layout, node, text): if self.is_output or self.is_linked: layout.label(text) @@ -968,7 +968,7 @@ class PovraySocketColorRGBFT(bpy.types.NodeSocket): class PovraySocketTexture(bpy.types.NodeSocket): bl_idname = 'PovraySocketTexture' bl_label = 'Povray Socket' - default_value = bpy.props.IntProperty() + default_value: bpy.props.IntProperty() def draw(self, context, layout, node, text): layout.label(text) @@ -980,7 +980,7 @@ class PovraySocketTexture(bpy.types.NodeSocket): class PovraySocketTransform(bpy.types.NodeSocket): bl_idname = 'PovraySocketTransform' bl_label = 'Povray Socket' - default_value = bpy.props.IntProperty(min=0,max=255,default=0) + default_value: bpy.props.IntProperty(min=0,max=255,default=0) def draw(self, context, layout, node, text): layout.label(text) @@ -990,7 +990,7 @@ class PovraySocketTransform(bpy.types.NodeSocket): class PovraySocketNormal(bpy.types.NodeSocket): bl_idname = 'PovraySocketNormal' bl_label = 'Povray Socket' - default_value = bpy.props.IntProperty(min=0,max=255,default=0) + default_value: bpy.props.IntProperty(min=0,max=255,default=0) def draw(self, context, layout, node, text): layout.label(text) @@ -1000,9 +1000,9 @@ class PovraySocketNormal(bpy.types.NodeSocket): class PovraySocketSlope(bpy.types.NodeSocket): bl_idname = 'PovraySocketSlope' bl_label = 'Povray Socket' - default_value = bpy.props.FloatProperty(min = 0.0, max = 1.0) - height = bpy.props.FloatProperty(min = 0.0, max = 10.0) - slope = bpy.props.FloatProperty(min = -10.0, max = 10.0) + default_value: bpy.props.FloatProperty(min = 0.0, max = 1.0) + height: bpy.props.FloatProperty(min = 0.0, max = 10.0) + slope: bpy.props.FloatProperty(min = -10.0, max = 10.0) def draw(self, context, layout, node, text): if self.is_output or self.is_linked: layout.label(text) @@ -1016,7 +1016,7 @@ class PovraySocketSlope(bpy.types.NodeSocket): class PovraySocketMap(bpy.types.NodeSocket): bl_idname = 'PovraySocketMap' bl_label = 'Povray Socket' - default_value = bpy.props.StringProperty() + default_value: bpy.props.StringProperty() def draw(self, context, layout, node, text): layout.label(text) def draw_color(self, context, node): @@ -1193,14 +1193,14 @@ node_categories = [ ############################################################################### class RenderPovSettingsTexture(PropertyGroup): #Custom texture gamma - tex_gamma_enable = BoolProperty( + tex_gamma_enable: BoolProperty( name="Enable custom texture gamma", description="Notify some custom gamma for which texture has been precorrected " "without the file format carrying it and only if it differs from your " "OS expected standard (see pov doc)", default=False) - tex_gamma_value = FloatProperty( + tex_gamma_value: FloatProperty( name="Custom texture gamma", description="value for which the file was issued e.g. a Raw photo is gamma 1.0", min=0.45, max=5.00, soft_min=1.00, soft_max=2.50, default=1.00) @@ -1215,7 +1215,7 @@ class RenderPovSettingsTexture(PropertyGroup): - tex_pattern_type = EnumProperty( + tex_pattern_type: EnumProperty( name="Texture_Type", description="Choose between Blender or POV-Ray parameters to specify texture", items= (('agate', 'Agate', '','PLUGIN', 0), @@ -1259,18 +1259,18 @@ class RenderPovSettingsTexture(PropertyGroup): default='emulator', ) - magnet_style = EnumProperty( + magnet_style: EnumProperty( name="Magnet style", description="magnet or julia", items=(('mandel', "Mandelbrot", ""),('julia', "Julia", "")), default='julia') - magnet_type = IntProperty( + magnet_type: IntProperty( name="Magnet_type", description="1 or 2", min=1, max=2, default=2) - warp_types = EnumProperty( + warp_types: EnumProperty( name="Warp Types", description="Select the type of warp", items=(('PLANAR', "Planar", ""), ('CUBIC', "Cubic", ""), @@ -1278,224 +1278,224 @@ class RenderPovSettingsTexture(PropertyGroup): ('CYLINDRICAL', "Cylindrical", ""), ('NONE', "None", "No indentation")), default='NONE') - warp_orientation = EnumProperty( + warp_orientation: EnumProperty( name="Warp Orientation", description="Select the orientation of warp", items=(('x', "X", ""), ('y', "Y", ""), ('z', "Z", "")), default='y') - wave_type = EnumProperty( + wave_type: EnumProperty( name="Waves type", description="Select the type of waves", items=(('ramp', "Ramp", ""), ('sine', "Sine", ""), ('scallop', "Scallop", ""), ('cubic', "Cubic", ""), ('poly', "Poly", ""), ('triangle', 'Triangle', "")), default='ramp') - gen_noise = IntProperty( + gen_noise: IntProperty( name="Noise Generators", description="Noise Generators", min=1, max=3, default=1) - warp_dist_exp = FloatProperty( + warp_dist_exp: FloatProperty( name="Distance exponent", description="Distance exponent", min=0.0, max=100.0, default=1.0) - warp_tor_major_radius = FloatProperty( + warp_tor_major_radius: FloatProperty( name="Major radius", description="Torus is distance from major radius", min=0.0, max=5.0, default=1.0) - warp_turbulence_x = FloatProperty( + warp_turbulence_x: FloatProperty( name="Turbulence X", description="Turbulence X", min=0.0, max=5.0, default=0.0) - warp_turbulence_y = FloatProperty( + warp_turbulence_y: FloatProperty( name="Turbulence Y", description="Turbulence Y", min=0.0, max=5.0, default=0.0) - warp_turbulence_z = FloatProperty( + warp_turbulence_z: FloatProperty( name="Turbulence Z", description="Turbulence Z", min=0.0, max=5.0, default=0.0) - modifier_octaves = IntProperty( + modifier_octaves: IntProperty( name="Turbulence octaves", description="Turbulence octaves", min=1, max=10, default=1) - modifier_lambda = FloatProperty( + modifier_lambda: FloatProperty( name="Turbulence lambda", description="Turbulence lambda", min=0.0, max=5.0, default=1.00) - modifier_omega = FloatProperty( + modifier_omega: FloatProperty( name="Turbulence omega", description="Turbulence omega", min=0.0, max=10.0, default=1.00) - modifier_phase = FloatProperty( + modifier_phase: FloatProperty( name="Phase", description="The phase value causes the map entries to be shifted so that the map " "starts and ends at a different place", min=0.0, max=2.0, default=0.0) - modifier_frequency = FloatProperty( + modifier_frequency: FloatProperty( name="Frequency", description="The frequency keyword adjusts the number of times that a color map " "repeats over one cycle of a pattern", min=0.0, max=25.0, default=2.0) - modifier_turbulence = FloatProperty( + modifier_turbulence: FloatProperty( name="Turbulence", description="Turbulence", min=0.0, max=5.0, default=2.0) - modifier_numbers = IntProperty( + modifier_numbers: IntProperty( name="Numbers", description="Numbers", min=1, max=27, default=2) - modifier_control0 = IntProperty( + modifier_control0: IntProperty( name="Control0", description="Control0", min=0, max=100, default=1) - modifier_control1 = IntProperty( + modifier_control1: IntProperty( name="Control1", description="Control1", min=0, max=100, default=1) - brick_size_x = FloatProperty( + brick_size_x: FloatProperty( name="Brick size x", description="", min=0.0000, max=1.0000, default=0.2500) - brick_size_y = FloatProperty( + brick_size_y: FloatProperty( name="Brick size y", description="", min=0.0000, max=1.0000, default=0.0525) - brick_size_z = FloatProperty( + brick_size_z: FloatProperty( name="Brick size z", description="", min=0.0000, max=1.0000, default=0.1250) - brick_mortar = FloatProperty( + brick_mortar: FloatProperty( name="Mortar", description="Mortar", min=0.000, max=1.500, default=0.01) - julia_complex_1 = FloatProperty( + julia_complex_1: FloatProperty( name="Julia Complex 1", description="", min=0.000, max=1.500, default=0.360) - julia_complex_2 = FloatProperty( + julia_complex_2: FloatProperty( name="Julia Complex 2", description="", min=0.000, max=1.500, default=0.250) - f_iter = IntProperty( + f_iter: IntProperty( name="Fractal Iteration", description="", min=0, max=100, default=20) - f_exponent = IntProperty( + f_exponent: IntProperty( name="Fractal Exponent", description="", min=2, max=33, default=2) - f_ior = IntProperty( + f_ior: IntProperty( name="Fractal Interior", description="", min=1, max=6, default=1) - f_ior_fac = FloatProperty( + f_ior_fac: FloatProperty( name="Fractal Interior Factor", description="", min=0.0, max=10.0, default=1.0) - f_eor = IntProperty( + f_eor: IntProperty( name="Fractal Exterior", description="", min=1, max=8, default=1) - f_eor_fac = FloatProperty( + f_eor_fac: FloatProperty( name="Fractal Exterior Factor", description="", min=0.0, max=10.0, default=1.0) - grad_orient_x= IntProperty( + grad_orient_x: IntProperty( name="Gradient orientation X", description="", min=0, max=1, default=0) - grad_orient_y= IntProperty( + grad_orient_y: IntProperty( name="Gradient orientation Y", description="", min=0, max=1, default=1) - grad_orient_z= IntProperty( + grad_orient_z: IntProperty( name="Gradient orientation Z", description="", min=0, max=1, default=0) - pave_sides = EnumProperty( + pave_sides: EnumProperty( name="Pavement sides", description="", items=(('3', "3", ""), ('4', "4", ""), ('6', "6", "")), default='3') - pave_pat_2= IntProperty( + pave_pat_2: IntProperty( name="Pavement pattern 2", description="maximum: 2", min=1, max=2, default=2) - pave_pat_3= IntProperty( + pave_pat_3: IntProperty( name="Pavement pattern 3", description="maximum: 3", min=1, max=3, default=3) - pave_pat_4= IntProperty( + pave_pat_4: IntProperty( name="Pavement pattern 4", description="maximum: 4", min=1, max=4, default=4) - pave_pat_5= IntProperty( + pave_pat_5: IntProperty( name="Pavement pattern 5", description="maximum: 5", min=1, max=5, default=5) - pave_pat_7= IntProperty( + pave_pat_7: IntProperty( name="Pavement pattern 7", description="maximum: 7", min=1, max=7, default=7) - pave_pat_12= IntProperty( + pave_pat_12: IntProperty( name="Pavement pattern 12", description="maximum: 12", min=1, max=12, default=12) - pave_pat_22= IntProperty( + pave_pat_22: IntProperty( name="Pavement pattern 22", description="maximum: 22", min=1, max=22, default=22) - pave_pat_35= IntProperty( + pave_pat_35: IntProperty( name="Pavement pattern 35", description="maximum: 35", min=1, max=35, default=35) - pave_tiles= IntProperty( + pave_tiles: IntProperty( name="Pavement tiles", description="If sides = 6, maximum tiles 5!!!", min=1, max=6, default=1) - pave_form= IntProperty( + pave_form: IntProperty( name="Pavement form", description="", min=0, max=4, default=0) @@ -1503,7 +1503,7 @@ class RenderPovSettingsTexture(PropertyGroup): #########FUNCTIONS############################################################################# #########FUNCTIONS############################################################################# - func_list = EnumProperty( + func_list: EnumProperty( name="Functions", description="Select the function for create pattern", items=(('NONE', "None", "No indentation"), @@ -1557,131 +1557,131 @@ class RenderPovSettingsTexture(PropertyGroup): default='NONE') - func_x = FloatProperty( + func_x: FloatProperty( name="FX", description="", min=0.0, max=25.0, default=1.0) - func_plus_x = EnumProperty( + func_plus_x: EnumProperty( name="Func plus x", description="", items=(('NONE', "None", ""), ('increase', "*", ""), ('plus', "+", "")), default='NONE') - func_y = FloatProperty( + func_y: FloatProperty( name="FY", description="", min=0.0, max=25.0, default=1.0) - func_plus_y = EnumProperty( + func_plus_y: EnumProperty( name="Func plus y", description="", items=(('NONE', "None", ""), ('increase', "*", ""), ('plus', "+", "")), default='NONE') - func_z = FloatProperty( + func_z: FloatProperty( name="FZ", description="", min=0.0, max=25.0, default=1.0) - func_plus_z = EnumProperty( + func_plus_z: EnumProperty( name="Func plus z", description="", items=(('NONE', "None", ""), ('increase', "*", ""), ('plus', "+", "")), default='NONE') - func_P0 = FloatProperty( + func_P0: FloatProperty( name="P0", description="", min=0.0, max=25.0, default=1.0) - func_P1 = FloatProperty( + func_P1: FloatProperty( name="P1", description="", min=0.0, max=25.0, default=1.0) - func_P2 = FloatProperty( + func_P2: FloatProperty( name="P2", description="", min=0.0, max=25.0, default=1.0) - func_P3 = FloatProperty( + func_P3: FloatProperty( name="P3", description="", min=0.0, max=25.0, default=1.0) - func_P4 = FloatProperty( + func_P4: FloatProperty( name="P4", description="", min=0.0, max=25.0, default=1.0) - func_P5 = FloatProperty( + func_P5: FloatProperty( name="P5", description="", min=0.0, max=25.0, default=1.0) - func_P6 = FloatProperty( + func_P6: FloatProperty( name="P6", description="", min=0.0, max=25.0, default=1.0) - func_P7 = FloatProperty( + func_P7: FloatProperty( name="P7", description="", min=0.0, max=25.0, default=1.0) - func_P8 = FloatProperty( + func_P8: FloatProperty( name="P8", description="", min=0.0, max=25.0, default=1.0) - func_P9 = FloatProperty( + func_P9: FloatProperty( name="P9", description="", min=0.0, max=25.0, default=1.0) ######################################### - tex_rot_x = FloatProperty( + tex_rot_x: FloatProperty( name="Rotate X", description="", min=-180.0, max=180.0, default=0.0) - tex_rot_y = FloatProperty( + tex_rot_y: FloatProperty( name="Rotate Y", description="", min=-180.0, max=180.0, default=0.0) - tex_rot_z = FloatProperty( + tex_rot_z: FloatProperty( name="Rotate Z", description="", min=-180.0, max=180.0, default=0.0) - tex_mov_x = FloatProperty( + tex_mov_x: FloatProperty( name="Move X", description="", min=-100000.0, max=100000.0, default=0.0) - tex_mov_y = FloatProperty( + tex_mov_y: FloatProperty( name="Move Y", description="", min=-100000.0, max=100000.0, default=0.0) - tex_mov_z = FloatProperty( + tex_mov_z: FloatProperty( name="Move Z", description="", min=-100000.0, max=100000.0, default=0.0) - tex_scale_x = FloatProperty( + tex_scale_x: FloatProperty( name="Scale X", description="", min=0.0, max=10000.0, default=1.0) - tex_scale_y = FloatProperty( + tex_scale_y: FloatProperty( name="Scale Y", description="", min=0.0, max=10000.0, default=1.0) - tex_scale_z = FloatProperty( + tex_scale_z: FloatProperty( name="Scale Z", description="", min=0.0, max=10000.0, default=1.0) @@ -1693,7 +1693,7 @@ class RenderPovSettingsTexture(PropertyGroup): class RenderPovSettingsObject(PropertyGroup): # Pov inside_vector used for CSG - inside_vector = FloatVectorProperty( + inside_vector: FloatVectorProperty( name="CSG Inside Vector", description="Direction to shoot CSG inside test rays at", precision=4, step=0.01, min=0, soft_max=1, default=(0.001, 0.001, 0.5), @@ -1701,7 +1701,7 @@ class RenderPovSettingsObject(PropertyGroup): subtype='XYZ') # Importance sampling - importance_value = FloatProperty( + importance_value: FloatProperty( name="Radiosity Importance", description="Priority value relative to other objects for sampling radiosity rays. " "Increase to get more radiosity rays at comparatively small yet " @@ -1709,7 +1709,7 @@ class RenderPovSettingsObject(PropertyGroup): min=0.01, max=1.00, default=0.50) # Collect photons - collect_photons = BoolProperty( + collect_photons: BoolProperty( name="Receive Photon Caustics", description="Enable object to collect photons from other objects caustics. Turn " "off for objects that don't really need to receive caustics (e.g. objects" @@ -1717,7 +1717,7 @@ class RenderPovSettingsObject(PropertyGroup): default=True) # Photons spacing_multiplier - spacing_multiplier = FloatProperty( + spacing_multiplier: FloatProperty( name="Photons Spacing Multiplier", description="Multiplier value relative to global spacing of photons. " "Decrease by half to get 4x more photons at surface of " @@ -1726,29 +1726,29 @@ class RenderPovSettingsObject(PropertyGroup): ##################################CustomPOV Code############################ # Only DUMMIES below for now: - replacement_text = StringProperty( + replacement_text: StringProperty( name="Declared name:", description="Type the declared name in custom POV code or an external .inc " "it points at. Any POV shape expected e.g: isosurface {}", default="") #############POV-Ray specific object properties.############################ - object_as = StringProperty(maxlen=1024) + object_as: StringProperty(maxlen=1024) - imported_loc = FloatVectorProperty( + imported_loc: FloatVectorProperty( name="Imported Pov location", precision=6, default=(0.0, 0.0, 0.0)) - imported_loc_cap = FloatVectorProperty( + imported_loc_cap: FloatVectorProperty( name="Imported Pov location", precision=6, default=(0.0, 0.0, 2.0)) - unlock_parameters = BoolProperty(name="Lock",default = False) + unlock_parameters: BoolProperty(name="Lock",default = False) # not in UI yet but used for sor (lathe) / prism... pov primitives - curveshape = EnumProperty( + curveshape: EnumProperty( name="Povray Shape Type", items=(("birail", "Birail", ""), ("cairo", "Cairo", ""), @@ -1758,14 +1758,14 @@ class RenderPovSettingsObject(PropertyGroup): ("sphere_sweep", "Sphere Sweep", "")), default="sphere_sweep") - mesh_write_as = EnumProperty( + mesh_write_as: EnumProperty( name="Mesh Write As", items=(("blobgrid", "Blob Grid", ""), ("grid", "Grid", ""), ("mesh", "Mesh", "")), default="mesh") - object_ior = FloatProperty( + object_ior: FloatProperty( name="IOR", description="IOR", min=1.0, max=10.0,default=1.0) @@ -1785,128 +1785,128 @@ class RenderPovSettingsObject(PropertyGroup): # dispersion_samples = IntProperty(name="Samples",min=2, max=100,default=7) # reflection = BoolProperty(name="Reflection",description="",default=False) # pass_through = BoolProperty(name="Pass through",description="",default=False) - no_shadow = BoolProperty(name="No Shadow",default=False) + no_shadow: BoolProperty(name="No Shadow",default=False) - no_image = BoolProperty(name="No Image",default=False) + no_image: BoolProperty(name="No Image",default=False) - no_reflection = BoolProperty(name="No Reflection",default=False) + no_reflection: BoolProperty(name="No Reflection",default=False) - no_radiosity = BoolProperty(name="No Radiosity",default=False) + no_radiosity: BoolProperty(name="No Radiosity",default=False) - inverse = BoolProperty(name="Inverse",default=False) + inverse: BoolProperty(name="Inverse",default=False) - sturm = BoolProperty(name="Sturm",default=False) + sturm: BoolProperty(name="Sturm",default=False) - double_illuminate = BoolProperty(name="Double Illuminate",default=False) + double_illuminate: BoolProperty(name="Double Illuminate",default=False) - hierarchy = BoolProperty(name="Hierarchy",default=False) + hierarchy: BoolProperty(name="Hierarchy",default=False) - hollow = BoolProperty(name="Hollow",default=False) + hollow: BoolProperty(name="Hollow",default=False) - boundorclip = EnumProperty( + boundorclip: EnumProperty( name="Boundorclip", items=(("none", "None", ""), ("bounded_by", "Bounded_by", ""), ("clipped_by", "Clipped_by", "")), default="none") - boundorclipob = StringProperty(maxlen=1024) + boundorclipob: StringProperty(maxlen=1024) - addboundorclip = BoolProperty(description="",default=False) + addboundorclip: BoolProperty(description="",default=False) - blob_threshold = FloatProperty(name="Threshold",min=0.00, max=10.0, default=0.6) + blob_threshold: FloatProperty(name="Threshold",min=0.00, max=10.0, default=0.6) - blob_strength = FloatProperty(name="Strength",min=-10.00, max=10.0, default=1.00) + blob_strength: FloatProperty(name="Strength",min=-10.00, max=10.0, default=1.00) - res_u = IntProperty(name="U",min=100, max=1000, default=500) + res_u: IntProperty(name="U",min=100, max=1000, default=500) - res_v = IntProperty(name="V",min=100, max=1000, default=500) + res_v: IntProperty(name="V",min=100, max=1000, default=500) - contained_by = EnumProperty( + contained_by: EnumProperty( name="Contained by", items=(("box", "Box", ""), ("sphere", "Sphere", "")), default="box") - container_scale = FloatProperty(name="Container Scale",min=0.0, max=10.0, default=1.00) + container_scale: FloatProperty(name="Container Scale",min=0.0, max=10.0, default=1.00) - threshold = FloatProperty(name="Threshold",min=0.0, max=10.0, default=0.00) + threshold: FloatProperty(name="Threshold",min=0.0, max=10.0, default=0.00) - accuracy = FloatProperty(name="Accuracy",min=0.0001, max=0.1, default=0.001) + accuracy: FloatProperty(name="Accuracy",min=0.0001, max=0.1, default=0.001) - max_gradient = FloatProperty(name="Max Gradient",min=0.0, max=100.0, default=5.0) + max_gradient: FloatProperty(name="Max Gradient",min=0.0, max=100.0, default=5.0) - all_intersections = BoolProperty(name="All Intersections",default=False) + all_intersections: BoolProperty(name="All Intersections",default=False) - max_trace = IntProperty(name="Max Trace",min=1, max=100,default=1) + max_trace: IntProperty(name="Max Trace",min=1, max=100,default=1) def prop_update_cylinder(self, context): if bpy.ops.pov.cylinder_update.poll(): bpy.ops.pov.cylinder_update() - cylinder_radius = FloatProperty(name="Cylinder R",min=0.00, max=10.0, default=0.04, update=prop_update_cylinder) - cylinder_location_cap = FloatVectorProperty( + cylinder_radius: FloatProperty(name="Cylinder R",min=0.00, max=10.0, default=0.04, update=prop_update_cylinder) + cylinder_location_cap: FloatVectorProperty( name="Cylinder Cap Location", subtype='TRANSLATION', description="The position of the 'other' end of the cylinder (relative to object location)", default=(0.0, 0.0, 2.0), update=prop_update_cylinder, ) - imported_cyl_loc = FloatVectorProperty( + imported_cyl_loc: FloatVectorProperty( name="Imported Pov location", precision=6, default=(0.0, 0.0, 0.0)) - imported_cyl_loc_cap = FloatVectorProperty( + imported_cyl_loc_cap: FloatVectorProperty( name="Imported Pov location", precision=6, default=(0.0, 0.0, 2.0)) def prop_update_sphere(self, context): bpy.ops.pov.sphere_update() - sphere_radius = FloatProperty(name="Sphere radius",min=0.00, max=10.0, default=0.5, update=prop_update_sphere) + sphere_radius: FloatProperty(name="Sphere radius",min=0.00, max=10.0, default=0.5, update=prop_update_sphere) def prop_update_cone(self, context): bpy.ops.pov.cone_update() - cone_base_radius = FloatProperty( + cone_base_radius: FloatProperty( name = "Base radius", description = "The first radius of the cone", default = 1.0, min = 0.01, max = 100.0, update=prop_update_cone) - cone_cap_radius = FloatProperty( + cone_cap_radius: FloatProperty( name = "Cap radius", description = "The second radius of the cone", default = 0.3, min = 0.0, max = 100.0, update=prop_update_cone) - cone_segments = IntProperty( + cone_segments: IntProperty( name = "Segments", description = "Radial segmentation of proxy mesh", default = 16, min = 3, max = 265, update=prop_update_cone) - cone_height = FloatProperty( + cone_height: FloatProperty( name = "Height", description = "Height of the cone", default = 2.0, min = 0.01, max = 100.0, update=prop_update_cone) - cone_base_z = FloatProperty() - cone_cap_z = FloatProperty() + cone_base_z: FloatProperty() + cone_cap_z: FloatProperty() ###########Parametric def prop_update_parametric(self, context): bpy.ops.pov.parametric_update() - u_min = FloatProperty(name = "U Min", + u_min: FloatProperty(name = "U Min", description = "", default = 0.0, update=prop_update_parametric) - v_min = FloatProperty(name = "V Min", + v_min: FloatProperty(name = "V Min", description = "", default = 0.0, update=prop_update_parametric) - u_max = FloatProperty(name = "U Max", + u_max: FloatProperty(name = "U Max", description = "", default = 6.28, update=prop_update_parametric) - v_max = FloatProperty(name = "V Max", + v_max: FloatProperty(name = "V Max", description = "", default = 12.57, update=prop_update_parametric) - x_eq = StringProperty( + x_eq: StringProperty( maxlen=1024, default = "cos(v)*(1+cos(u))*sin(v/8)", update=prop_update_parametric) - y_eq = StringProperty( + y_eq: StringProperty( maxlen=1024, default = "sin(u)*sin(v/8)+cos(v/8)*1.5", update=prop_update_parametric) - z_eq = StringProperty( + z_eq: StringProperty( maxlen=1024, default = "sin(v)*(1+cos(u))*sin(v/8)", update=prop_update_parametric) ###########Torus @@ -1914,59 +1914,59 @@ class RenderPovSettingsObject(PropertyGroup): def prop_update_torus(self, context): bpy.ops.pov.torus_update() - torus_major_segments = IntProperty( + torus_major_segments: IntProperty( name = "Segments", description = "Radial segmentation of proxy mesh", default = 48, min = 3, max = 720, update=prop_update_torus) - torus_minor_segments = IntProperty( + torus_minor_segments: IntProperty( name = "Segments", description = "Cross-section segmentation of proxy mesh", default = 12, min = 3, max = 720, update=prop_update_torus) - torus_major_radius = FloatProperty( + torus_major_radius: FloatProperty( name="Major radius", description="Major radius", min=0.00, max=100.00, default=1.0, update=prop_update_torus) - torus_minor_radius = FloatProperty( + torus_minor_radius: FloatProperty( name="Minor radius", description="Minor radius", min=0.00, max=100.00, default=0.25, update=prop_update_torus) ###########Rainbow - arc_angle = FloatProperty(name = "Arc angle", + arc_angle: FloatProperty(name = "Arc angle", description = "The angle of the raynbow arc in degrees", default = 360, min = 0.01, max = 360.0) - falloff_angle = FloatProperty(name = "Falloff angle", + falloff_angle: FloatProperty(name = "Falloff angle", description = "The angle after which rainbow dissolves into background", default = 360, min = 0.0, max = 360) ###########HeightFields - quality = IntProperty(name = "Quality", + quality: IntProperty(name = "Quality", description = "", default = 100, min = 1, max = 100) - hf_filename = StringProperty(maxlen = 1024) + hf_filename: StringProperty(maxlen = 1024) - hf_gamma = FloatProperty( + hf_gamma: FloatProperty( name="Gamma", description="Gamma", min=0.0001, max=20.0, default=1.0) - hf_premultiplied = BoolProperty( + hf_premultiplied: BoolProperty( name="Premultiplied", description="Premultiplied", default=True) - hf_smooth = BoolProperty( + hf_smooth: BoolProperty( name="Smooth", description="Smooth", default=False) - hf_water = FloatProperty( + hf_water: FloatProperty( name="Water Level", description="Wather Level", min=0.00, max=1.00, default=0.0) - hf_hierarchy = BoolProperty( + hf_hierarchy: BoolProperty( name="Hierarchy", description="Height field hierarchy", default=True) @@ -1975,33 +1975,33 @@ class RenderPovSettingsObject(PropertyGroup): def prop_update_superellipsoid(self, context): bpy.ops.pov.superellipsoid_update() - se_param1 = FloatProperty( + se_param1: FloatProperty( name="Parameter 1", description="", min=0.00, max=10.0, default=0.04) - se_param2 = FloatProperty( + se_param2: FloatProperty( name="Parameter 2", description="", min=0.00, max=10.0, default=0.04) - se_u = IntProperty(name = "U-segments", + se_u: IntProperty(name = "U-segments", description = "radial segmentation", default = 20, min = 4, max = 265, update=prop_update_superellipsoid) - se_v = IntProperty(name = "V-segments", + se_v: IntProperty(name = "V-segments", description = "lateral segmentation", default = 20, min = 4, max = 265, update=prop_update_superellipsoid) - se_n1 = FloatProperty(name = "Ring manipulator", + se_n1: FloatProperty(name = "Ring manipulator", description = "Manipulates the shape of the Ring", default = 1.0, min = 0.01, max = 100.0, update=prop_update_superellipsoid) - se_n2 = FloatProperty(name = "Cross manipulator", + se_n2: FloatProperty(name = "Cross manipulator", description = "Manipulates the shape of the cross-section", default = 1.0, min = 0.01, max = 100.0, update=prop_update_superellipsoid) - se_edit = EnumProperty(items=[("NOTHING", "Nothing", ""), + se_edit: EnumProperty(items=[("NOTHING", "Nothing", ""), ("NGONS", "N-Gons", ""), ("TRIANGLES", "Triangles", "")], name="Fill up and down", @@ -2009,7 +2009,7 @@ class RenderPovSettingsObject(PropertyGroup): default='TRIANGLES', update=prop_update_superellipsoid) #############Used for loft and Superellipsoid, etc. - curveshape = EnumProperty( + curveshape: EnumProperty( name="Povray Shape Type", items=(("birail", "Birail", ""), ("cairo", "Cairo", ""), @@ -2024,117 +2024,117 @@ class RenderPovSettingsObject(PropertyGroup): def prop_update_supertorus(self, context): bpy.ops.pov.supertorus_update() - st_major_radius = FloatProperty( + st_major_radius: FloatProperty( name="Major radius", description="Major radius", min=0.00, max=100.00, default=1.0, update=prop_update_supertorus) - st_minor_radius = FloatProperty( + st_minor_radius: FloatProperty( name="Minor radius", description="Minor radius", min=0.00, max=100.00, default=0.25, update=prop_update_supertorus) - st_ring = FloatProperty( + st_ring: FloatProperty( name="Ring", description="Ring manipulator", min=0.0001, max=100.00, default=1.00, update=prop_update_supertorus) - st_cross = FloatProperty( + st_cross: FloatProperty( name="Cross", description="Cross manipulator", min=0.0001, max=100.00, default=1.00, update=prop_update_supertorus) - st_accuracy = FloatProperty( + st_accuracy: FloatProperty( name="Accuracy", description="Supertorus accuracy", min=0.00001, max=1.00, default=0.001) - st_max_gradient = FloatProperty( + st_max_gradient: FloatProperty( name="Gradient", description="Max gradient", min=0.0001, max=100.00, default=10.00, update=prop_update_supertorus) - st_R = FloatProperty(name = "big radius", + st_R: FloatProperty(name = "big radius", description = "The radius inside the tube", default = 1.0, min = 0.01, max = 100.0, update=prop_update_supertorus) - st_r = FloatProperty(name = "small radius", + st_r: FloatProperty(name = "small radius", description = "The radius of the tube", default = 0.3, min = 0.01, max = 100.0, update=prop_update_supertorus) - st_u = IntProperty(name = "U-segments", + st_u: IntProperty(name = "U-segments", description = "radial segmentation", default = 16, min = 3, max = 265, update=prop_update_supertorus) - st_v = IntProperty(name = "V-segments", + st_v: IntProperty(name = "V-segments", description = "lateral segmentation", default = 8, min = 3, max = 265, update=prop_update_supertorus) - st_n1 = FloatProperty(name = "Ring manipulator", + st_n1: FloatProperty(name = "Ring manipulator", description = "Manipulates the shape of the Ring", default = 1.0, min = 0.01, max = 100.0, update=prop_update_supertorus) - st_n2 = FloatProperty(name = "Cross manipulator", + st_n2: FloatProperty(name = "Cross manipulator", description = "Manipulates the shape of the cross-section", default = 1.0, min = 0.01, max = 100.0, update=prop_update_supertorus) - st_ie = BoolProperty(name = "Use Int.+Ext. radii", + st_ie: BoolProperty(name = "Use Int.+Ext. radii", description = "Use internal and external radii", default = False, update=prop_update_supertorus) - st_edit = BoolProperty(name="", + st_edit: BoolProperty(name="", description="", default=False, options={'HIDDEN'}, update=prop_update_supertorus) ########################Loft - loft_n = IntProperty(name = "Segments", + loft_n: IntProperty(name = "Segments", description = "Vertical segments", default = 16, min = 3, max = 720) - loft_rings_bottom = IntProperty(name = "Bottom", + loft_rings_bottom: IntProperty(name = "Bottom", description = "Bottom rings", default = 5, min = 2, max = 100) - loft_rings_side = IntProperty(name = "Side", + loft_rings_side: IntProperty(name = "Side", description = "Side rings", default = 10, min = 2, max = 100) - loft_thick = FloatProperty(name = "Thickness", + loft_thick: FloatProperty(name = "Thickness", description = "Manipulates the shape of the Ring", default = 0.3, min = 0.01, max = 1.0) - loft_r = FloatProperty(name = "Radius", + loft_r: FloatProperty(name = "Radius", description = "Radius", default = 1, min = 0.01, max = 10) - loft_height = FloatProperty(name = "Height", + loft_height: FloatProperty(name = "Height", description = "Manipulates the shape of the Ring", default = 2, min = 0.01, max = 10.0) ###################Prism - prism_n = IntProperty(name = "Sides", + prism_n: IntProperty(name = "Sides", description = "Number of sides", default = 5, min = 3, max = 720) - prism_r = FloatProperty(name = "Radius", + prism_r: FloatProperty(name = "Radius", description = "Radius", default = 1.0) ##################Isosurface - iso_function_text = StringProperty(name="Function Text",maxlen=1024)#,update=iso_props_update_callback) + iso_function_text: StringProperty(name="Function Text",maxlen=1024)#,update=iso_props_update_callback) ##################PolygonToCircle - polytocircle_resolution = IntProperty(name = "Resolution", + polytocircle_resolution: IntProperty(name = "Resolution", description = "", default = 3, min = 0, max = 256) - polytocircle_ngon = IntProperty(name = "NGon", + polytocircle_ngon: IntProperty(name = "NGon", description = "", min = 3, max = 64,default = 5) - polytocircle_ngonR = FloatProperty(name = "NGon Radius", + polytocircle_ngonR: FloatProperty(name = "NGon Radius", description = "", default = 0.3) - polytocircle_circleR = FloatProperty(name = "Circle Radius", + polytocircle_circleR: FloatProperty(name = "Circle Radius", description = "", default = 1.0) @@ -2143,7 +2143,7 @@ class RenderPovSettingsObject(PropertyGroup): # Modifiers POV properties. ############################################################################### #class RenderPovSettingsModifier(PropertyGroup): - boolean_mod = EnumProperty( + boolean_mod: EnumProperty( name="Operation", description="Choose the type of calculation for Boolean modifier", items=(("BMESH", "Use the BMesh Boolean Solver", ""), @@ -2164,12 +2164,12 @@ class RenderPovSettingsObject(PropertyGroup): ############################################################################### class RenderPovSettingsCamera(PropertyGroup): #DOF Toggle - dof_enable = BoolProperty( + dof_enable: BoolProperty( name="Depth Of Field", description="EnablePOV-Ray Depth Of Field ", default=False) # Aperture (Intensity of the Blur) - dof_aperture = FloatProperty( + dof_aperture: FloatProperty( name="Aperture", description="Similar to a real camera's aperture effect over focal blur (though not " "in physical units and independent of focal length). " @@ -2177,30 +2177,30 @@ class RenderPovSettingsCamera(PropertyGroup): min=0.01, max=1.00, default=0.50) # Aperture adaptive sampling - dof_samples_min = IntProperty( + dof_samples_min: IntProperty( name="Samples Min", description="Minimum number of rays to use for each pixel", min=1, max=128, default=3) - dof_samples_max = IntProperty( + dof_samples_max: IntProperty( name="Samples Max", description="Maximum number of rays to use for each pixel", min=1, max=128, default=9) - dof_variance = IntProperty( + dof_variance: IntProperty( name="Variance", description="Minimum threshold (fractional value) for adaptive DOF sampling (up " "increases quality and render time). The value for the variance should " "be in the range of the smallest displayable color difference", min=1, max=100000, soft_max=10000, default=8192) - dof_confidence = FloatProperty( + dof_confidence: FloatProperty( name="Confidence", description="Probability to reach the real color value. Larger confidence values " "will lead to more samples, slower traces and better images", min=0.01, max=0.99, default=0.20) - normal_enable = BoolProperty(name="Perturbated Camera", default=False) - cam_normal = FloatProperty(name="Normal Strength", min=0.0, max=1.0, default=0.0) - normal_patterns = EnumProperty( + normal_enable: BoolProperty(name="Perturbated Camera", default=False) + cam_normal: FloatProperty(name="Normal Strength", min=0.0, max=1.0, default=0.0) + normal_patterns: EnumProperty( name="Pattern", description="", items=(('agate', "Agate", ""), ('boxed', "Boxed", ""), ('bumps', "Bumps", ""), ('cells', "Cells", ""), @@ -2213,12 +2213,12 @@ class RenderPovSettingsCamera(PropertyGroup): ('square', "Square", ""),('tiling', "Tiling", ""), ('waves', "Waves", ""), ('wood', "Wood", ""),('wrinkles', "Wrinkles", "")), default='agate') - turbulence = FloatProperty(name="Turbulence", min=0.0, max=100.0, default=0.1) - scale = FloatProperty(name="Scale", min=0.0,default=1.0) + turbulence: FloatProperty(name="Turbulence", min=0.0, max=100.0, default=0.1) + scale: FloatProperty(name="Scale", min=0.0,default=1.0) ##################################CustomPOV Code############################ # Only DUMMIES below for now: - replacement_text = StringProperty( + replacement_text: StringProperty( name="Texts in blend file", description="Type the declared name in custom POV code or an external .inc " "it points at. camera {} expected", @@ -2230,7 +2230,7 @@ class RenderPovSettingsCamera(PropertyGroup): # Text POV properties. ############################################################################### class RenderPovSettingsText(PropertyGroup): - custom_code = EnumProperty( + custom_code: EnumProperty( name="Custom Code", description="rendered source: Both adds text at the " "top of the exported POV-Ray file", @@ -2245,7 +2245,7 @@ class RenderPovSettingsText(PropertyGroup): class PovrayPreferences(AddonPreferences): bl_idname = __name__ - branch_feature_set_povray = EnumProperty( + branch_feature_set_povray: EnumProperty( name="Feature Set", description="Choose between official (POV-Ray) or (UberPOV) " "development branch features to write in the pov file", @@ -2254,12 +2254,12 @@ class PovrayPreferences(AddonPreferences): default='povray' ) - filepath_povray = StringProperty( + filepath_povray: StringProperty( name="Binary Location", description="Path to renderer executable", subtype='FILE_PATH', ) - docpath_povray = StringProperty( + docpath_povray: StringProperty( name="Includes Location", description="Path to Insert Menu files", subtype='FILE_PATH', diff --git a/render_povray/nodes.py b/render_povray/nodes.py index a8281c8a5619df2fa0b41c4115aa5eb9698c7e78..17ff2285313975d4e0701709f98c1e621845763d 100644 --- a/render_povray/nodes.py +++ b/render_povray/nodes.py @@ -286,7 +286,7 @@ class PovrayMappingNode(Node, ObjectNodeTree): bl_label = 'Mapping' bl_icon = 'SOUND' - warp_type = EnumProperty( + warp_type: EnumProperty( name="Warp Types", description="Select the type of warp", items=( ('cubic', "Cubic", ""), ('cylindrical', "Cylindrical", ""),('planar', "Planar", ""), @@ -295,18 +295,18 @@ class PovrayMappingNode(Node, ObjectNodeTree): ('NONE', "None", "No indentation")), default='NONE') - warp_orientation = EnumProperty( + warp_orientation: EnumProperty( name="Warp Orientation", description="Select the orientation of warp", items=(('x', "X", ""), ('y', "Y", ""), ('z', "Z", "")), default='y') - warp_dist_exp = FloatProperty( + warp_dist_exp: FloatProperty( name="Distance exponent", description="Distance exponent", min=0.0, max=100.0, default=1.0) - warp_tor_major_radius = FloatProperty( + warp_tor_major_radius: FloatProperty( name="Major radius", description="Torus is distance from major radius", min=0.0, max=5.0, default=1.0) @@ -472,7 +472,7 @@ class PovrayColorImageNode(Node, ObjectNodeTree): bl_idname = 'PovrayColorImageNode' bl_label = 'Image map' - map_type = bpy.props.EnumProperty( + map_type: bpy.props.EnumProperty( name="Map type", description="", items=( ('uv_mapping', "UV", ""), @@ -481,8 +481,8 @@ class PovrayColorImageNode(Node, ObjectNodeTree): ('2', "Cylindrical", "Cylindrical mapping"), ('5', "Torroidal", "Torus or donut shaped mapping")), default='0') - image = StringProperty(maxlen=1024) # , subtype="FILE_PATH" - interpolate = EnumProperty( + image: StringProperty(maxlen=1024) # , subtype="FILE_PATH" + interpolate: EnumProperty( name="Interpolate", description="Adding the interpolate keyword can smooth the jagged look of a bitmap", items=( @@ -490,8 +490,8 @@ class PovrayColorImageNode(Node, ObjectNodeTree): ('4', "Normalized", "Gives normalized distance"), ), default='2') - premultiplied = BoolProperty(default=False) - once = BoolProperty(description="Not to repeat", default=False) + premultiplied: BoolProperty(default=False) + once: BoolProperty(description="Not to repeat", default=False) def init(self, context): @@ -629,7 +629,7 @@ class PovrayImagePatternNode(Node, ObjectNodeTree): bl_label = 'Image pattern' bl_icon = 'SOUND' - map_type = bpy.props.EnumProperty( + map_type: bpy.props.EnumProperty( name="Map type", description="", items=( @@ -640,8 +640,8 @@ class PovrayImagePatternNode(Node, ObjectNodeTree): ('5', "Torroidal", "Torus or donut shaped mapping"), ), default='0') - image = StringProperty(maxlen=1024) # , subtype="FILE_PATH" - interpolate = EnumProperty( + image: StringProperty(maxlen=1024) # , subtype="FILE_PATH" + interpolate: EnumProperty( name="Interpolate", description="Adding the interpolate keyword can smooth the jagged look of a bitmap", items=( @@ -649,9 +649,9 @@ class PovrayImagePatternNode(Node, ObjectNodeTree): ('4', "Normalized", "Gives normalized distance"), ), default='2') - premultiplied = BoolProperty(default=False) - once = BoolProperty(description="Not to repeat", default=False) - use_alpha = BoolProperty(default=True) + premultiplied: BoolProperty(default=False) + once: BoolProperty(description="Not to repeat", default=False) + use_alpha: BoolProperty(default=True) def init(self, context): gamma=self.inputs.new('PovraySocketFloat_000001_10', "Gamma") @@ -795,22 +795,22 @@ class ShaderTextureMapNode(Node, ObjectNodeTree): bl_idname = 'ShaderTextureMapNode' bl_label = 'Texture map' - brick_size_x = FloatProperty( + brick_size_x: FloatProperty( name="X", description="", min=0.0000, max=1.0000, default=0.2500) - brick_size_y = FloatProperty( + brick_size_y: FloatProperty( name="Y", description="", min=0.0000, max=1.0000, default=0.0525) - brick_size_z = FloatProperty( + brick_size_z: FloatProperty( name="Z", description="", min=0.0000, max=1.0000, default=0.1250) - brick_mortar = FloatProperty( + brick_mortar: FloatProperty( name="Mortar", description="Mortar", min=0.000, max=1.500, default=0.01) @@ -1164,7 +1164,7 @@ class NODE_OT_povray_image_open(bpy.types.Operator): bl_idname = "pov.imageopen" bl_label = "Open" - filepath = StringProperty( + filepath: StringProperty( name="File Path", description="Open image", maxlen=1024, diff --git a/render_povray/primitives.py b/render_povray/primitives.py index 1ae43c1ae0d1d353d1f9700eb9fdb8d46a097c3a..8eb17a361b10a8a119d58d063a926fca696cd1ef 100644 --- a/render_povray/primitives.py +++ b/render_povray/primitives.py @@ -216,29 +216,29 @@ class POVRAY_OT_superellipsoid_add(bpy.types.Operator): # XXX Keep it in sync with __init__'s RenderPovSettingsConePrimitive # If someone knows how to define operators' props from a func, I'd be delighted to learn it! - se_param1 = FloatProperty( + se_param1: FloatProperty( name="Parameter 1", description="", min=0.00, max=10.0, default=0.04) - se_param2 = FloatProperty( + se_param2: FloatProperty( name="Parameter 2", description="", min=0.00, max=10.0, default=0.04) - se_u = IntProperty(name = "U-segments", + se_u: IntProperty(name = "U-segments", description = "radial segmentation", default = 20, min = 4, max = 265) - se_v = IntProperty(name = "V-segments", + se_v: IntProperty(name = "V-segments", description = "lateral segmentation", default = 20, min = 4, max = 265) - se_n1 = FloatProperty(name = "Ring manipulator", + se_n1: FloatProperty(name = "Ring manipulator", description = "Manipulates the shape of the Ring", default = 1.0, min = 0.01, max = 100.0) - se_n2 = FloatProperty(name = "Cross manipulator", + se_n2: FloatProperty(name = "Cross manipulator", description = "Manipulates the shape of the cross-section", default = 1.0, min = 0.01, max = 100.0) - se_edit = EnumProperty(items=[("NOTHING", "Nothing", ""), + se_edit: EnumProperty(items=[("NOTHING", "Nothing", ""), ("NGONS", "N-Gons", ""), ("TRIANGLES", "Triangles", "")], name="Fill up and down", @@ -414,28 +414,28 @@ class POVRAY_OT_supertorus_add(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} COMPAT_ENGINES = {'POVRAY_RENDER'} - st_R = FloatProperty(name = "big radius", + st_R: FloatProperty(name = "big radius", description = "The radius inside the tube", default = 1.0, min = 0.01, max = 100.0) - st_r = FloatProperty(name = "small radius", + st_r: FloatProperty(name = "small radius", description = "The radius of the tube", default = 0.3, min = 0.01, max = 100.0) - st_u = IntProperty(name = "U-segments", + st_u: IntProperty(name = "U-segments", description = "radial segmentation", default = 16, min = 3, max = 265) - st_v = IntProperty(name = "V-segments", + st_v: IntProperty(name = "V-segments", description = "lateral segmentation", default = 8, min = 3, max = 265) - st_n1 = FloatProperty(name = "Ring manipulator", + st_n1: FloatProperty(name = "Ring manipulator", description = "Manipulates the shape of the Ring", default = 1.0, min = 0.01, max = 100.0) - st_n2 = FloatProperty(name = "Cross manipulator", + st_n2: FloatProperty(name = "Cross manipulator", description = "Manipulates the shape of the cross-section", default = 1.0, min = 0.01, max = 100.0) - st_ie = BoolProperty(name = "Use Int.+Ext. radii", + st_ie: BoolProperty(name = "Use Int.+Ext. radii", description = "Use internal and external radii", default = False) - st_edit = BoolProperty(name="", + st_edit: BoolProperty(name="", description="", default=False, options={'HIDDEN'}) @@ -482,22 +482,22 @@ class POVRAY_OT_loft_add(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} COMPAT_ENGINES = {'POVRAY_RENDER'} - loft_n = IntProperty(name = "Segments", + loft_n: IntProperty(name = "Segments", description = "Vertical segments", default = 16, min = 3, max = 720) - loft_rings_bottom = IntProperty(name = "Bottom", + loft_rings_bottom: IntProperty(name = "Bottom", description = "Bottom rings", default = 5, min = 2, max = 100) - loft_rings_side = IntProperty(name = "Side", + loft_rings_side: IntProperty(name = "Side", description = "Side rings", default = 10, min = 2, max = 100) - loft_thick = FloatProperty(name = "Thickness", + loft_thick: FloatProperty(name = "Thickness", description = "Manipulates the shape of the Ring", default = 0.3, min = 0.01, max = 1.0) - loft_r = FloatProperty(name = "Radius", + loft_r: FloatProperty(name = "Radius", description = "Radius", default = 1, min = 0.01, max = 10) - loft_height = FloatProperty(name = "Height", + loft_height: FloatProperty(name = "Height", description = "Manipulates the shape of the Ring", default = 2, min = 0.01, max = 10.0) @@ -672,14 +672,14 @@ class POVRAY_OT_cylinder_add(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} # XXX Keep it in sync with __init__'s cylinder Primitive - R = FloatProperty(name="Cylinder radius", min=0.00, max=10.0, default=1.0) + R: FloatProperty(name="Cylinder radius", min=0.00, max=10.0, default=1.0) - imported_cyl_loc = FloatVectorProperty( + imported_cyl_loc: FloatVectorProperty( name="Imported Pov base location", precision=6, default=(0.0, 0.0, 0.0)) - imported_cyl_loc_cap = FloatVectorProperty( + imported_cyl_loc_cap: FloatVectorProperty( name="Imported Pov cap location", precision=6, default=(0.0, 0.0, 2.0)) @@ -780,9 +780,9 @@ class POVRAY_OT_sphere_add(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} # XXX Keep it in sync with __init__'s torus Primitive - R = FloatProperty(name="Sphere radius",min=0.00, max=10.0, default=0.5) + R: FloatProperty(name="Sphere radius",min=0.00, max=10.0, default=0.5) - imported_loc = FloatVectorProperty( + imported_loc: FloatVectorProperty( name="Imported Pov location", precision=6, default=(0.0, 0.0, 0.0)) @@ -914,16 +914,16 @@ class POVRAY_OT_cone_add(bpy.types.Operator): # XXX Keep it in sync with __init__'s RenderPovSettingsConePrimitive # If someone knows how to define operators' props from a func, I'd be delighted to learn it! - base = FloatProperty( + base: FloatProperty( name = "Base radius", description = "The first radius of the cone", default = 1.0, min = 0.01, max = 100.0) - cap = FloatProperty( + cap: FloatProperty( name = "Cap radius", description = "The second radius of the cone", default = 0.3, min = 0.0, max = 100.0) - seg = IntProperty( + seg: IntProperty( name = "Segments", description = "Radial segmentation of the proxy mesh", default = 16, min = 3, max = 265) - height = FloatProperty( + height: FloatProperty( name = "Height", description = "Height of the cone", default = 2.0, min = 0.01, max = 100.0) @@ -1091,32 +1091,32 @@ class POVRAY_OT_height_field_add(bpy.types.Operator, ImportHelper): # default="*.exr;*.gif;*.hdr;*.iff;*.jpeg;*.jpg;*.pgm;*.png;*.pot;*.ppm;*.sys;*.tga;*.tiff;*.EXR;*.GIF;*.HDR;*.IFF;*.JPEG;*.JPG;*.PGM;*.PNG;*.POT;*.PPM;*.SYS;*.TGA;*.TIFF", # options={'HIDDEN'}, # ) - quality = IntProperty(name = "Quality", + quality: IntProperty(name = "Quality", description = "", default = 100, min = 1, max = 100) - hf_filename = StringProperty(maxlen = 1024) + hf_filename: StringProperty(maxlen = 1024) - hf_gamma = FloatProperty( + hf_gamma: FloatProperty( name="Gamma", description="Gamma", min=0.0001, max=20.0, default=1.0) - hf_premultiplied = BoolProperty( + hf_premultiplied: BoolProperty( name="Premultiplied", description="Premultiplied", default=True) - hf_smooth = BoolProperty( + hf_smooth: BoolProperty( name="Smooth", description="Smooth", default=False) - hf_water = FloatProperty( + hf_water: FloatProperty( name="Water Level", description="Wather Level", min=0.00, max=1.00, default=0.0) - hf_hierarchy = BoolProperty( + hf_hierarchy: BoolProperty( name="Hierarchy", description="Height field hierarchy", default=True) @@ -1209,16 +1209,16 @@ class POVRAY_OT_torus_add(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} # XXX Keep it in sync with __init__'s torus Primitive - mas = IntProperty(name = "Major Segments", + mas: IntProperty(name = "Major Segments", description = "", default = 48, min = 3, max = 720) - mis = IntProperty(name = "Minor Segments", + mis: IntProperty(name = "Minor Segments", description = "", default = 12, min = 3, max = 720) - mar = FloatProperty(name = "Major Radius", + mar: FloatProperty(name = "Major Radius", description = "", default = 1.0) - mir = FloatProperty(name = "Minor Radius", + mir: FloatProperty(name = "Minor Radius", description = "", default = 0.25) def execute(self,context): @@ -1261,10 +1261,10 @@ class POVRAY_OT_prism_add(bpy.types.Operator): bl_description = "Create Prism" bl_options = {'REGISTER', 'UNDO'} - prism_n = IntProperty(name = "Sides", + prism_n: IntProperty(name = "Sides", description = "Number of sides", default = 5, min = 3, max = 720) - prism_r = FloatProperty(name = "Radius", + prism_r: FloatProperty(name = "Radius", description = "Radius", default = 1.0) def execute(self,context): @@ -1368,23 +1368,23 @@ class POVRAY_OT_parametric_add(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} # XXX Keep it in sync with __init__'s Parametric primitive - u_min = FloatProperty(name = "U Min", + u_min: FloatProperty(name = "U Min", description = "", default = 0.0) - v_min = FloatProperty(name = "V Min", + v_min: FloatProperty(name = "V Min", description = "", default = 0.0) - u_max = FloatProperty(name = "U Max", + u_max: FloatProperty(name = "U Max", description = "", default = 6.28) - v_max = FloatProperty(name = "V Max", + v_max: FloatProperty(name = "V Max", description = "", default = 12.57) - x_eq = StringProperty( + x_eq: StringProperty( maxlen=1024, default = "cos(v)*(1+cos(u))*sin(v/8)") - y_eq = StringProperty( + y_eq: StringProperty( maxlen=1024, default = "sin(u)*sin(v/8)+cos(v/8)*1.5") - z_eq = StringProperty( + z_eq: StringProperty( maxlen=1024, default = "sin(v)*(1+cos(u))*sin(v/8)") def execute(self,context): @@ -1429,16 +1429,16 @@ class POVRAY_OT_shape_polygon_to_circle_add(bpy.types.Operator): COMPAT_ENGINES = {'POVRAY_RENDER'} # XXX Keep it in sync with __init__'s polytocircle properties - polytocircle_resolution = IntProperty(name = "Resolution", + polytocircle_resolution: IntProperty(name = "Resolution", description = "", default = 3, min = 0, max = 256) - polytocircle_ngon = IntProperty(name = "NGon", + polytocircle_ngon: IntProperty(name = "NGon", description = "", min = 3, max = 64,default = 5) - polytocircle_ngonR = FloatProperty(name = "NGon Radius", + polytocircle_ngonR: FloatProperty(name = "NGon Radius", description = "", default = 0.3) - polytocircle_circleR = FloatProperty(name = "Circle Radius", + polytocircle_circleR: FloatProperty(name = "Circle Radius", description = "", default = 1.0) def execute(self,context): @@ -1487,16 +1487,16 @@ class ImportPOV(bpy.types.Operator, ImportHelper): # ----------- # File props. - files = CollectionProperty(type=bpy.types.OperatorFileListElement, options={'HIDDEN', 'SKIP_SAVE'}) - directory = StringProperty(maxlen=1024, subtype='FILE_PATH', options={'HIDDEN', 'SKIP_SAVE'}) + files: CollectionProperty(type=bpy.types.OperatorFileListElement, options={'HIDDEN', 'SKIP_SAVE'}) + directory: StringProperty(maxlen=1024, subtype='FILE_PATH', options={'HIDDEN', 'SKIP_SAVE'}) filename_ext = {".pov",".inc"} - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.pov;*.inc", options={'HIDDEN'}, ) - import_at_cur = BoolProperty(name="Import at Cursor Location", + import_at_cur: BoolProperty(name="Import at Cursor Location", description = "Ignore Object Matrix", default=False) diff --git a/sequencer_kinoraw_tools/__init__.py b/sequencer_kinoraw_tools/__init__.py index fe2946f9a433bed8bc2e8bf33a0370b827b3154a..c4af898858dc46e5158d27b45d156f7b24287eb6 100644 --- a/sequencer_kinoraw_tools/__init__.py +++ b/sequencer_kinoraw_tools/__init__.py @@ -71,80 +71,80 @@ class KinorawToolsAddon(AddonPreferences): bl_option = {'REGISTER'} # extra_actions - kr_show_tools = BoolProperty( + kr_show_tools: BoolProperty( name="Show tools", description="Show extra tools in the panel", default=False ) - kr_mini_ui = BoolProperty( + kr_mini_ui: BoolProperty( name="Mini UI", description="Enable mini UI", default=True ) - kr_show_info = BoolProperty( + kr_show_info: BoolProperty( name="Show info", description="Show basic info from selected strip", default=False ) - kr_show_trim = BoolProperty( + kr_show_trim: BoolProperty( name="Show trim", default=False ) - kr_show_modifiers = BoolProperty( + kr_show_modifiers: BoolProperty( name="Show modifiers", description="Show modifiers from selected strip", default=False ) - kr_extra_info = BoolProperty( + kr_extra_info: BoolProperty( name="Show extra info", description="Show extra info and settings from selected strip", default=False ) # exif - use_exif_panel = BoolProperty( + use_exif_panel: BoolProperty( name="Exif info Panel | depends on external programs, see Documentation", default=False ) # glitch - use_glitch_panel = BoolProperty( + use_glitch_panel: BoolProperty( name="Glitch panel | depends on external programs, see Documentation", default=False ) - all_keyframes = BoolProperty( + all_keyframes: BoolProperty( name="Remove all keyframes", default=True ) - load_glitch = BoolProperty( + load_glitch: BoolProperty( name="Load glitch after conversion > UNSTABLE!!!", default=True ) # jump to cut - use_jumptocut = BoolProperty( + use_jumptocut: BoolProperty( name="Jump to Cut Panel", default=True ) - use_io_tools = BoolProperty( + use_io_tools: BoolProperty( name="Enable in and out tools in Jump to Cut Panel", default=False ) # Proxy Tools - use_proxy_tools = BoolProperty( + use_proxy_tools: BoolProperty( name="Proxy tools Panel | depends on external programs, see Documentation", default=False ) - proxy_dir = StringProperty( + proxy_dir: StringProperty( name="Proxy Custom Directory", default="//proxies/" ) - proxy_scripts_path = StringProperty( + proxy_scripts_path: StringProperty( name="Directory to store proxy scripts", default="//proxy_scripts/" ) - proxy_scripts = BoolProperty( + proxy_scripts: BoolProperty( name="Generate ffmpeg scripts", default=False ) - ffmpeg_command = StringProperty( + ffmpeg_command: StringProperty( name="Command to generate proxy", default='''ffmpeg -i {} -vcodec mjpeg -q:v 10 -s {}x{} -an -y {}''' ) diff --git a/sequencer_kinoraw_tools/datamosh.py b/sequencer_kinoraw_tools/datamosh.py index 81f679bda4de608bd9bda05979a0826c7570f644..f64adbed2acf42bb4f05d0f5355f6ebf8633e11e 100644 --- a/sequencer_kinoraw_tools/datamosh.py +++ b/sequencer_kinoraw_tools/datamosh.py @@ -65,7 +65,7 @@ class CreateAvi(Operator): bl_description = "Create an avi output file" bl_options = {'REGISTER', 'UNDO'} - size = IntProperty( + size: IntProperty( name="proxysize", default=1 ) diff --git a/sequencer_kinoraw_tools/jumptocut.py b/sequencer_kinoraw_tools/jumptocut.py index 92566d9d3f59c5b724a02d4515d842bb71949ef8..7cbf64c9bd712c5a4981b2d6fe5634647fe07c92 100644 --- a/sequencer_kinoraw_tools/jumptocut.py +++ b/sequencer_kinoraw_tools/jumptocut.py @@ -520,7 +520,7 @@ class OBJECT_OT_Extrasnap(Operator): # Operator paste source in/out bl_options = {'REGISTER', 'UNDO'} # align: 0 = left snap, 1 = center snap, 2= right snap - align = IntProperty( + align: IntProperty( name="Align", min=0, max=2, default=1 @@ -556,7 +556,7 @@ class OBJECT_OT_Extrahandles(Operator): # Operator paste source in/out bl_options = {'REGISTER', 'UNDO'} # side: 0 = left , 1 = both, 2= right - side = IntProperty( + side: IntProperty( name="Side", min=0, max=2, default=1 diff --git a/sequencer_kinoraw_tools/operators_extra_actions.py b/sequencer_kinoraw_tools/operators_extra_actions.py index 055bd14358b43bf9f154acb2939e153e036c927b..8a060acbc0bfe13390d2e1f4fabc5a4dd9244fd4 100644 --- a/sequencer_kinoraw_tools/operators_extra_actions.py +++ b/sequencer_kinoraw_tools/operators_extra_actions.py @@ -35,7 +35,7 @@ class Sequencer_Extra_FrameSkip(Operator): bl_description = "Skip through the Timeline by one-second increments" bl_options = {'REGISTER', 'UNDO'} - back = BoolProperty( + back: BoolProperty( name="Back", default=False ) @@ -545,7 +545,7 @@ class Sequencer_Extra_Insert(Operator): "forward following ones") bl_options = {'REGISTER', 'UNDO'} - singlechannel = BoolProperty( + singlechannel: BoolProperty( name="Single Channel", default=False ) @@ -616,7 +616,7 @@ class Sequencer_Extra_CopyProperties(Operator): bl_description = "Copy properties of active strip to selected strips" bl_options = {'REGISTER', 'UNDO'} - prop = EnumProperty( + prop: EnumProperty( name="Property", items=[ # common @@ -788,7 +788,7 @@ class Sequencer_Extra_FadeInOut(Operator): bl_description = "Fade volume or opacity of active strip" bl_options = {'REGISTER', 'UNDO'} - mode = EnumProperty( + mode: EnumProperty( name='Direction', items=( ('IN', "Fade In...", ""), @@ -797,12 +797,12 @@ class Sequencer_Extra_FadeInOut(Operator): default='IN', ) - fade_duration = IntProperty( + fade_duration: IntProperty( name='Duration', description='Number of frames to fade', min=1, max=250, default=25) - fade_amount = FloatProperty( + fade_amount: FloatProperty( name='Amount', description='Maximum value of fade', min=0.0, @@ -946,7 +946,7 @@ class Sequencer_Extra_PlaceFromFileBrowser(Operator): bl_description = "Place or insert active file from File Browser" bl_options = {'REGISTER', 'UNDO'} - insert = BoolProperty( + insert: BoolProperty( name="Insert", default=False ) @@ -1049,7 +1049,7 @@ class Sequencer_Extra_SelectCurrentFrame(Operator): bl_description = "Select strips according to current frame" bl_options = {'REGISTER', 'UNDO'} - mode = EnumProperty( + mode: EnumProperty( name='Mode', items=( ('BEFORE', 'Before Current Frame', ''), @@ -1109,7 +1109,7 @@ class Sequencer_Extra_SelectAllByType(Operator): bl_description = "Select all the strips of the same type" bl_options = {'REGISTER', 'UNDO'} - type = EnumProperty( + type: EnumProperty( name="Strip Type", items=( ('ACTIVE', 'Same as Active Strip', ''), diff --git a/sequencer_kinoraw_tools/proxy_tools.py b/sequencer_kinoraw_tools/proxy_tools.py index e0863529bb07c2ac720961459b2681a73c2d1143..10a83344f1536a1d0b2b706da8309293b48cdab5 100644 --- a/sequencer_kinoraw_tools/proxy_tools.py +++ b/sequencer_kinoraw_tools/proxy_tools.py @@ -141,7 +141,7 @@ class CreateProxyOperator(Operator): "and setup proxies for selected strip") bl_options = {'REGISTER', 'UNDO'} - size = IntProperty( + size: IntProperty( name="Proxy Size", default=1 ) @@ -198,7 +198,7 @@ class CreateBIProxyOperator(Operator): bl_description = "Use BI system to create a proxy" bl_options = {'REGISTER', 'UNDO'} - size = IntProperty( + size: IntProperty( name="Proxy Size", default=1 ) diff --git a/sequencer_kinoraw_tools/recursive_loader.py b/sequencer_kinoraw_tools/recursive_loader.py index fbc708a719d187f123a2fae30c98b48935099f54..abc51b6da8d46d436fc4cf71ef16d633546b92c0 100644 --- a/sequencer_kinoraw_tools/recursive_loader.py +++ b/sequencer_kinoraw_tools/recursive_loader.py @@ -35,17 +35,17 @@ class Sequencer_Extra_RecursiveLoader(Operator): bl_label = "Recursive Load" bl_options = {'REGISTER', 'UNDO'} - recursive = BoolProperty( + recursive: BoolProperty( name="Recursive", description="Load in recursive folders", default=False ) - recursive_select_by_extension = BoolProperty( + recursive_select_by_extension: BoolProperty( name="Select by extension", description="Load only clips with selected extension", default=False ) - ext = EnumProperty( + ext: EnumProperty( items=functions.movieextdict, name="Extension", default='3' diff --git a/space_clip_editor_autotracker.py b/space_clip_editor_autotracker.py index 962742e3e571641ebd2f38aa97955d34713d630e..55f66a57834543c96d8f5464b334968b50d85bd4 100644 --- a/space_clip_editor_autotracker.py +++ b/space_clip_editor_autotracker.py @@ -539,7 +539,7 @@ class OP_Tracking_auto_tracker(Operator): class AutotrackerSettings(PropertyGroup): """Create properties""" - df_margin = FloatProperty( + df_margin: FloatProperty( name="Detect Features Margin", description="Only consider features from pixels located outside\n" "the defined margin from the clip borders", @@ -548,7 +548,7 @@ class AutotrackerSettings(PropertyGroup): min=0, max=100 ) - df_threshold = FloatProperty( + df_threshold: FloatProperty( name="Detect Features Threshold", description="Threshold level to deem a feature being good enough for tracking", default=0.3, @@ -556,7 +556,7 @@ class AutotrackerSettings(PropertyGroup): max=1.0 ) # Note: merge this one with delete_threshold - df_distance = FloatProperty( + df_distance: FloatProperty( name="Detect Features Distance", description="Minimal acceptable distance between two features", subtype='PERCENTAGE', @@ -564,7 +564,7 @@ class AutotrackerSettings(PropertyGroup): min=1, max=100 ) - delete_threshold = FloatProperty( + delete_threshold: FloatProperty( name="New Marker Threshold", description="Threshold of how close a new features can appear during tracking", subtype='PERCENTAGE', @@ -572,7 +572,7 @@ class AutotrackerSettings(PropertyGroup): min=1, max=100 ) - small_tracks = IntProperty( + small_tracks: IntProperty( name="Minimum track length", description="Delete tracks shorter than this number of frames\n" "Note: set to 0 for keeping all tracks", @@ -580,14 +580,14 @@ class AutotrackerSettings(PropertyGroup): min=1, max=1000 ) - frame_separation = IntProperty( + frame_separation: IntProperty( name="Frame Separation", description="How often new features are generated", default=5, min=1, max=100 ) - jump_cut = FloatProperty( + jump_cut: FloatProperty( name="Jump Cut", description="How much distance a marker can travel before it is considered " "to be a bad track and cut.\nA new track will be added " @@ -596,7 +596,7 @@ class AutotrackerSettings(PropertyGroup): min=0.0, max=50.0 ) - track_backwards = BoolProperty( + track_backwards: BoolProperty( name="AutoTrack Backwards", description="Track from the last frame of the selected clip", default=False @@ -607,7 +607,7 @@ class AutotrackerSettings(PropertyGroup): ("INSIDE_GPENCIL", "Inside Grease Pencil", "", 2), ("OUTSIDE_GPENCIL", "Outside Grease Pencil", "", 3), ] - placement_list = EnumProperty( + placement_list: EnumProperty( name="Placement", description="Feature Placement", items=list_items diff --git a/space_view3d_3d_navigation.py b/space_view3d_3d_navigation.py index b1a85c82581d8e5a4668460726c45ad3406e6297..5705db9d785844af2941c35380442aeffe5ab025 100644 --- a/space_view3d_3d_navigation.py +++ b/space_view3d_3d_navigation.py @@ -94,7 +94,7 @@ class PanUpViewsAll(Operator): bl_label = "Pan View" bl_description = "Pan the 3D View" - panning = StringProperty( + panning: StringProperty( default="PANUP", options={"HIDDEN"} ) @@ -339,7 +339,7 @@ class NavAddonPreferences(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="Display", diff --git a/space_view3d_brush_menus/__init__.py b/space_view3d_brush_menus/__init__.py index 3371505e965aa095110ec9caebc57946e1e7bc35..891a22de6e7acafd1fc305f78b10c3a9093d074f 100644 --- a/space_view3d_brush_menus/__init__.py +++ b/space_view3d_brush_menus/__init__.py @@ -64,7 +64,7 @@ from bpy.props import ( class VIEW3D_MT_Brushes_Pref(AddonPreferences): bl_idname = __name__ - use_brushes_menu_type = EnumProperty( + use_brushes_menu_type: EnumProperty( name="Choose Brushes Selection", description="", items=[('lists', "Use compact Menus", @@ -78,7 +78,7 @@ class VIEW3D_MT_Brushes_Pref(AddonPreferences): ], default='lists' ) - column_set = IntProperty( + column_set: IntProperty( name="Number of Columns", description="Number of columns used for the brushes menu", default=2, diff --git a/space_view3d_brush_menus/brush_menu.py b/space_view3d_brush_menus/brush_menu.py index 53df3b812e5c983d731df796032f827e1dc5a0c3..f8c46ba719ac5992f64ba4801e6addfe35a97eae 100644 --- a/space_view3d_brush_menus/brush_menu.py +++ b/space_view3d_brush_menus/brush_menu.py @@ -496,7 +496,7 @@ class FlipColorsAll(Operator): bl_idname = "view3d.sv3_flip_colors_all" bl_description = "Switch between Foreground and Background colors" - is_tex = BoolProperty( + is_tex: BoolProperty( default=False, options={'HIDDEN'} ) diff --git a/space_view3d_display_tools/__init__.py b/space_view3d_display_tools/__init__.py index 343f9d642892fb757f7cae82f5074dc2c47e8b2d..693fca447f1962ccc7161bd5a2be5404a540130e 100644 --- a/space_view3d_display_tools/__init__.py +++ b/space_view3d_display_tools/__init__.py @@ -467,11 +467,11 @@ class DisplayToolsPanel(Panel): # define scene props class display_tools_scene_props(PropertyGroup): # Init delay variables - Delay = BoolProperty( + Delay: BoolProperty( default=False, description="Activate delay return to normal viewport mode" ) - DelayTime = IntProperty( + DelayTime: IntProperty( default=30, min=0, max=500, @@ -480,7 +480,7 @@ class display_tools_scene_props(PropertyGroup): description="Delay time to return to normal viewport" "mode after move your mouse cursor" ) - DelayTimeGlobal = IntProperty( + DelayTimeGlobal: IntProperty( default=30, min=1, max=500, @@ -490,40 +490,40 @@ class display_tools_scene_props(PropertyGroup): "mode after move your mouse cursor" ) # Init variable for fast navigate - EditActive = BoolProperty( + EditActive: BoolProperty( default=True, description="Activate for fast navigate in edit mode too" ) # Init properties for scene - FastNavigateStop = BoolProperty( + FastNavigateStop: BoolProperty( name="Fast Navigate Stop", description="Stop fast navigate mode", default=False ) - OriginalMode = EnumProperty( + OriginalMode: EnumProperty( items=[('TEXTURED', 'Texture', 'Texture display mode'), ('SOLID', 'Solid', 'Solid display mode')], name="Normal", default='SOLID' ) - BoundingMode = EnumProperty( + BoundingMode: EnumProperty( items=[('BOX', 'Box', 'Box shape'), ('SPHERE', 'Sphere', 'Sphere shape'), ('CYLINDER', 'Cylinder', 'Cylinder shape'), ('CONE', 'Cone', 'Cone shape')], name="BB Mode" ) - FastMode = EnumProperty( + FastMode: EnumProperty( items=[('WIREFRAME', 'Wireframe', 'Wireframe display'), ('BOUNDBOX', 'Bounding Box', 'Bounding Box display')], name="Fast" ) - ShowParticles = BoolProperty( + ShowParticles: BoolProperty( name="Show Particles", description="Show or hide particles on fast navigate mode", default=True ) - ParticlesPercentageDisplay = IntProperty( + ParticlesPercentageDisplay: IntProperty( name="Fast Display", description="Display only a percentage of particles when active", default=25, @@ -533,7 +533,7 @@ class display_tools_scene_props(PropertyGroup): soft_max=100, subtype='FACTOR' ) - InitialParticles = IntProperty( + InitialParticles: IntProperty( name="Normal Display", description="When idle, how much particles are displayed\n" "Overrides the Particles settings", @@ -543,11 +543,11 @@ class display_tools_scene_props(PropertyGroup): soft_min=0, soft_max=100 ) - Symplify = IntProperty( + Symplify: IntProperty( name="Integer", description="Enter an integer" ) - ScreenStart = IntProperty( + ScreenStart: IntProperty( name="Left Limit", default=0, min=0, @@ -556,7 +556,7 @@ class display_tools_scene_props(PropertyGroup): description="Limit the screen active area width from the left side\n" "Changed values will take effect on the next run", ) - ScreenEnd = IntProperty( + ScreenEnd: IntProperty( name="Right Limit", default=0, min=0, @@ -572,10 +572,10 @@ class display_tools_scene_props(PropertyGroup): default=(False,) * 6, size=6, ) - WT_handler_enable = BoolProperty( + WT_handler_enable: BoolProperty( default=False ) - WT_handler_previous_object = StringProperty( + WT_handler_previous_object: StringProperty( default="" ) @@ -608,7 +608,7 @@ class DisplayToolsPreferences(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="Display", diff --git a/space_view3d_display_tools/display.py b/space_view3d_display_tools/display.py index 6c1c67965f46ce9c67d16197644fc7a8737e8bff..d0ff754daa95d4061b14f46b7b5f133a565b22db 100644 --- a/space_view3d_display_tools/display.py +++ b/space_view3d_display_tools/display.py @@ -63,7 +63,7 @@ class DisplayDrawChange(Operator, BasePollCheck): bl_label = "Draw Type" bl_description = "Change Display objects' mode" - drawing = EnumProperty( + drawing: EnumProperty( items=[('TEXTURED', 'Texture', 'Texture display mode'), ('SOLID', 'Solid', 'Solid display mode'), ('WIRE', 'Wire', 'Wire display mode'), @@ -99,7 +99,7 @@ class DisplayBoundsSwitch(Operator, BasePollCheck): bl_label = "On/Off" bl_description = "Display/Hide Bounding box overlay" - bounds = BoolProperty(default=False) + bounds: BoolProperty(default=False) def execute(self, context): try: @@ -129,7 +129,7 @@ class DisplayDoubleSidedSwitch(Operator, BasePollCheck): bl_label = "On/Off" bl_description = "Turn on/off face double shaded mode" - double_side = BoolProperty(default=False) + double_side: BoolProperty(default=False) def execute(self, context): try: @@ -156,7 +156,7 @@ class DisplayXRayOn(Operator, BasePollCheck): bl_label = "On" bl_description = "X-Ray display on/off" - xrays = BoolProperty(default=False) + xrays: BoolProperty(default=False) def execute(self, context): try: diff --git a/space_view3d_display_tools/fast_navigate.py b/space_view3d_display_tools/fast_navigate.py index 5d61138a0fcf35a0e640a92f54505b73e1744b2b..e3577df5e6389ca845f8a3a47eaba3987ecb523e 100644 --- a/space_view3d_display_tools/fast_navigate.py +++ b/space_view3d_display_tools/fast_navigate.py @@ -62,8 +62,8 @@ class FastNavigate(Operator): bl_description = ("Limit the objects drawing in the 3D view for faster navigation\n" "Runs in modal mode until Stop is pressed or Esc, Return, Space") - trigger = BoolProperty(default=False) - mode = BoolProperty(default=False) + trigger: BoolProperty(default=False) + mode: BoolProperty(default=False) screen_width = [0, 0] store_fail = False store_init_particles = {} diff --git a/space_view3d_display_tools/modifier_tools.py b/space_view3d_display_tools/modifier_tools.py index af2667dc2a509a641a0eec5665110354b454578d..dbfbcea60e6587f47c12d4881a344bca5cc970da 100644 --- a/space_view3d_display_tools/modifier_tools.py +++ b/space_view3d_display_tools/modifier_tools.py @@ -91,7 +91,7 @@ class DisplayModifiersRenderSwitch(Operator, BasePollCheck): bl_label = "On/Off" bl_description = "Display/Hide modifiers on render" - mod_render = BoolProperty(default=True) + mod_render: BoolProperty(default=True) def execute(self, context): try: @@ -122,7 +122,7 @@ class DisplayModifiersViewportSwitch(Operator, BasePollCheck): bl_label = "On/Off" bl_description = "Display/Hide modifiers in the viewport" - mod_switch = BoolProperty(default=True) + mod_switch: BoolProperty(default=True) def execute(self, context): try: @@ -149,7 +149,7 @@ class DisplayModifiersEditSwitch(Operator, BasePollCheck): bl_label = "On/Off" bl_description = "Display/Hide modifiers during edit mode" - mod_edit = BoolProperty(default=True) + mod_edit: BoolProperty(default=True) def execute(self, context): try: @@ -175,7 +175,7 @@ class DisplayModifiersCageSet(Operator, BasePollCheck): bl_label = "On/Off" bl_description = "Display modifiers editing cage during edit mode" - set_cage = BoolProperty(default=True) + set_cage: BoolProperty(default=True) def execute(self, context): selection = context.selected_objects @@ -200,7 +200,7 @@ class ModifiersSubsurfLevel_Set(Operator, BasePollCheck): bl_label = "Set Subsurf level" bl_description = "Change subsurf modifier level" - level = IntProperty( + level: IntProperty( name="Subsurf Level", description="Change subsurf modifier level", default=1, diff --git a/space_view3d_display_tools/select_tools.py b/space_view3d_display_tools/select_tools.py index 2eb79dfc0305d080ea206e5759681ffb91f2d2a2..18f9318573ac99794566bacdfe4b7fc9494f8a72 100644 --- a/space_view3d_display_tools/select_tools.py +++ b/space_view3d_display_tools/select_tools.py @@ -221,7 +221,7 @@ class OBJECT_OT_HideShowByTypeTemplate(): bl_options = {'UNDO', 'REGISTER'} - type = EnumProperty( + type: EnumProperty( items=( ('MESH', 'Mesh', ''), ('CURVE', 'Curve', ''), @@ -285,18 +285,18 @@ class OBJECT_OT_HideByType(OBJECT_OT_HideShowByTypeTemplate, Operator): bl_idname = "object.hide_by_type" bl_label = "Hide By Type" - hide_or_show = BoolProperty( + hide_or_show: BoolProperty( name="Hide", description="Inverse effect", options={'HIDDEN'}, default=1 ) - hide_selected = BoolProperty( + hide_selected: BoolProperty( name="Selected", description="Hide only selected objects", default=0 ) - hide_render_restricted = BoolProperty( + hide_render_restricted: BoolProperty( name="Only Render-Restricted", description="Hide only render restricted objects", default=0 @@ -307,18 +307,18 @@ class OBJECT_OT_ShowByType(OBJECT_OT_HideShowByTypeTemplate, Operator): bl_idname = "object.show_by_type" bl_label = "Show By Type" - hide_or_show = BoolProperty( + hide_or_show: BoolProperty( name="Hide", description="Inverse effect", options={'HIDDEN'}, default=0 ) - hide_selected = BoolProperty( + hide_selected: BoolProperty( name="Selected", options={'HIDDEN'}, default=0 ) - hide_render_restricted = BoolProperty( + hide_render_restricted: BoolProperty( name="Only Renderable", description="Show only non render restricted objects", default=0 diff --git a/space_view3d_display_tools/selection_restrictor.py b/space_view3d_display_tools/selection_restrictor.py index 71561bfed0ca461cfa928d2fdd5eee0da303e96e..e58164095e793049dc388a6bed9cb9ee7bb22ec7 100644 --- a/space_view3d_display_tools/selection_restrictor.py +++ b/space_view3d_display_tools/selection_restrictor.py @@ -190,7 +190,7 @@ class RestrictorShow(Operator): bl_option = {'REGISTER', 'UNDO'} bl_description = "Show/Hide Selection Restrictors" - hide = StringProperty() + hide: StringProperty() def execute(self, context): global show @@ -213,7 +213,7 @@ class IgnoreRestrictors(Operator): bl_label = "Ignore Restrictor by Selected Objects" bl_option = {'REGISTER', 'UNDO'} bl_description = "Ignore or do not ignore Restrictor by selected objects" - ignore = BoolProperty() + ignore: BoolProperty() def execute(self, context): if self.ignore is True: @@ -237,7 +237,7 @@ class RestrictorMesh(Operator): bl_label = "restrictor meshes" bl_option = {'REGISTER', 'UNDO'} bl_description = "Meshes selection restrictor" - mesh = StringProperty() + mesh: StringProperty() def execute(self, context): global mesh diff --git a/space_view3d_display_tools/useless_tools.py b/space_view3d_display_tools/useless_tools.py index 22931423c63474b1f5b9890a19907b606ca39dea..9c89d3fe252e486cf32bcf55577220fcbf88761c 100644 --- a/space_view3d_display_tools/useless_tools.py +++ b/space_view3d_display_tools/useless_tools.py @@ -48,7 +48,7 @@ class UTSetSelectable(Operator): bl_label = "Set Selectable" bl_description = "Sets selectability for the selected objects" - selectable = BoolProperty() + selectable: BoolProperty() def execute(self, context): errors = [] @@ -72,7 +72,7 @@ class UTSetRenderable(Operator): bl_label = "Set Renderable" bl_description = "Sets renderability for the selected objects" - renderable = BoolProperty() + renderable: BoolProperty() def execute(self, context): errors = [] @@ -158,10 +158,10 @@ class UTWireShowHideSelAll(Operator): bl_label = "Show / Hide Wire Selected or All" bl_description = "Change the status of the Wire display on Selected Objects" - show = BoolProperty( + show: BoolProperty( default=False ) - selected = BoolProperty( + selected: BoolProperty( default=False ) @@ -192,10 +192,10 @@ class UTSubsurfHideSelAll(Operator): "Hide and Show operate on Selected Objects only\n" "Hide All and Show All operate on All Objects in the data") - show = BoolProperty( + show: BoolProperty( default=False ) - selected = BoolProperty( + selected: BoolProperty( default=False ) @@ -221,10 +221,10 @@ class UTOptimalDisplaySelAll(Operator): bl_label = "Optimal Display" bl_description = "Disables Optimal Display for all Subsurf modifiers on objects" - on = BoolProperty( + on: BoolProperty( default=False ) - selected = BoolProperty( + selected: BoolProperty( default=False ) @@ -250,7 +250,7 @@ class UTAllEdges(Operator): bl_label = "All Edges" bl_description = "Change the status of All Edges overlay on all objects" - on = BoolProperty( + on: BoolProperty( default=False ) @@ -274,7 +274,7 @@ class UTDoubleSided(Operator): bl_label = "Double Sided Normals" bl_description = "Disables Double Sided Normals for all objects" - on = BoolProperty( + on: BoolProperty( default=False ) diff --git a/space_view3d_pie_menus/__init__.py b/space_view3d_pie_menus/__init__.py index 3763c4dce105f319acaee5209a3b8c15c87b7988..7f0c3affb1eb660e9e40642e248a8bc8cc9b7fb9 100644 --- a/space_view3d_pie_menus/__init__.py +++ b/space_view3d_pie_menus/__init__.py @@ -176,13 +176,13 @@ class PieToolsPreferences(AddonPreferences): return update use_prop_name = 'use_' + mod_name - __annotations__[use_prop_name] = BoolProperty( + __annotations__[use_prop_name]: BoolProperty( name=mod.bl_info['name'], description=mod.bl_info.get('description', ''), update=gen_update(mod, use_prop_name), ) - __annotations__['show_expanded_' + mod_name] = BoolProperty() + __annotations__['show_expanded_' + mod_name]: BoolProperty() def draw(self, context): layout = self.layout diff --git a/space_view3d_spacebar_menu.py b/space_view3d_spacebar_menu.py index 101955a7927a3d72b14235eea821a172c43da978..d4054f70c83e75773b25b1dc45ea859768bf160a 100644 --- a/space_view3d_spacebar_menu.py +++ b/space_view3d_spacebar_menu.py @@ -2870,7 +2870,7 @@ class SetObjectMode(Operator): bl_description = "I set the interactive mode of object" bl_options = {'REGISTER'} - mode = StringProperty( + mode: StringProperty( name="Interactive mode", default="OBJECT" ) @@ -2962,13 +2962,13 @@ def UseBrushesLists(): class VIEW3D_MT_Space_Dynamic_Menu_Pref(AddonPreferences): bl_idname = __name__ - use_separators = BoolProperty( + use_separators: BoolProperty( name="Use Separators in the menus", default=True, description=("Use separators in the menus, a trade-off between \n" "readability vs. using more space for displaying items") ) - use_brushes_lists = BoolProperty( + use_brushes_lists: BoolProperty( name="Use compact menus for brushes", default=False, description=("Use more compact menus instead \n" diff --git a/space_view3d_stored_views/__init__.py b/space_view3d_stored_views/__init__.py index a9767bff26459fff0a6be5f807edf58a7a20f507..74124517de455fea9297aa521aaa39c2aeebebad 100644 --- a/space_view3d_stored_views/__init__.py +++ b/space_view3d_stored_views/__init__.py @@ -99,7 +99,7 @@ class VIEW3D_stored_views_initialize(Operator): class VIEW3D_stored_views_preferences(AddonPreferences): bl_idname = __name__ - show_exporters = BoolProperty( + show_exporters: BoolProperty( name="Enable I/O Operators", default=False, description="Enable Import/Export Operations in the UI:\n" @@ -107,7 +107,7 @@ class VIEW3D_stored_views_preferences(AddonPreferences): "Export Stored Views preset and \n" "Import stored views from scene", ) - view_3d_update_rate = IntProperty( + view_3d_update_rate: IntProperty( name="3D view update", description="Update rate of the 3D view redraw\n" "Increse the value if the UI feels sluggish", diff --git a/space_view3d_stored_views/io.py b/space_view3d_stored_views/io.py index 69c5b02b4a44cec9eef09006c8e4473de6e2f256..a3125fcc8e4ba88c33623bc7868f8bc9a09f756a 100644 --- a/space_view3d_stored_views/io.py +++ b/space_view3d_stored_views/io.py @@ -209,11 +209,11 @@ class VIEW3D_stored_views_import(Operator, ImportHelper): bl_description = "Import a .blsv preset file to the current Stored Views" filename_ext = ".blsv" - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.blsv", options={'HIDDEN'} ) - replace = BoolProperty( + replace: BoolProperty( name="Replace", default=True, description="Replace current stored views, otherwise append" @@ -258,12 +258,12 @@ class VIEW3D_stored_views_import_from_scene(Operator): bl_label = "Import stored views from scene" bl_description = "Import currently stored views from an another scene" - scene_name = StringProperty( + scene_name: StringProperty( name="Scene Name", description="A current blend scene", default="" ) - replace = BoolProperty( + replace: BoolProperty( name="Replace", default=True, description="Replace current stored views, otherwise append" @@ -306,14 +306,14 @@ class VIEW3D_stored_views_export(Operator, ExportHelper): bl_description = "Export the current Stored Views to a .blsv preset file" filename_ext = ".blsv" - filepath = StringProperty( + filepath: StringProperty( default=os.path.join(IO_Utils.get_preset_path()[0], "untitled") ) - filter_glob = StringProperty( + filter_glob: StringProperty( default="*.blsv", options={'HIDDEN'} ) - preset_name = StringProperty( + preset_name: StringProperty( name="Preset name", default="", description="Name of the stored views preset" diff --git a/space_view3d_stored_views/operators.py b/space_view3d_stored_views/operators.py index c0bf09ab9bf12e4aaf00392b5aca82816db98542..82cfecdafe4bf9e87eb0182d8cc01a14d26aa88d 100644 --- a/space_view3d_stored_views/operators.py +++ b/space_view3d_stored_views/operators.py @@ -15,7 +15,7 @@ class VIEW3D_stored_views_save(Operator): bl_label = "Save Current" bl_description = "Save the view 3d current state" - index = IntProperty() + index: IntProperty() def execute(self, context): mode = context.scene.stored_views.mode @@ -32,7 +32,7 @@ class VIEW3D_stored_views_set(Operator): bl_label = "Set" bl_description = "Update the view 3D according to this view" - index = IntProperty() + index: IntProperty() def execute(self, context): mode = context.scene.stored_views.mode @@ -49,7 +49,7 @@ class VIEW3D_stored_views_delete(Operator): bl_label = "Delete" bl_description = "Delete this view" - index = IntProperty() + index: IntProperty() def execute(self, context): data = DataStore() diff --git a/space_view3d_stored_views/properties.py b/space_view3d_stored_views/properties.py index 8fb280d4a79f57a6736c1b5bd653dddeb9c9a4d1..2c4adee322681181d7ed4d18e554d22fb07e3322 100644 --- a/space_view3d_stored_views/properties.py +++ b/space_view3d_stored_views/properties.py @@ -16,41 +16,41 @@ from bpy.props import ( class POVData(PropertyGroup): - distance = FloatProperty() - location = FloatVectorProperty( + distance: FloatProperty() + location: FloatVectorProperty( subtype='TRANSLATION' ) - rotation = FloatVectorProperty( + rotation: FloatVectorProperty( subtype='QUATERNION', size=4 ) - name = StringProperty() - perspective = EnumProperty( + name: StringProperty() + perspective: EnumProperty( items=[('PERSP', '', ''), ('ORTHO', '', ''), ('CAMERA', '', '')] ) - lens = FloatProperty() - clip_start = FloatProperty() - clip_end = FloatProperty() - lock_cursor = BoolProperty() - cursor_location = FloatVectorProperty() - perspective_matrix_md5 = StringProperty() - camera_name = StringProperty() - camera_type = StringProperty() - lock_object_name = StringProperty() + lens: FloatProperty() + clip_start: FloatProperty() + clip_end: FloatProperty() + lock_cursor: BoolProperty() + cursor_location: FloatVectorProperty() + perspective_matrix_md5: StringProperty() + camera_name: StringProperty() + camera_type: StringProperty() + lock_object_name: StringProperty() class LayersData(PropertyGroup): view_layers = BoolVectorProperty(size=20) scene_layers = BoolVectorProperty(size=20) - lock_camera_and_layers = BoolProperty() - name = StringProperty() + lock_camera_and_layers: BoolProperty() + name: StringProperty() class DisplayData(PropertyGroup): - name = StringProperty() - viewport_shade = EnumProperty( + name: StringProperty() + viewport_shade: EnumProperty( items=[('BOUNDBOX', 'BOUNDBOX', 'BOUNDBOX'), ('WIREFRAME', 'WIREFRAME', 'WIREFRAME'), ('SOLID', 'SOLID', 'SOLID'), @@ -58,23 +58,23 @@ class DisplayData(PropertyGroup): ('MATERIAL', 'MATERIAL', 'MATERIAL'), ('RENDERED', 'RENDERED', 'RENDERED')] ) - show_only_render = BoolProperty() - show_outline_selected = BoolProperty() - show_all_objects_origin = BoolProperty() - show_relationship_lines = BoolProperty() - show_floor = BoolProperty() - show_axis_x = BoolProperty() - show_axis_y = BoolProperty() - show_axis_z = BoolProperty() - grid_lines = IntProperty() - grid_scale = FloatProperty() - grid_subdivisions = IntProperty() - material_mode = StringProperty() - show_textured_solid = BoolProperty() - quad_view = BoolProperty() - lock_rotation = BoolProperty() - show_sync_view = BoolProperty() - use_box_clip = BoolProperty() + show_only_render: BoolProperty() + show_outline_selected: BoolProperty() + show_all_objects_origin: BoolProperty() + show_relationship_lines: BoolProperty() + show_floor: BoolProperty() + show_axis_x: BoolProperty() + show_axis_y: BoolProperty() + show_axis_z: BoolProperty() + grid_lines: IntProperty() + grid_scale: FloatProperty() + grid_subdivisions: IntProperty() + material_mode: StringProperty() + show_textured_solid: BoolProperty() + quad_view: BoolProperty() + lock_rotation: BoolProperty() + show_sync_view: BoolProperty() + use_box_clip: BoolProperty() class ViewData(PropertyGroup): @@ -87,23 +87,23 @@ class ViewData(PropertyGroup): display = PointerProperty( type=DisplayData ) - name = StringProperty() + name: StringProperty() class StoredViewsData(PropertyGroup): - pov_list = CollectionProperty( + pov_list: CollectionProperty( type=POVData ) - layers_list = CollectionProperty( + layers_list: CollectionProperty( type=LayersData ) - display_list = CollectionProperty( + display_list: CollectionProperty( type=DisplayData ) - view_list = CollectionProperty( + view_list: CollectionProperty( type=ViewData ) - mode = EnumProperty( + mode: EnumProperty( name="Mode", items=[('VIEW', "View", "3D View settings"), ('POV', "POV", "POV settings"), @@ -115,6 +115,6 @@ class StoredViewsData(PropertyGroup): size=4, default=[-1, -1, -1, -1] ) - view_modified = BoolProperty( + view_modified: BoolProperty( default=False ) diff --git a/system_property_chart.py b/system_property_chart.py index 3fc5ff13e57e4dd012395bbe6deee36c553f620f..cbe4835a878dfe5ec32f22ccde157e8eb8ea22b9 100644 --- a/system_property_chart.py +++ b/system_property_chart.py @@ -254,9 +254,9 @@ class CopyPropertyChart(Operator): bl_idname = "wm.chart_copy" bl_label = "Copy properties from active to selected" - data_path_active = StringProperty() - data_path_selected = StringProperty() - data_path = StringProperty() + data_path_active: StringProperty() + data_path_selected: StringProperty() + data_path: StringProperty() def execute(self, context): # so attributes are found for '_property_chart_data_get()' diff --git a/ui_layer_manager.py b/ui_layer_manager.py index 18e28ebb468d64773b09a017355493f41a3e1a7f..d3bb41c371e0c6c1b6f9b2df34eadd7295b7ccbf 100644 --- a/ui_layer_manager.py +++ b/ui_layer_manager.py @@ -57,44 +57,44 @@ FAKE_LAYER_GROUP = [True] * NUM_LAYERS class NamedLayer(PropertyGroup): - name = StringProperty( + name: StringProperty( name="Layer Name" ) - use_lock = BoolProperty( + use_lock: BoolProperty( name="Lock Layer", default=False ) - use_object_select = BoolProperty( + use_object_select: BoolProperty( name="Object Select", default=True ) - use_wire = BoolProperty( + use_wire: BoolProperty( name="Wire Layer", default=False ) class NamedLayers(PropertyGroup): - layers = CollectionProperty(type=NamedLayer) + layers: CollectionProperty(type=NamedLayer) - use_hide_empty_layers = BoolProperty( + use_hide_empty_layers: BoolProperty( name="Hide Empty Layer", default=False ) - use_extra_options = BoolProperty( + use_extra_options: BoolProperty( name="Show Extra Options", default=True ) - use_layer_indices = BoolProperty( + use_layer_indices: BoolProperty( name="Show Layer Indices", default=False ) - use_classic = BoolProperty( + use_classic: BoolProperty( name="Classic", default=False, description="Use a classic layer selection visibility" ) - use_init = BoolProperty( + use_init: BoolProperty( default=True, options={'HIDDEN'} ) @@ -114,9 +114,9 @@ def check_init_data(scene): class LayerGroup(PropertyGroup): - use_toggle = BoolProperty(name="", default=False) - use_wire = BoolProperty(name="", default=False) - use_lock = BoolProperty(name="", default=False) + use_toggle: BoolProperty(name="", default=False) + use_wire: BoolProperty(name="", default=False) + use_lock: BoolProperty(name="", default=False) layers = BoolVectorProperty(name="Layers", default=([False] * NUM_LAYERS), size=NUM_LAYERS, subtype='LAYER') @@ -151,7 +151,7 @@ class SCENE_OT_namedlayer_group_remove(Operator): bl_idname = "scene.namedlayer_group_remove" bl_label = "Remove Layer Group" - group_idx = bpy.props.IntProperty() + group_idx: bpy.props.IntProperty() @classmethod def poll(cls, context): @@ -173,10 +173,10 @@ class SCENE_OT_namedlayer_toggle_visibility(Operator): bl_idname = "scene.namedlayer_toggle_visibility" bl_label = "Show/Hide Layer" - layer_idx = IntProperty() - group_idx = IntProperty() - use_spacecheck = BoolProperty() - extend = BoolProperty(options={'SKIP_SAVE'}) + layer_idx: IntProperty() + group_idx: IntProperty() + use_spacecheck: BoolProperty() + extend: BoolProperty(options={'SKIP_SAVE'}) @classmethod def poll(cls, context): @@ -218,8 +218,8 @@ class SCENE_OT_namedlayer_move_to_layer(Operator): bl_idname = "scene.namedlayer_move_to_layer" bl_label = "Move Objects To Layer" - layer_idx = IntProperty() - extend = BoolProperty(options={'SKIP_SAVE'}) + layer_idx: IntProperty() + extend: BoolProperty(options={'SKIP_SAVE'}) @classmethod def poll(cls, context): @@ -252,9 +252,9 @@ class SCENE_OT_namedlayer_toggle_wire(Operator): bl_idname = "scene.namedlayer_toggle_wire" bl_label = "Toggle Objects Draw Wire" - layer_idx = IntProperty() - use_wire = BoolProperty() - group_idx = IntProperty() + layer_idx: IntProperty() + use_wire: BoolProperty() + group_idx: IntProperty() @classmethod def poll(cls, context): @@ -292,9 +292,9 @@ class SCENE_OT_namedlayer_lock_all(Operator): bl_idname = "scene.namedlayer_lock_all" bl_label = "Lock Objects" - layer_idx = IntProperty() - use_lock = BoolProperty() - group_idx = IntProperty() + layer_idx: IntProperty() + use_lock: BoolProperty() + group_idx: IntProperty() @classmethod def poll(cls, context): @@ -332,11 +332,11 @@ class SCENE_OT_namedlayer_select_objects_by_layer(Operator): bl_idname = "scene.namedlayer_select_objects_by_layer" bl_label = "Select Objects In Layer" - select_obj = BoolProperty() - layer_idx = IntProperty() + select_obj: BoolProperty() + layer_idx: IntProperty() - extend = BoolProperty(options={'SKIP_SAVE'}) - active = BoolProperty(options={'SKIP_SAVE'}) + extend: BoolProperty(options={'SKIP_SAVE'}) + active: BoolProperty(options={'SKIP_SAVE'}) @classmethod def poll(cls, context): @@ -379,7 +379,7 @@ class SCENE_OT_namedlayer_show_all(Operator): bl_idname = "scene.namedlayer_show_all" bl_label = "Select All Layers" - show = BoolProperty() + show: BoolProperty() @classmethod def poll(cls, context): @@ -618,7 +618,7 @@ class LayerMAddonPreferences(AddonPreferences): # when defining this in a submodule of a python package. bl_idname = __name__ - category = StringProperty( + category: StringProperty( name="Tab Category", description="Choose a name for the category of the panel", default="Layers", diff --git a/uv_bake_texture_to_vcols.py b/uv_bake_texture_to_vcols.py index 0dc5e5496958204be9b22677eb876d268c8f69d4..9a83c6dc1769f8cbc05229879183bfc44c920453 100644 --- a/uv_bake_texture_to_vcols.py +++ b/uv_bake_texture_to_vcols.py @@ -55,7 +55,7 @@ class UV_OT_bake_texture_to_vcols(bpy.types.Operator): "(requires image texture)" bl_options = {'REGISTER', 'UNDO'} - replace_active_layer = BoolProperty( + replace_active_layer: BoolProperty( name="Replace layer", description="Overwrite active Vertex Color layer", default=True) @@ -65,7 +65,7 @@ class UV_OT_bake_texture_to_vcols(bpy.types.Operator): ("REPEAT", "Repeat", "Tile the image so that each vertex is accounted for."), ("EXTEND", "Extend", "Extends the edges of the image to the UV-coordinates.")] - mappingMode = EnumProperty( + mappingMode: EnumProperty( items=mappingModes, default="CLIP", name="Mapping", @@ -89,14 +89,14 @@ class UV_OT_bake_texture_to_vcols(bpy.types.Operator): ("LINEAR_LIGHT", "Linear Light", "") ] - blendingMode = EnumProperty( + blendingMode: EnumProperty( items=blendingModes, default="MULTIPLY", name="Blend Type", description="The blending mode to use when baking") - mirror_x = BoolProperty(name="Mirror X", description="Mirror the image on the X-axis") - mirror_y = BoolProperty(name="Mirror Y", description="Mirror the image on the Y-axis") + mirror_x: BoolProperty(name="Mirror X", description="Mirror the image on the X-axis") + mirror_y: BoolProperty(name="Mirror Y", description="Mirror the image on the Y-axis") @classmethod def poll(self, context): diff --git a/uv_magic_uv/op/align_uv.py b/uv_magic_uv/op/align_uv.py index 8225858e4e5029eb09be2ff8b2ee17d1523d5588..5420c33f1fd630fc1ba721e665b37e323dc5f6e9 100644 --- a/uv_magic_uv/op/align_uv.py +++ b/uv_magic_uv/op/align_uv.py @@ -296,41 +296,41 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_align_uv_enabled = BoolProperty( + scene.muv_align_uv_enabled: BoolProperty( name="Align UV Enabled", description="Align UV is enabled", default=False ) - scene.muv_align_uv_transmission = BoolProperty( + scene.muv_align_uv_transmission: BoolProperty( name="Transmission", description="Align linked UVs", default=False ) - scene.muv_align_uv_select = BoolProperty( + scene.muv_align_uv_select: BoolProperty( name="Select", description="Select UVs which are aligned", default=False ) - scene.muv_align_uv_vertical = BoolProperty( + scene.muv_align_uv_vertical: BoolProperty( name="Vert-Infl (Vertical)", description="Align vertical direction influenced " "by mesh vertex proportion", default=False ) - scene.muv_align_uv_horizontal = BoolProperty( + scene.muv_align_uv_horizontal: BoolProperty( name="Vert-Infl (Horizontal)", description="Align horizontal direction influenced " "by mesh vertex proportion", default=False ) - scene.muv_align_uv_mesh_infl = FloatProperty( + scene.muv_align_uv_mesh_infl: FloatProperty( name="Mesh Influence", description="Influence rate of mesh vertex", min=0.0, max=1.0, default=0.0 ) - scene.muv_align_uv_location = EnumProperty( + scene.muv_align_uv_location: EnumProperty( name="Location", description="Align location", items=[ @@ -361,12 +361,12 @@ class MUV_OT_AlignUV_Circle(bpy.types.Operator): bl_description = "Align UV coordinates to Circle" bl_options = {'REGISTER', 'UNDO'} - transmission = BoolProperty( + transmission: BoolProperty( name="Transmission", description="Align linked UVs", default=False ) - select = BoolProperty( + select: BoolProperty( name="Select", description="Select UVs which are aligned", default=False @@ -447,29 +447,29 @@ class MUV_OT_AlignUV_Straighten(bpy.types.Operator): bl_description = "Straighten UV coordinates" bl_options = {'REGISTER', 'UNDO'} - transmission = BoolProperty( + transmission: BoolProperty( name="Transmission", description="Align linked UVs", default=False ) - select = BoolProperty( + select: BoolProperty( name="Select", description="Select UVs which are aligned", default=False ) - vertical = BoolProperty( + vertical: BoolProperty( name="Vert-Infl (Vertical)", description="Align vertical direction influenced " "by mesh vertex proportion", default=False ) - horizontal = BoolProperty( + horizontal: BoolProperty( name="Vert-Infl (Horizontal)", description="Align horizontal direction influenced " "by mesh vertex proportion", default=False ) - mesh_infl = FloatProperty( + mesh_infl: FloatProperty( name="Mesh Influence", description="Influence rate of mesh vertex", min=0.0, @@ -599,29 +599,29 @@ class MUV_OT_AlignUV_Axis(bpy.types.Operator): bl_description = "Align UV to XY-axis" bl_options = {'REGISTER', 'UNDO'} - transmission = BoolProperty( + transmission: BoolProperty( name="Transmission", description="Align linked UVs", default=False ) - select = BoolProperty( + select: BoolProperty( name="Select", description="Select UVs which are aligned", default=False ) - vertical = BoolProperty( + vertical: BoolProperty( name="Vert-Infl (Vertical)", description="Align vertical direction influenced " "by mesh vertex proportion", default=False ) - horizontal = BoolProperty( + horizontal: BoolProperty( name="Vert-Infl (Horizontal)", description="Align horizontal direction influenced " "by mesh vertex proportion", default=False ) - location = EnumProperty( + location: EnumProperty( name="Location", description="Align location", items=[ @@ -631,7 +631,7 @@ class MUV_OT_AlignUV_Axis(bpy.types.Operator): ], default='MIDDLE' ) - mesh_infl = FloatProperty( + mesh_infl: FloatProperty( name="Mesh Influence", description="Influence rate of mesh vertex", min=0.0, diff --git a/uv_magic_uv/op/align_uv_cursor.py b/uv_magic_uv/op/align_uv_cursor.py index ab4e93b422eb57919749a856145fa292fd1050c9..bd92cf817c04e0c8fc5f3c95ba5b594037c710a9 100644 --- a/uv_magic_uv/op/align_uv_cursor.py +++ b/uv_magic_uv/op/align_uv_cursor.py @@ -86,13 +86,13 @@ class _Properties: cy = bd_size[1] * value[1] space.cursor_location = Vector((cx, cy)) - scene.muv_align_uv_cursor_enabled = BoolProperty( + scene.muv_align_uv_cursor_enabled: BoolProperty( name="Align UV Cursor Enabled", description="Align UV Cursor is enabled", default=False ) - scene.muv_align_uv_cursor_cursor_loc = FloatVectorProperty( + scene.muv_align_uv_cursor_cursor_loc: FloatVectorProperty( name="UV Cursor Location", size=2, precision=4, @@ -103,7 +103,7 @@ class _Properties: get=auvc_get_cursor_loc, set=auvc_set_cursor_loc ) - scene.muv_align_uv_cursor_align_method = EnumProperty( + scene.muv_align_uv_cursor_align_method: EnumProperty( name="Align Method", description="Align Method", default='TEXTURE', @@ -114,7 +114,7 @@ class _Properties: ] ) - scene.muv_uv_cursor_location_enabled = BoolProperty( + scene.muv_uv_cursor_location_enabled: BoolProperty( name="UV Cursor Location Enabled", description="UV Cursor Location is enabled", default=False @@ -138,7 +138,7 @@ class MUV_OT_AlignUVCursor(bpy.types.Operator): bl_description = "Align cursor to the center of UV island" bl_options = {'REGISTER', 'UNDO'} - position = EnumProperty( + position: EnumProperty( items=( ('CENTER', "Center", "Align to Center"), ('LEFT_TOP', "Left Top", "Align to Left Top"), @@ -154,7 +154,7 @@ class MUV_OT_AlignUVCursor(bpy.types.Operator): description="Align position", default='CENTER' ) - base = EnumProperty( + base: EnumProperty( items=( ('TEXTURE', "Texture", "Align based on Texture"), ('UV', "UV", "Align to UV"), diff --git a/uv_magic_uv/op/copy_paste_uv.py b/uv_magic_uv/op/copy_paste_uv.py index f5ff883e235fe319b10420e0b8537a23e3d9e498..11489f8c5f7a8d9d95611582d28eb1447e339d91 100644 --- a/uv_magic_uv/op/copy_paste_uv.py +++ b/uv_magic_uv/op/copy_paste_uv.py @@ -280,17 +280,17 @@ class _Properties: scene.muv_props.copy_paste_uv = Props() scene.muv_props.copy_paste_uv_selseq = Props() - scene.muv_copy_paste_uv_enabled = BoolProperty( + scene.muv_copy_paste_uv_enabled: BoolProperty( name="Copy/Paste UV Enabled", description="Copy/Paste UV is enabled", default=False ) - scene.muv_copy_paste_uv_copy_seams = BoolProperty( + scene.muv_copy_paste_uv_copy_seams: BoolProperty( name="Seams", description="Copy Seams", default=True ) - scene.muv_copy_paste_uv_mode = EnumProperty( + scene.muv_copy_paste_uv_mode: EnumProperty( items=[ ('DEFAULT', "Default", "Default Mode"), ('SEL_SEQ', "Selection Sequence", "Selection Sequence Mode") @@ -299,7 +299,7 @@ class _Properties: description="Copy/Paste UV Mode", default='DEFAULT' ) - scene.muv_copy_paste_uv_strategy = EnumProperty( + scene.muv_copy_paste_uv_strategy: EnumProperty( name="Strategy", description="Paste Strategy", items=[ @@ -331,7 +331,7 @@ class MUV_OT_CopyPasteUV_CopyUV(bpy.types.Operator): bl_description = "Copy UV coordinate" bl_options = {'REGISTER', 'UNDO'} - uv_map = StringProperty(default="__default", options={'HIDDEN'}) + uv_map: StringProperty(default="__default", options={'HIDDEN'}) @classmethod def poll(cls, context): @@ -408,8 +408,8 @@ class MUV_OT_CopyPasteUV_PasteUV(bpy.types.Operator): bl_description = "Paste UV coordinate" bl_options = {'REGISTER', 'UNDO'} - uv_map = StringProperty(default="__default", options={'HIDDEN'}) - strategy = EnumProperty( + uv_map: StringProperty(default="__default", options={'HIDDEN'}) + strategy: EnumProperty( name="Strategy", description="Paste Strategy", items=[ @@ -418,18 +418,18 @@ class MUV_OT_CopyPasteUV_PasteUV(bpy.types.Operator): ], default="N_M" ) - flip_copied_uv = BoolProperty( + flip_copied_uv: BoolProperty( name="Flip Copied UV", description="Flip Copied UV...", default=False ) - rotate_copied_uv = IntProperty( + rotate_copied_uv: IntProperty( default=0, name="Rotate Copied UV", min=0, max=30 ) - copy_seams = BoolProperty( + copy_seams: BoolProperty( name="Seams", description="Copy Seams", default=True @@ -548,7 +548,7 @@ class MUV_OT_CopyPasteUV_SelSeqCopyUV(bpy.types.Operator): bl_description = "Copy UV data by selection sequence" bl_options = {'REGISTER', 'UNDO'} - uv_map = StringProperty(default="__default", options={'HIDDEN'}) + uv_map: StringProperty(default="__default", options={'HIDDEN'}) @classmethod def poll(cls, context): @@ -625,8 +625,8 @@ class MUV_OT_CopyPasteUV_SelSeqPasteUV(bpy.types.Operator): bl_description = "Paste UV coordinate by selection sequence" bl_options = {'REGISTER', 'UNDO'} - uv_map = StringProperty(default="__default", options={'HIDDEN'}) - strategy = EnumProperty( + uv_map: StringProperty(default="__default", options={'HIDDEN'}) + strategy: EnumProperty( name="Strategy", description="Paste Strategy", items=[ @@ -635,18 +635,18 @@ class MUV_OT_CopyPasteUV_SelSeqPasteUV(bpy.types.Operator): ], default="N_M" ) - flip_copied_uv = BoolProperty( + flip_copied_uv: BoolProperty( name="Flip Copied UV", description="Flip Copied UV...", default=False ) - rotate_copied_uv = IntProperty( + rotate_copied_uv: IntProperty( default=0, name="Rotate Copied UV", min=0, max=30 ) - copy_seams = BoolProperty( + copy_seams: BoolProperty( name="Seams", description="Copy Seams", default=True diff --git a/uv_magic_uv/op/copy_paste_uv_object.py b/uv_magic_uv/op/copy_paste_uv_object.py index dc7073b81572d77781f750c5a2cd6639b451e396..691ca42ac9255e136aa27d30509fb21466d29088 100644 --- a/uv_magic_uv/op/copy_paste_uv_object.py +++ b/uv_magic_uv/op/copy_paste_uv_object.py @@ -75,7 +75,7 @@ class _Properties: scene.muv_props.copy_paste_uv_object = Props() - scene.muv_copy_paste_uv_object_copy_seams = BoolProperty( + scene.muv_copy_paste_uv_object_copy_seams: BoolProperty( name="Seams", description="Copy Seams", default=True @@ -108,7 +108,7 @@ class MUV_OT_CopyPasteUVObject_CopyUV(bpy.types.Operator): bl_description = "Copy UV coordinate (Among Objects)" bl_options = {'REGISTER', 'UNDO'} - uv_map = StringProperty(default="__default", options={'HIDDEN'}) + uv_map: StringProperty(default="__default", options={'HIDDEN'}) @classmethod def poll(cls, context): @@ -186,8 +186,8 @@ class MUV_OT_CopyPasteUVObject_PasteUV(bpy.types.Operator): bl_description = "Paste UV coordinate (Among Objects)" bl_options = {'REGISTER', 'UNDO'} - uv_map = StringProperty(default="__default", options={'HIDDEN'}) - copy_seams = BoolProperty( + uv_map: StringProperty(default="__default", options={'HIDDEN'}) + copy_seams: BoolProperty( name="Seams", description="Copy Seams", default=True diff --git a/uv_magic_uv/op/flip_rotate_uv.py b/uv_magic_uv/op/flip_rotate_uv.py index 2ecab25415ec8e85f4bfc53e57b324574e10421a..0ff38145ede13860b281c041d571dd7474b8f771 100644 --- a/uv_magic_uv/op/flip_rotate_uv.py +++ b/uv_magic_uv/op/flip_rotate_uv.py @@ -144,12 +144,12 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_flip_rotate_uv_enabled = BoolProperty( + scene.muv_flip_rotate_uv_enabled: BoolProperty( name="Flip/Rotate UV Enabled", description="Flip/Rotate UV is enabled", default=False ) - scene.muv_flip_rotate_uv_seams = BoolProperty( + scene.muv_flip_rotate_uv_seams: BoolProperty( name="Seams", description="Seams", default=True @@ -173,18 +173,18 @@ class MUV_OT_FlipRotate(bpy.types.Operator): bl_description = "Flip/Rotate UV coordinate" bl_options = {'REGISTER', 'UNDO'} - flip = BoolProperty( + flip: BoolProperty( name="Flip UV", description="Flip UV...", default=False ) - rotate = IntProperty( + rotate: IntProperty( default=0, name="Rotate UV", min=0, max=30 ) - seams = BoolProperty( + seams: BoolProperty( name="Seams", description="Seams", default=True diff --git a/uv_magic_uv/op/mirror_uv.py b/uv_magic_uv/op/mirror_uv.py index b806daea5daec2a49d52cb500fe869f827a51eef..bd71ee5fa7b0154696261f922b5d31b156219f7f 100644 --- a/uv_magic_uv/op/mirror_uv.py +++ b/uv_magic_uv/op/mirror_uv.py @@ -107,12 +107,12 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_mirror_uv_enabled = BoolProperty( + scene.muv_mirror_uv_enabled: BoolProperty( name="Mirror UV Enabled", description="Mirror UV is enabled", default=False ) - scene.muv_mirror_uv_axis = EnumProperty( + scene.muv_mirror_uv_axis: EnumProperty( items=[ ('X', "X", "Mirror Along X axis"), ('Y', "Y", "Mirror Along Y axis"), @@ -140,7 +140,7 @@ class MUV_OT_MirrorUV(bpy.types.Operator): bl_label = "Mirror UV" bl_options = {'REGISTER', 'UNDO'} - axis = EnumProperty( + axis: EnumProperty( items=( ('X', "X", "Mirror Along X axis"), ('Y', "Y", "Mirror Along Y axis"), @@ -150,7 +150,7 @@ class MUV_OT_MirrorUV(bpy.types.Operator): description="Mirror Axis", default='X' ) - error = FloatProperty( + error: FloatProperty( name="Error", description="Error threshold", default=0.001, diff --git a/uv_magic_uv/op/move_uv.py b/uv_magic_uv/op/move_uv.py index b747892ae4300d81e2dfc2b21030bd35fb79f9bf..7f94edfbc688fd848216692460054251128c4249 100644 --- a/uv_magic_uv/op/move_uv.py +++ b/uv_magic_uv/op/move_uv.py @@ -74,7 +74,7 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_move_uv_enabled = BoolProperty( + scene.muv_move_uv_enabled: BoolProperty( name="Move UV Enabled", description="Move UV is enabled", default=False diff --git a/uv_magic_uv/op/pack_uv.py b/uv_magic_uv/op/pack_uv.py index 35685221c772f656e97a78bc453ed4dd6c8726da..4c365f8b6964011ebd5d713e35fa7b0594731aac 100644 --- a/uv_magic_uv/op/pack_uv.py +++ b/uv_magic_uv/op/pack_uv.py @@ -147,12 +147,12 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_pack_uv_enabled = BoolProperty( + scene.muv_pack_uv_enabled: BoolProperty( name="Pack UV Enabled", description="Pack UV is enabled", default=False ) - scene.muv_pack_uv_allowable_center_deviation = FloatVectorProperty( + scene.muv_pack_uv_allowable_center_deviation: FloatVectorProperty( name="Allowable Center Deviation", description="Allowable center deviation to judge same UV island", min=0.000001, @@ -160,7 +160,7 @@ class _Properties: default=(0.001, 0.001), size=2 ) - scene.muv_pack_uv_allowable_size_deviation = FloatVectorProperty( + scene.muv_pack_uv_allowable_size_deviation: FloatVectorProperty( name="Allowable Size Deviation", description="Allowable sizse deviation to judge same UV island", min=0.000001, @@ -192,17 +192,17 @@ class MUV_OT_PackUV(bpy.types.Operator): bl_description = "Pack UV (Same UV Islands are integrated)" bl_options = {'REGISTER', 'UNDO'} - rotate = BoolProperty( + rotate: BoolProperty( name="Rotate", description="Rotate option used by default pack UV function", default=False) - margin = FloatProperty( + margin: FloatProperty( name="Margin", description="Margin used by default pack UV function", min=0, max=1, default=0.001) - allowable_center_deviation = FloatVectorProperty( + allowable_center_deviation: FloatVectorProperty( name="Allowable Center Deviation", description="Allowable center deviation to judge same UV island", min=0.000001, @@ -210,7 +210,7 @@ class MUV_OT_PackUV(bpy.types.Operator): default=(0.001, 0.001), size=2 ) - allowable_size_deviation = FloatVectorProperty( + allowable_size_deviation: FloatVectorProperty( name="Allowable Size Deviation", description="Allowable sizse deviation to judge same UV island", min=0.000001, diff --git a/uv_magic_uv/op/preserve_uv_aspect.py b/uv_magic_uv/op/preserve_uv_aspect.py index a200edaccd802b1ae16438047286a45a8c127caa..244deb89d713fe5747460efdf491d1f706d8ef4a 100644 --- a/uv_magic_uv/op/preserve_uv_aspect.py +++ b/uv_magic_uv/op/preserve_uv_aspect.py @@ -66,17 +66,17 @@ class _Properties: items.append(("None", "None", "")) return items - scene.muv_preserve_uv_aspect_enabled = BoolProperty( + scene.muv_preserve_uv_aspect_enabled: BoolProperty( name="Preserve UV Aspect Enabled", description="Preserve UV Aspect is enabled", default=False ) - scene.muv_preserve_uv_aspect_tex_image = EnumProperty( + scene.muv_preserve_uv_aspect_tex_image: EnumProperty( name="Image", description="Texture Image", items=get_loaded_texture_name ) - scene.muv_preserve_uv_aspect_origin = EnumProperty( + scene.muv_preserve_uv_aspect_origin: EnumProperty( name="Origin", description="Aspect Origin", items=[ @@ -113,8 +113,8 @@ class MUV_OT_PreserveUVAspect(bpy.types.Operator): bl_description = "Choose Image" bl_options = {'REGISTER', 'UNDO'} - dest_img_name = StringProperty(options={'HIDDEN'}) - origin = EnumProperty( + dest_img_name: StringProperty(options={'HIDDEN'}) + origin: EnumProperty( name="Origin", description="Aspect Origin", items=[ diff --git a/uv_magic_uv/op/select_uv.py b/uv_magic_uv/op/select_uv.py index 4664551e44b052d9bdc467ed6ee7defc22d79a41..268843bf7fd8a66ae35420e0f1adfacb9dad2303 100644 --- a/uv_magic_uv/op/select_uv.py +++ b/uv_magic_uv/op/select_uv.py @@ -61,7 +61,7 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_select_uv_enabled = BoolProperty( + scene.muv_select_uv_enabled: BoolProperty( name="Select UV Enabled", description="Select UV is enabled", default=False diff --git a/uv_magic_uv/op/smooth_uv.py b/uv_magic_uv/op/smooth_uv.py index 83a4a1a5a2b94b61395b2415ed7373d602856d92..6b3cd36f172193a2b79a138ef0513b794461a1b2 100644 --- a/uv_magic_uv/op/smooth_uv.py +++ b/uv_magic_uv/op/smooth_uv.py @@ -62,24 +62,24 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_smooth_uv_enabled = BoolProperty( + scene.muv_smooth_uv_enabled: BoolProperty( name="Smooth UV Enabled", description="Smooth UV is enabled", default=False ) - scene.muv_smooth_uv_transmission = BoolProperty( + scene.muv_smooth_uv_transmission: BoolProperty( name="Transmission", description="Smooth linked UVs", default=False ) - scene.muv_smooth_uv_mesh_infl = FloatProperty( + scene.muv_smooth_uv_mesh_infl: FloatProperty( name="Mesh Influence", description="Influence rate of mesh vertex", min=0.0, max=1.0, default=0.0 ) - scene.muv_smooth_uv_select = BoolProperty( + scene.muv_smooth_uv_select: BoolProperty( name="Select", description="Select UVs which are smoothed", default=False @@ -102,19 +102,19 @@ class MUV_OT_SmoothUV(bpy.types.Operator): bl_description = "Smooth UV coordinates" bl_options = {'REGISTER', 'UNDO'} - transmission = BoolProperty( + transmission: BoolProperty( name="Transmission", description="Smooth linked UVs", default=False ) - mesh_infl = FloatProperty( + mesh_infl: FloatProperty( name="Mesh Influence", description="Influence rate of mesh vertex", min=0.0, max=1.0, default=0.0 ) - select = BoolProperty( + select: BoolProperty( name="Select", description="Select UVs which are smoothed", default=False diff --git a/uv_magic_uv/op/texture_lock.py b/uv_magic_uv/op/texture_lock.py index f43a6fa9c15b16348d8c3472f34b369b625333e5..6784cf54f712854a2aff3a48bd16731c07b5c371 100644 --- a/uv_magic_uv/op/texture_lock.py +++ b/uv_magic_uv/op/texture_lock.py @@ -228,12 +228,12 @@ class _Properties: def update_func(_, __): bpy.ops.uv.muv_texture_lock_operator_intr('INVOKE_REGION_WIN') - scene.muv_texture_lock_enabled = BoolProperty( + scene.muv_texture_lock_enabled: BoolProperty( name="Texture Lock Enabled", description="Texture Lock is enabled", default=False ) - scene.muv_texture_lock_lock = BoolProperty( + scene.muv_texture_lock_lock: BoolProperty( name="Texture Lock Locked", description="Texture Lock is locked", default=False, @@ -241,7 +241,7 @@ class _Properties: set=set_func, update=update_func ) - scene.muv_texture_lock_connect = BoolProperty( + scene.muv_texture_lock_connect: BoolProperty( name="Connect UV", default=True ) @@ -312,7 +312,7 @@ class MUV_OT_TextureLock_Unlock(bpy.types.Operator): bl_description = "Unlock Texture" bl_options = {'REGISTER', 'UNDO'} - connect = BoolProperty( + connect: BoolProperty( name="Connect UV", default=True ) diff --git a/uv_magic_uv/op/texture_projection.py b/uv_magic_uv/op/texture_projection.py index cb7c25bb125ca2d32d00f06b780d1c72fd3caeda..e807caee0a4812e664d34d933bd8e64818fac9ee 100644 --- a/uv_magic_uv/op/texture_projection.py +++ b/uv_magic_uv/op/texture_projection.py @@ -158,12 +158,12 @@ class _Properties: def update_func(_, __): bpy.ops.uv.muv_texture_projection_operator('INVOKE_REGION_WIN') - scene.muv_texture_projection_enabled = BoolProperty( + scene.muv_texture_projection_enabled: BoolProperty( name="Texture Projection Enabled", description="Texture Projection is enabled", default=False ) - scene.muv_texture_projection_enable = BoolProperty( + scene.muv_texture_projection_enable: BoolProperty( name="Texture Projection Enabled", description="Texture Projection is enabled", default=False, @@ -171,36 +171,36 @@ class _Properties: set=set_func, update=update_func ) - scene.muv_texture_projection_tex_magnitude = FloatProperty( + scene.muv_texture_projection_tex_magnitude: FloatProperty( name="Magnitude", description="Texture Magnitude", default=0.5, min=0.0, max=100.0 ) - scene.muv_texture_projection_tex_image = EnumProperty( + scene.muv_texture_projection_tex_image: EnumProperty( name="Image", description="Texture Image", items=get_loaded_texture_name ) - scene.muv_texture_projection_tex_transparency = FloatProperty( + scene.muv_texture_projection_tex_transparency: FloatProperty( name="Transparency", description="Texture Transparency", default=0.2, min=0.0, max=1.0 ) - scene.muv_texture_projection_adjust_window = BoolProperty( + scene.muv_texture_projection_adjust_window: BoolProperty( name="Adjust Window", description="Size of renderered texture is fitted to window", default=True ) - scene.muv_texture_projection_apply_tex_aspect = BoolProperty( + scene.muv_texture_projection_apply_tex_aspect: BoolProperty( name="Texture Aspect Ratio", description="Apply Texture Aspect ratio to displayed texture", default=True ) - scene.muv_texture_projection_assign_uvmap = BoolProperty( + scene.muv_texture_projection_assign_uvmap: BoolProperty( name="Assign UVMap", description="Assign UVMap when no UVmaps are available", default=True diff --git a/uv_magic_uv/op/texture_wrap.py b/uv_magic_uv/op/texture_wrap.py index c78ffed9ced4644ed52d2d5f798e7444fe6fe64b..2b4d5c2b16f88bff8cc1b73336681a692e0566ee 100644 --- a/uv_magic_uv/op/texture_wrap.py +++ b/uv_magic_uv/op/texture_wrap.py @@ -67,17 +67,17 @@ class _Properties: scene.muv_props.texture_wrap = Props() - scene.muv_texture_wrap_enabled = BoolProperty( + scene.muv_texture_wrap_enabled: BoolProperty( name="Texture Wrap", description="Texture Wrap is enabled", default=False ) - scene.muv_texture_wrap_set_and_refer = BoolProperty( + scene.muv_texture_wrap_set_and_refer: BoolProperty( name="Set and Refer", description="Refer and set UV", default=True ) - scene.muv_texture_wrap_selseq = BoolProperty( + scene.muv_texture_wrap_selseq: BoolProperty( name="Selection Sequence", description="Set UV sequentially", default=False diff --git a/uv_magic_uv/op/transfer_uv.py b/uv_magic_uv/op/transfer_uv.py index 25d430b9bb24863ff033e732eb2e60addfa6d15a..079308eab6d4b7d54f17141bd049e088dc9db9f7 100644 --- a/uv_magic_uv/op/transfer_uv.py +++ b/uv_magic_uv/op/transfer_uv.py @@ -333,17 +333,17 @@ class _Properties: scene.muv_props.transfer_uv = Props() - scene.muv_transfer_uv_enabled = BoolProperty( + scene.muv_transfer_uv_enabled: BoolProperty( name="Transfer UV Enabled", description="Transfer UV is enabled", default=False ) - scene.muv_transfer_uv_invert_normals = BoolProperty( + scene.muv_transfer_uv_invert_normals: BoolProperty( name="Invert Normals", description="Invert Normals", default=False ) - scene.muv_transfer_uv_copy_seams = BoolProperty( + scene.muv_transfer_uv_copy_seams: BoolProperty( name="Copy Seams", description="Copy Seams", default=True @@ -409,12 +409,12 @@ class MUV_OT_TransferUV_PasteUV(bpy.types.Operator): bl_description = "Transfer UV Paste UV (Topological based paste)" bl_options = {'REGISTER', 'UNDO'} - invert_normals = BoolProperty( + invert_normals: BoolProperty( name="Invert Normals", description="Invert Normals", default=False ) - copy_seams = BoolProperty( + copy_seams: BoolProperty( name="Copy Seams", description="Copy Seams", default=True diff --git a/uv_magic_uv/op/unwrap_constraint.py b/uv_magic_uv/op/unwrap_constraint.py index 897271601d63a3f09c7fcb6649aa2f1ac633dbcd..62b829cf309a69ec29ecdc92fa064eba0fa4d6cb 100644 --- a/uv_magic_uv/op/unwrap_constraint.py +++ b/uv_magic_uv/op/unwrap_constraint.py @@ -62,17 +62,17 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_unwrap_constraint_enabled = BoolProperty( + scene.muv_unwrap_constraint_enabled: BoolProperty( name="Unwrap Constraint Enabled", description="Unwrap Constraint is enabled", default=False ) - scene.muv_unwrap_constraint_u_const = BoolProperty( + scene.muv_unwrap_constraint_u_const: BoolProperty( name="U-Constraint", description="Keep UV U-axis coordinate", default=False ) - scene.muv_unwrap_constraint_v_const = BoolProperty( + scene.muv_unwrap_constraint_v_const: BoolProperty( name="V-Constraint", description="Keep UV V-axis coordinate", default=False @@ -98,7 +98,7 @@ class MUV_OT_UnwrapConstraint(bpy.types.Operator): bl_options = {'REGISTER', 'UNDO'} # property for original unwrap - method = EnumProperty( + method: EnumProperty( name="Method", description="Unwrapping method", items=[ @@ -106,20 +106,20 @@ class MUV_OT_UnwrapConstraint(bpy.types.Operator): ('CONFORMAL', 'Conformal', 'Conformal') ], default='ANGLE_BASED') - fill_holes = BoolProperty( + fill_holes: BoolProperty( name="Fill Holes", description="Virtual fill holes in meshes before unwrapping", default=True) - correct_aspect = BoolProperty( + correct_aspect: BoolProperty( name="Correct Aspect", description="Map UVs taking image aspect ratio into account", default=True) - use_subsurf_data = BoolProperty( + use_subsurf_data: BoolProperty( name="Use Subsurf Modifier", description="""Map UVs taking vertex position after subsurf into account""", default=False) - margin = FloatProperty( + margin: FloatProperty( name="Margin", description="Space between islands", max=1.0, @@ -127,12 +127,12 @@ class MUV_OT_UnwrapConstraint(bpy.types.Operator): default=0.001) # property for this operation - u_const = BoolProperty( + u_const: BoolProperty( name="U-Constraint", description="Keep UV U-axis coordinate", default=False ) - v_const = BoolProperty( + v_const: BoolProperty( name="V-Constraint", description="Keep UV V-axis coordinate", default=False diff --git a/uv_magic_uv/op/uv_bounding_box.py b/uv_magic_uv/op/uv_bounding_box.py index 4839934bb783fbe9b6bc20941ba11d8cf39b07cb..be687b54a6e80c4ce114d61bcd6520c141cde1ff 100644 --- a/uv_magic_uv/op/uv_bounding_box.py +++ b/uv_magic_uv/op/uv_bounding_box.py @@ -90,12 +90,12 @@ class _Properties: def update_func(_, __): bpy.ops.uv.muv_uv_bounding_box_operator('INVOKE_REGION_WIN') - scene.muv_uv_bounding_box_enabled = BoolProperty( + scene.muv_uv_bounding_box_enabled: BoolProperty( name="UV Bounding Box Enabled", description="UV Bounding Box is enabled", default=False ) - scene.muv_uv_bounding_box_show = BoolProperty( + scene.muv_uv_bounding_box_show: BoolProperty( name="UV Bounding Box Showed", description="UV Bounding Box is showed", default=False, @@ -103,12 +103,12 @@ class _Properties: set=set_func, update=update_func ) - scene.muv_uv_bounding_box_uniform_scaling = BoolProperty( + scene.muv_uv_bounding_box_uniform_scaling: BoolProperty( name="Uniform Scaling", description="Enable Uniform Scaling", default=False ) - scene.muv_uv_bounding_box_boundary = EnumProperty( + scene.muv_uv_bounding_box_boundary: EnumProperty( name="Boundary", description="Boundary", default='UV_SEL', diff --git a/uv_magic_uv/op/uv_inspection.py b/uv_magic_uv/op/uv_inspection.py index 0978158d9cc23e63639b8e9e2247313c5be0aadb..b7868978a2d65d6fba0c685d29456d87c13b76ae 100644 --- a/uv_magic_uv/op/uv_inspection.py +++ b/uv_magic_uv/op/uv_inspection.py @@ -101,12 +101,12 @@ class _Properties: def update_func(_, __): bpy.ops.uv.muv_uv_inspection_operator_render('INVOKE_REGION_WIN') - scene.muv_uv_inspection_enabled = BoolProperty( + scene.muv_uv_inspection_enabled: BoolProperty( name="UV Inspection Enabled", description="UV Inspection is enabled", default=False ) - scene.muv_uv_inspection_show = BoolProperty( + scene.muv_uv_inspection_show: BoolProperty( name="UV Inspection Showed", description="UV Inspection is showed", default=False, @@ -114,17 +114,17 @@ class _Properties: set=set_func, update=update_func ) - scene.muv_uv_inspection_show_overlapped = BoolProperty( + scene.muv_uv_inspection_show_overlapped: BoolProperty( name="Overlapped", description="Show overlapped UVs", default=False ) - scene.muv_uv_inspection_show_flipped = BoolProperty( + scene.muv_uv_inspection_show_flipped: BoolProperty( name="Flipped", description="Show flipped UVs", default=False ) - scene.muv_uv_inspection_show_mode = EnumProperty( + scene.muv_uv_inspection_show_mode: EnumProperty( name="Mode", description="Show mode", items=[ diff --git a/uv_magic_uv/op/uv_sculpt.py b/uv_magic_uv/op/uv_sculpt.py index 7dc1b8436325ade14396c53a4680633a83592242..0de6df9773ce9820416e525faeb32a0c22f787f6 100644 --- a/uv_magic_uv/op/uv_sculpt.py +++ b/uv_magic_uv/op/uv_sculpt.py @@ -98,12 +98,12 @@ class _Properties: def update_func(_, __): bpy.ops.uv.muv_uv_sculpt_operator('INVOKE_REGION_WIN') - scene.muv_uv_sculpt_enabled = BoolProperty( + scene.muv_uv_sculpt_enabled: BoolProperty( name="UV Sculpt", description="UV Sculpt is enabled", default=False ) - scene.muv_uv_sculpt_enable = BoolProperty( + scene.muv_uv_sculpt_enable: BoolProperty( name="UV Sculpt Showed", description="UV Sculpt is enabled", default=False, @@ -111,21 +111,21 @@ class _Properties: set=set_func, update=update_func ) - scene.muv_uv_sculpt_radius = IntProperty( + scene.muv_uv_sculpt_radius: IntProperty( name="Radius", description="Radius of the brush", min=1, max=500, default=30 ) - scene.muv_uv_sculpt_strength = FloatProperty( + scene.muv_uv_sculpt_strength: FloatProperty( name="Strength", description="How powerful the effect of the brush when applied", min=0.0, max=1.0, default=0.03, ) - scene.muv_uv_sculpt_tools = EnumProperty( + scene.muv_uv_sculpt_tools: EnumProperty( name="Tools", description="Select Tools for the UV sculpt brushes", items=[ @@ -135,17 +135,17 @@ class _Properties: ], default='GRAB' ) - scene.muv_uv_sculpt_show_brush = BoolProperty( + scene.muv_uv_sculpt_show_brush: BoolProperty( name="Show Brush", description="Show Brush", default=True ) - scene.muv_uv_sculpt_pinch_invert = BoolProperty( + scene.muv_uv_sculpt_pinch_invert: BoolProperty( name="Invert", description="Pinch UV to invert direction", default=False ) - scene.muv_uv_sculpt_relax_method = EnumProperty( + scene.muv_uv_sculpt_relax_method: EnumProperty( name="Method", description="Algorithm used for relaxation", items=[ diff --git a/uv_magic_uv/op/uvw.py b/uv_magic_uv/op/uvw.py index 9b44100cd92943ee2129b707159317877bc6205e..2801177736aa75e5fc7dfdbbcde4fdb439dd3f50 100644 --- a/uv_magic_uv/op/uvw.py +++ b/uv_magic_uv/op/uvw.py @@ -175,12 +175,12 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_uvw_enabled = BoolProperty( + scene.muv_uvw_enabled: BoolProperty( name="UVW Enabled", description="UVW is enabled", default=False ) - scene.muv_uvw_assign_uvmap = BoolProperty( + scene.muv_uvw_assign_uvmap: BoolProperty( name="Assign UVMap", description="Assign UVMap when no UVmaps are available", default=True @@ -199,27 +199,27 @@ class MUV_OT_UVW_BoxMap(bpy.types.Operator): bl_label = "Box Map" bl_options = {'REGISTER', 'UNDO'} - size = FloatProperty( + size: FloatProperty( name="Size", default=1.0, precision=4 ) - rotation = FloatVectorProperty( + rotation: FloatVectorProperty( name="XYZ Rotation", size=3, default=(0.0, 0.0, 0.0) ) - offset = FloatVectorProperty( + offset: FloatVectorProperty( name="XYZ Offset", size=3, default=(0.0, 0.0, 0.0) ) - tex_aspect = FloatProperty( + tex_aspect: FloatProperty( name="Texture Aspect", default=1.0, precision=4 ) - assign_uvmap = BoolProperty( + assign_uvmap: BoolProperty( name="Assign UVMap", description="Assign UVMap when no UVmaps are available", default=True @@ -257,26 +257,26 @@ class MUV_OT_UVW_BestPlanerMap(bpy.types.Operator): bl_label = "Best Planer Map" bl_options = {'REGISTER', 'UNDO'} - size = FloatProperty( + size: FloatProperty( name="Size", default=1.0, precision=4 ) - rotation = FloatProperty( + rotation: FloatProperty( name="XY Rotation", default=0.0 ) - offset = FloatVectorProperty( + offset: FloatVectorProperty( name="XY Offset", size=2, default=(0.0, 0.0) ) - tex_aspect = FloatProperty( + tex_aspect: FloatProperty( name="Texture Aspect", default=1.0, precision=4 ) - assign_uvmap = BoolProperty( + assign_uvmap: BoolProperty( name="Assign UVMap", description="Assign UVMap when no UVmaps are available", default=True diff --git a/uv_magic_uv/op/world_scale_uv.py b/uv_magic_uv/op/world_scale_uv.py index ae46e4a93f4cabcc3a40b40ea84b215f7424a9a8..f060dad8025f1897db18db367041cb21deb9c887 100644 --- a/uv_magic_uv/op/world_scale_uv.py +++ b/uv_magic_uv/op/world_scale_uv.py @@ -183,36 +183,36 @@ class _Properties: @classmethod def init_props(cls, scene): - scene.muv_world_scale_uv_enabled = BoolProperty( + scene.muv_world_scale_uv_enabled: BoolProperty( name="World Scale UV Enabled", description="World Scale UV is enabled", default=False ) - scene.muv_world_scale_uv_src_mesh_area = FloatProperty( + scene.muv_world_scale_uv_src_mesh_area: FloatProperty( name="Mesh Area", description="Source Mesh Area", default=0.0, min=0.0 ) - scene.muv_world_scale_uv_src_uv_area = FloatProperty( + scene.muv_world_scale_uv_src_uv_area: FloatProperty( name="UV Area", description="Source UV Area", default=0.0, min=0.0 ) - scene.muv_world_scale_uv_src_density = FloatProperty( + scene.muv_world_scale_uv_src_density: FloatProperty( name="Density", description="Source Texel Density", default=0.0, min=0.0 ) - scene.muv_world_scale_uv_tgt_density = FloatProperty( + scene.muv_world_scale_uv_tgt_density: FloatProperty( name="Density", description="Target Texel Density", default=0.0, min=0.0 ) - scene.muv_world_scale_uv_tgt_scaling_factor = FloatProperty( + scene.muv_world_scale_uv_tgt_scaling_factor: FloatProperty( name="Scaling Factor", default=1.0, max=1000.0, @@ -225,7 +225,7 @@ class _Properties: soft_max=10240, default=(1024, 1024), ) - scene.muv_world_scale_uv_mode = EnumProperty( + scene.muv_world_scale_uv_mode: EnumProperty( name="Mode", description="Density calculation mode", items=[ @@ -239,7 +239,7 @@ class _Properties: ], default='MANUAL' ) - scene.muv_world_scale_uv_origin = EnumProperty( + scene.muv_world_scale_uv_origin: EnumProperty( name="Origin", description="Aspect Origin", items=[ @@ -319,7 +319,7 @@ class MUV_OT_WorldScaleUV_ApplyManual(bpy.types.Operator): bl_description = "Apply scaled UV based on user specification" bl_options = {'REGISTER', 'UNDO'} - tgt_density = FloatProperty( + tgt_density: FloatProperty( name="Density", description="Target Texel Density", default=1.0, @@ -332,7 +332,7 @@ class MUV_OT_WorldScaleUV_ApplyManual(bpy.types.Operator): soft_max=10240, default=(1024, 1024), ) - origin = EnumProperty( + origin: EnumProperty( name="Origin", description="Aspect Origin", items=[ @@ -349,7 +349,7 @@ class MUV_OT_WorldScaleUV_ApplyManual(bpy.types.Operator): ], default='CENTER' ) - show_dialog = BoolProperty( + show_dialog: BoolProperty( name="Show Diaglog Menu", description="Show dialog menu if true", default=True, @@ -417,13 +417,13 @@ class MUV_OT_WorldScaleUV_ApplyScalingDensity(bpy.types.Operator): bl_description = "Apply scaled UV with scaling density" bl_options = {'REGISTER', 'UNDO'} - tgt_scaling_factor = FloatProperty( + tgt_scaling_factor: FloatProperty( name="Scaling Factor", default=1.0, max=1000.0, min=0.00001 ) - origin = EnumProperty( + origin: EnumProperty( name="Origin", description="Aspect Origin", items=[ @@ -440,20 +440,20 @@ class MUV_OT_WorldScaleUV_ApplyScalingDensity(bpy.types.Operator): ], default='CENTER' ) - src_density = FloatProperty( + src_density: FloatProperty( name="Density", description="Source Texel Density", default=0.0, min=0.0, options={'HIDDEN'} ) - same_density = BoolProperty( + same_density: BoolProperty( name="Same Density", description="Apply same density", default=False, options={'HIDDEN'} ) - show_dialog = BoolProperty( + show_dialog: BoolProperty( name="Show Diaglog Menu", description="Show dialog menu if true", default=True, @@ -541,7 +541,7 @@ class MUV_OT_WorldScaleUV_ApplyProportionalToMesh(bpy.types.Operator): bl_description = "Apply scaled UV proportionaled to mesh" bl_options = {'REGISTER', 'UNDO'} - origin = EnumProperty( + origin: EnumProperty( name="Origin", description="Aspect Origin", items=[ @@ -558,28 +558,28 @@ class MUV_OT_WorldScaleUV_ApplyProportionalToMesh(bpy.types.Operator): ], default='CENTER' ) - src_density = FloatProperty( + src_density: FloatProperty( name="Source Density", description="Source Texel Density", default=0.0, min=0.0, options={'HIDDEN'} ) - src_uv_area = FloatProperty( + src_uv_area: FloatProperty( name="Source UV Area", description="Source UV Area", default=0.0, min=0.0, options={'HIDDEN'} ) - src_mesh_area = FloatProperty( + src_mesh_area: FloatProperty( name="Source Mesh Area", description="Source Mesh Area", default=0.0, min=0.0, options={'HIDDEN'} ) - show_dialog = BoolProperty( + show_dialog: BoolProperty( name="Show Diaglog Menu", description="Show dialog menu if true", default=True, diff --git a/uv_magic_uv/preferences.py b/uv_magic_uv/preferences.py index 01d7155e66a6bc714e97566ebd1c0abf876a49ca..19715044d65d606699700b51281e087267c1e651 100644 --- a/uv_magic_uv/preferences.py +++ b/uv_magic_uv/preferences.py @@ -178,7 +178,7 @@ class MUV_OT_UpdateAddon(bpy.types.Operator): bl_description = "Update Add-on" bl_options = {'REGISTER', 'UNDO'} - branch_name = StringProperty( + branch_name: StringProperty( name="Branch Name", description="Branch name to update", default="", @@ -213,7 +213,7 @@ class Preferences(AddonPreferences): remove_builtin_menu() # enable to add features to built-in menu - enable_builtin_menu = BoolProperty( + enable_builtin_menu: BoolProperty( name="Built-in Menu", description="Enable built-in menu", default=True, @@ -221,7 +221,7 @@ class Preferences(AddonPreferences): ) # for UV Sculpt - uv_sculpt_brush_color = FloatVectorProperty( + uv_sculpt_brush_color: FloatVectorProperty( name="Color", description="Color", default=(1.0, 0.4, 0.4, 1.0), @@ -232,7 +232,7 @@ class Preferences(AddonPreferences): ) # for Overlapped UV - uv_inspection_overlapped_color = FloatVectorProperty( + uv_inspection_overlapped_color: FloatVectorProperty( name="Color", description="Color", default=(0.0, 0.0, 1.0, 0.3), @@ -243,7 +243,7 @@ class Preferences(AddonPreferences): ) # for Flipped UV - uv_inspection_flipped_color = FloatVectorProperty( + uv_inspection_flipped_color: FloatVectorProperty( name="Color", description="Color", default=(1.0, 0.0, 0.0, 0.3), @@ -254,7 +254,7 @@ class Preferences(AddonPreferences): ) # for Texture Projection - texture_projection_canvas_padding = FloatVectorProperty( + texture_projection_canvas_padding: FloatVectorProperty( name="Canvas Padding", description="Canvas Padding", size=2, @@ -263,13 +263,13 @@ class Preferences(AddonPreferences): default=(20.0, 20.0)) # for UV Bounding Box - uv_bounding_box_cp_size = FloatProperty( + uv_bounding_box_cp_size: FloatProperty( name="Size", description="Control Point Size", default=6.0, min=3.0, max=100.0) - uv_bounding_box_cp_react_size = FloatProperty( + uv_bounding_box_cp_react_size: FloatProperty( name="React Size", description="Size event fired", default=10.0, @@ -277,7 +277,7 @@ class Preferences(AddonPreferences): max=100.0) # for UI - category = EnumProperty( + category: EnumProperty( name="Category", description="Preferences Category", items=[ @@ -287,39 +287,39 @@ class Preferences(AddonPreferences): ], default='INFO' ) - info_desc_expanded = BoolProperty( + info_desc_expanded: BoolProperty( name="Description", description="Description", default=False ) - info_loc_expanded = BoolProperty( + info_loc_expanded: BoolProperty( name="Location", description="Location", default=False ) - conf_uv_sculpt_expanded = BoolProperty( + conf_uv_sculpt_expanded: BoolProperty( name="UV Sculpt", description="UV Sculpt", default=False ) - conf_uv_inspection_expanded = BoolProperty( + conf_uv_inspection_expanded: BoolProperty( name="UV Inspection", description="UV Inspection", default=False ) - conf_texture_projection_expanded = BoolProperty( + conf_texture_projection_expanded: BoolProperty( name="Texture Projection", description="Texture Projection", default=False ) - conf_uv_bounding_box_expanded = BoolProperty( + conf_uv_bounding_box_expanded: BoolProperty( name="UV Bounding Box", description="UV Bounding Box", default=False ) # for add-on updater - updater_branch_to_update = EnumProperty( + updater_branch_to_update: EnumProperty( name="branch", description="Target branch to update add-on", items=get_update_candidate_branches diff --git a/uv_texture_atlas.py b/uv_texture_atlas.py index b3bc1ec61f48b915d4e68e15b2b3eb051aa1432e..9902aa34b463be7fc2ec7d926c1a2a72352729e0 100644 --- a/uv_texture_atlas.py +++ b/uv_texture_atlas.py @@ -275,30 +275,30 @@ class TexAtl_RunFinish(Operator): class TexAtl_UVLayers(PropertyGroup): - name = StringProperty(default="") + name: StringProperty(default="") class TexAtl_VertexGroups(PropertyGroup): - name = StringProperty(default="") + name: StringProperty(default="") class TexAtl_Groups(PropertyGroup): - name = StringProperty(default="") + name: StringProperty(default="") class TexAtl_MSLightmapGroups(PropertyGroup): - name = StringProperty(default="") - bake = BoolProperty(default=True) + name: StringProperty(default="") + bake: BoolProperty(default=True) - unwrap_type = EnumProperty( + unwrap_type: EnumProperty( name="unwrap_type", items=(('0', 'Smart_Unwrap', 'Smart_Unwrap'), ('1', 'Lightmap', 'Lightmap'), ('2', 'No_Unwrap', 'No_Unwrap'), ), ) - resolutionX = EnumProperty( + resolutionX: EnumProperty( name="resolutionX", items=(('256', '256', ''), ('512', '512', ''), @@ -310,7 +310,7 @@ class TexAtl_MSLightmapGroups(PropertyGroup): ), default='1024' ) - resolutionY = EnumProperty( + resolutionY: EnumProperty( name="resolutionY", items=(('256', '256', ''), ('512', '512', ''), @@ -322,25 +322,25 @@ class TexAtl_MSLightmapGroups(PropertyGroup): ), default='1024' ) - autoUnwrapPrecision = FloatProperty( + autoUnwrapPrecision: FloatProperty( name="autoUnwrapPrecision", default=0.01, min=0.001, max=10 ) - template_list_controls = StringProperty( + template_list_controls: StringProperty( default="bake", options={"HIDDEN"}, ) class TexAtl_MergedObjects(PropertyGroup): - name = StringProperty() - vertex_groups = CollectionProperty( + name: StringProperty() + vertex_groups: CollectionProperty( type=TexAtl_VertexGroups, ) - groups = CollectionProperty(type=TexAtl_Groups) - uv_layers = CollectionProperty(type=TexAtl_UVLayers) + groups: CollectionProperty(type=TexAtl_Groups) + uv_layers: CollectionProperty(type=TexAtl_UVLayers) class TexAtl_AddSelectedToGroup(Operator): @@ -478,7 +478,7 @@ class TexAtl_AddLightmapGroup(Operator): bl_label = "add Lightmap" bl_description = "Adds a new Lightmap Group" - name = StringProperty(name="Group Name", default='TextureAtlas') + name: StringProperty(name="Group Name", default='TextureAtlas') def execute(self, context): scene = context.scene @@ -537,9 +537,9 @@ class TexAtl_CreateLightmap(Operator): bl_label = "TextureAtlas - Generate Lightmap" bl_description = "Generates a Lightmap" - group_name = StringProperty(default='') - resolutionX = IntProperty(default=1024) - resolutionY = IntProperty(default=1024) + group_name: StringProperty(default='') + resolutionX: IntProperty(default=1024) + resolutionY: IntProperty(default=1024) def execute(self, context): scene = context.scene @@ -598,8 +598,8 @@ class TexAtl_MergeObjects(Operator): bl_label = "TextureAtlas - TexAtl_MergeObjects" bl_description = "Merges Objects and stores Origins" - group_name = StringProperty(default='') - unwrap = BoolProperty(default=False) + group_name: StringProperty(default='') + unwrap: BoolProperty(default=False) def execute(self, context): scene = context.scene @@ -733,7 +733,7 @@ class TexAtl_SeparateObjects(Operator): bl_label = "TextureAtlas - Separate Objects" bl_description = "Separates Objects and restores Origin" - group_name = StringProperty(default='') + group_name: StringProperty(default='') def execute(self, context): scene = context.scene