diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-08-02 07:18:48 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-08-02 07:18:48 +0400 |
commit | 7c272c80dd630713b828d586e0387b66af7bc7e0 (patch) | |
tree | 1b56d1e46e24cac4c2b96978943eb01826a31ac4 /io_scene_obj | |
parent | af88ccbfee8149971096a8af7e9af191548de819 (diff) |
pep8 style edits.
Diffstat (limited to 'io_scene_obj')
-rw-r--r-- | io_scene_obj/__init__.py | 227 |
1 files changed, 175 insertions, 52 deletions
diff --git a/io_scene_obj/__init__.py b/io_scene_obj/__init__.py index cd8a855d..74a30293 100644 --- a/io_scene_obj/__init__.py +++ b/io_scene_obj/__init__.py @@ -16,23 +16,23 @@ # # ##### END GPL LICENSE BLOCK ##### -# <pep8 compliant> +# <pep8-80 compliant> bl_info = { "name": "Wavefront OBJ format", "author": "Campbell Barton", - "blender": (2, 5, 7), + "blender": (2, 5, 8), "api": 35622, "location": "File > Import-Export", - "description": "Import-Export OBJ, Import OBJ mesh, UV's, materials and textures", + "description": ("Import-Export OBJ, Import OBJ mesh, UV's, " + "materials and textures"), "warning": "", - "wiki_url": "http://wiki.blender.org/index.php/Extensions:2.5/Py/"\ - "Scripts/Import-Export/Wavefront_OBJ", + "wiki_url": ("http://wiki.blender.org/index.php/Extensions:2.5/Py/" + "Scripts/Import-Export/Wavefront_OBJ"), "tracker_url": "", "support": 'OFFICIAL', "category": "Import-Export"} -# To support reload properly, try to access a package var, if it's there, reload everything if "bpy" in locals(): import imp if "import_obj" in locals(): @@ -42,8 +42,11 @@ if "bpy" in locals(): import bpy -from bpy.props import BoolProperty, FloatProperty, StringProperty, EnumProperty - +from bpy.props import (BoolProperty, + FloatProperty, + StringProperty, + EnumProperty, + ) from bpy_extras.io_utils import (ExportHelper, ImportHelper, path_reference_mode, @@ -59,27 +62,65 @@ class ImportOBJ(bpy.types.Operator, ImportHelper): bl_options = {'PRESET'} filename_ext = ".obj" - filter_glob = StringProperty(default="*.obj;*.mtl", options={'HIDDEN'}) + filter_glob = StringProperty( + default="*.obj;*.mtl", + options={'HIDDEN'}, + ) - use_ngons = BoolProperty(name="NGons", description="Import faces with more then 4 verts as fgons", default=True) - use_edges = BoolProperty(name="Lines", description="Import lines and faces with 2 verts as edge", default=True) - use_smooth_groups = BoolProperty(name="Smooth Groups", description="Surround smooth groups by sharp edges", default=True) + use_ngons = BoolProperty( + name="NGons", + description="Import faces with more then 4 verts as fgons", + default=True, + ) + use_edges = BoolProperty( + name="Lines", + description="Import lines and faces with 2 verts as edge", + default=True, + ) + use_smooth_groups = BoolProperty( + name="Smooth Groups", + description="Surround smooth groups by sharp edges", + default=True, + ) - use_split_objects = BoolProperty(name="Object", description="Import OBJ Objects into Blender Objects", default=True) - use_split_groups = BoolProperty(name="Group", description="Import OBJ Groups into Blender Objects", default=True) + use_split_objects = BoolProperty( + name="Object", + description="Import OBJ Objects into Blender Objects", + default=True, + ) + use_split_groups = BoolProperty( + name="Group", + description="Import OBJ Groups into Blender Objects", + default=True, + ) - use_groups_as_vgroups = BoolProperty(name="Poly Groups", description="Import OBJ groups as vertex groups.", default=False) + use_groups_as_vgroups = BoolProperty( + name="Poly Groups", + description="Import OBJ groups as vertex groups.", + default=False, + ) - use_image_search = BoolProperty(name="Image Search", description="Search subdirs for any assosiated images (Warning, may be slow)", default=True) + use_image_search = BoolProperty( + name="Image Search", + description=("Search subdirs for any assosiated images " + "(Warning, may be slow)"), + default=True, + ) split_mode = EnumProperty( name="Split", items=(('ON', "Split", "Split geometry, omits unused verts"), - ('OFF', "Keep Vert Order", "Maintain vertex order from file"), + ('OFF', "Keep Vert Order", "Keep vertex order from file"), ), ) - global_clamp_size = FloatProperty(name="Clamp Scale", description="Clamp the size to this maximum (Zero to Disable)", min=0.0, max=1000.0, soft_min=0.0, soft_max=1000.0, default=0.0) + global_clamp_size = FloatProperty( + name="Clamp Scale", + description="Clamp the size to this maximum (Zero to Disable)", + min=0.0, max=1000.0, + soft_min=0.0, soft_max=1000.0, + default=0.0, + ) axis_forward = EnumProperty( name="Forward", items=(('X', "X Forward", ""), @@ -104,9 +145,6 @@ class ImportOBJ(bpy.types.Operator, ImportHelper): default='Y', ) - # fake prop, only disables split. - # keep_vertex_order = BoolProperty(name="Keep Vert Order", description="Keep vert and face order, disables split options, enable for morph targets", default= True) - def check(self, context): return axis_conversion_ensure(self, "axis_forward", "axis_up") @@ -120,9 +158,15 @@ class ImportOBJ(bpy.types.Operator, ImportHelper): else: self.use_groups_as_vgroups = False - keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "filter_glob", "split_mode")) + keywords = self.as_keywords(ignore=("axis_forward", + "axis_up", + "filter_glob", + "split_mode", + )) - global_matrix = axis_conversion(from_forward=self.axis_forward, from_up=self.axis_up).to_4x4() + global_matrix = axis_conversion(from_forward=self.axis_forward, + from_up=self.axis_up, + ).to_4x4() keywords["global_matrix"] = global_matrix return import_obj.load(self, context, **keywords) @@ -164,37 +208,110 @@ class ExportOBJ(bpy.types.Operator, ExportHelper): bl_options = {'PRESET'} filename_ext = ".obj" - filter_glob = StringProperty(default="*.obj;*.mtl", options={'HIDDEN'}) + filter_glob = StringProperty( + default="*.obj;*.mtl", + options={'HIDDEN'}, + ) # List of operator properties, the attributes will be assigned # to the class instance from the operator settings before calling. # context group - use_selection = BoolProperty(name="Selection Only", description="Export selected objects only", default=False) - use_all_scenes = BoolProperty(name="All Scenes", description="", default=False) - use_animation = BoolProperty(name="Animation", description="", default=False) + use_selection = BoolProperty( + name="Selection Only", + description="Export selected objects only", + default=False, + ) + use_all_scenes = BoolProperty( + name="All Scenes", + description="", + default=False, + ) + use_animation = BoolProperty( + name="Animation", + description="", + default=False, + ) # object group - use_apply_modifiers = BoolProperty(name="Apply Modifiers", description="Apply modifiers (preview resolution)", default=True) + use_apply_modifiers = BoolProperty( + name="Apply Modifiers", + description="Apply modifiers (preview resolution)", + default=True, + ) # extra data group - use_edges = BoolProperty(name="Edges", description="", default=True) - use_normals = BoolProperty(name="Normals", description="", default=False) - use_hq_normals = BoolProperty(name="High Quality Normals", description="", default=True) - use_uvs = BoolProperty(name="UVs", description="", default=True) - use_materials = BoolProperty(name="Materials", description="", default=True) - # copy_images = BoolProperty(name="Copy Images", description="", default=False) - use_triangles = BoolProperty(name="Triangulate", description="", default=False) - use_vertex_groups = BoolProperty(name="Polygroups", description="", default=False) - use_nurbs = BoolProperty(name="Nurbs", description="", default=False) + use_edges = BoolProperty( + name="Edges", + description="", + default=True, + ) + use_normals = BoolProperty( + name="Normals", + description="", + default=False, + ) + use_hq_normals = BoolProperty( + name="High Quality Normals", + description="", + default=True, + ) + use_uvs = BoolProperty( + name="UVs", + description="", + default=True, + ) + use_materials = BoolProperty( + name="Materials", + description="", + default=True, + ) + use_triangles = BoolProperty( + name="Triangulate", + description="", + default=False, + ) + use_vertex_groups = BoolProperty( + name="Polygroups", + description="", + default=False, + ) + use_nurbs = BoolProperty( + name="Nurbs", + description="", + default=False, + ) # grouping group - use_blen_objects = BoolProperty(name="Objects as OBJ Objects", description="", default=True) - group_by_object = BoolProperty(name="Objects as OBJ Groups ", description="", default=False) - group_by_material = BoolProperty(name="Material Groups", description="", default=False) - keep_vertex_order = BoolProperty(name="Keep Vertex Order", description="", default=False) + use_blen_objects = BoolProperty( + name="Objects as OBJ Objects", + description="", + default=True, + ) + group_by_object = BoolProperty( + name="Objects as OBJ Groups ", + description="", + default=False, + ) + group_by_material = BoolProperty( + name="Material Groups", + description="", + default=False, + ) + keep_vertex_order = BoolProperty( + name="Keep Vertex Order", + description="", + default=False, + ) - global_scale = FloatProperty(name="Scale", description="Scale all data, (Note! some imports dont support scaled armatures)", min=0.01, max=1000.0, soft_min=0.01, soft_max=1000.0, default=1.0) + global_scale = FloatProperty( + name="Scale", + description="Scale all data", + min=0.01, max=1000.0, + soft_min=0.01, + soft_max=1000.0, + default=1.0, + ) axis_forward = EnumProperty( name="Forward", @@ -229,11 +346,24 @@ class ExportOBJ(bpy.types.Operator, ExportHelper): from . import export_obj from mathutils import Matrix - keywords = self.as_keywords(ignore=("axis_forward", "axis_up", "global_scale", "check_existing", "filter_glob")) + keywords = self.as_keywords(ignore=("axis_forward", + "axis_up", + "global_scale", + "check_existing", + "filter_glob", + )) global_matrix = Matrix() - global_matrix[0][0] = global_matrix[1][1] = global_matrix[2][2] = self.global_scale - global_matrix = global_matrix * axis_conversion(to_forward=self.axis_forward, to_up=self.axis_up).to_4x4() + + global_matrix[0][0] = \ + global_matrix[1][1] = \ + global_matrix[2][2] = self.global_scale + + global_matrix = (global_matrix * + axis_conversion(to_forward=self.axis_forward, + to_up=self.axis_up, + ).to_4x4()) + keywords["global_matrix"] = global_matrix return export_obj.save(self, context, **keywords) @@ -259,12 +389,5 @@ def unregister(): bpy.types.INFO_MT_file_import.remove(menu_func_import) bpy.types.INFO_MT_file_export.remove(menu_func_export) - -# CONVERSION ISSUES -# - matrix problem -# - duplis - only tested dupliverts -# - all scenes export -# + normals calculation - if __name__ == "__main__": register() |