[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [2195] trunk/py/scripts/addons: pep8 edits and some style change
Campbell Barton
ideasman42 at gmail.com
Fri Jul 29 08:26:14 CEST 2011
Revision: 2195
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=2195
Author: campbellbarton
Date: 2011-07-29 06:26:13 +0000 (Fri, 29 Jul 2011)
Log Message:
-----------
pep8 edits and some style change
Modified Paths:
--------------
trunk/py/scripts/addons/io_mesh_raw/__init__.py
trunk/py/scripts/addons/io_mesh_raw/import_raw.py
trunk/py/scripts/addons/io_scene_fbx/__init__.py
trunk/py/scripts/addons/io_scene_obj/import_obj.py
trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
Modified: trunk/py/scripts/addons/io_mesh_raw/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_raw/__init__.py 2011-07-28 23:22:11 UTC (rev 2194)
+++ trunk/py/scripts/addons/io_mesh_raw/__init__.py 2011-07-29 06:26:13 UTC (rev 2195)
@@ -70,12 +70,29 @@
bl_idname = "export_mesh.raw"
bl_label = "Export RAW"
- filepath = StringProperty(name="File Path", description="Filepath used for exporting the RAW file", maxlen=1024, default= "", subtype='FILE_PATH')
- check_existing = BoolProperty(name="Check Existing", description="Check and warn on overwriting existing files", default=True, options={'HIDDEN'})
+ filepath = StringProperty(
+ name="File Path",
+ description="Filepath used for exporting the RAW file",
+ maxlen=1024,
+ subtype='FILE_PATH',
+ )
+ check_existing = BoolProperty(
+ name="Check Existing",
+ description="Check and warn on overwriting existing files",
+ default=True,
+ options={'HIDDEN'},
+ )
+ apply_modifiers = BoolProperty(
+ name="Apply Modifiers",
+ description="Use transformed mesh data from each object",
+ default=True,
+ )
+ triangulate = BoolProperty(
+ name="Triangulate",
+ description="Triangulate quads.",
+ default=True,
+ )
- apply_modifiers = BoolProperty(name="Apply Modifiers", description="Use transformed mesh data from each object", default=True)
- triangulate = BoolProperty(name="Triangulate", description="Triangulate quads.", default=True)
-
def execute(self, context):
from . import export_raw
export_raw.write(self.filepath,
@@ -107,6 +124,7 @@
bpy.types.INFO_MT_file_import.append(menu_import)
bpy.types.INFO_MT_file_export.append(menu_export)
+
def unregister():
bpy.utils.unregister_module(__name__)
Modified: trunk/py/scripts/addons/io_mesh_raw/import_raw.py
===================================================================
--- trunk/py/scripts/addons/io_mesh_raw/import_raw.py 2011-07-28 23:22:11 UTC (rev 2194)
+++ trunk/py/scripts/addons/io_mesh_raw/import_raw.py 2011-07-29 06:26:13 UTC (rev 2195)
@@ -43,6 +43,7 @@
import bpy
+
def readMesh(filename, objName):
file = open(filename, "rb")
@@ -59,7 +60,6 @@
else:
return None
-
faces = []
for line in file.readlines():
face = line_to_face(line)
Modified: trunk/py/scripts/addons/io_scene_fbx/__init__.py
===================================================================
--- trunk/py/scripts/addons/io_scene_fbx/__init__.py 2011-07-28 23:22:11 UTC (rev 2194)
+++ trunk/py/scripts/addons/io_scene_fbx/__init__.py 2011-07-29 06:26:13 UTC (rev 2195)
@@ -42,7 +42,7 @@
import bpy
from bpy.props import StringProperty, BoolProperty, FloatProperty, EnumProperty
-from bpy_extras.io_utils import (ExportHelper,
+from bpy_extras.io_utils import (ExportHelper,
path_reference_mode,
axis_conversion,
axis_conversion_ensure,
Modified: trunk/py/scripts/addons/io_scene_obj/import_obj.py
===================================================================
--- trunk/py/scripts/addons/io_scene_obj/import_obj.py 2011-07-28 23:22:11 UTC (rev 2194)
+++ trunk/py/scripts/addons/io_scene_obj/import_obj.py 2011-07-29 06:26:13 UTC (rev 2195)
@@ -427,7 +427,19 @@
return [(value[0], value[1], value[2], key_to_name(key)) for key, value in list(face_split_dict.items())]
-def create_mesh(new_objects, has_ngons, use_ngons, use_edges, verts_loc, verts_tex, faces, unique_materials, unique_material_images, unique_smooth_groups, vertex_groups, dataname):
+def create_mesh(new_objects,
+ has_ngons,
+ use_ngons,
+ use_edges,
+ verts_loc,
+ verts_tex,
+ faces,
+ unique_materials,
+ unique_material_images,
+ unique_smooth_groups,
+ vertex_groups,
+ dataname,
+ ):
'''
Takes all the data gathered and generates a mesh, adding the new object to new_objects
deals with fgons, sharp edges and assigning materials
@@ -452,11 +464,12 @@
# reverse loop through face indices
for f_idx in range(len(faces) - 1, -1, -1):
- face_vert_loc_indices,\
- face_vert_tex_indices,\
- context_material,\
- context_smooth_group,\
- context_object = faces[f_idx]
+ (face_vert_loc_indices,
+ face_vert_tex_indices,
+ context_material,
+ context_smooth_group,
+ context_object,
+ ) = faces[f_idx]
len_face_vert_loc_indices = len(face_vert_loc_indices)
@@ -494,15 +507,20 @@
if has_ngons and len_face_vert_loc_indices > 4:
ngon_face_indices = ngon_tesselate(verts_loc, face_vert_loc_indices)
- faces.extend(
- [(
- [face_vert_loc_indices[ngon[0]], face_vert_loc_indices[ngon[1]], face_vert_loc_indices[ngon[2]]],
- [face_vert_tex_indices[ngon[0]], face_vert_tex_indices[ngon[1]], face_vert_tex_indices[ngon[2]]],
- context_material,
- context_smooth_group,
- context_object)
- for ngon in ngon_face_indices]
- )
+ faces.extend([([face_vert_loc_indices[ngon[0]],
+ face_vert_loc_indices[ngon[1]],
+ face_vert_loc_indices[ngon[2]],
+ ],
+ [face_vert_tex_indices[ngon[0]],
+ face_vert_tex_indices[ngon[1]],
+ face_vert_tex_indices[ngon[2]],
+ ],
+ context_material,
+ context_smooth_group,
+ context_object,
+ )
+ for ngon in ngon_face_indices]
+ )
# edges to make fgons
if use_ngons:
@@ -575,11 +593,12 @@
blender_face = me.faces[i]
- face_vert_loc_indices,\
- face_vert_tex_indices,\
- context_material,\
- context_smooth_group,\
- context_object = face
+ (face_vert_loc_indices,
+ face_vert_tex_indices,
+ context_material,
+ context_smooth_group,
+ context_object,
+ ) = face
if context_smooth_group:
blender_face.use_smooth = True
@@ -887,13 +906,12 @@
face_vert_tex_indices = []
# Instance a face
- faces.append((\
- face_vert_loc_indices,\
- face_vert_tex_indices,\
- context_material,\
- context_smooth_group,\
- context_object\
- ))
+ faces.append((face_vert_loc_indices,
+ face_vert_tex_indices,
+ context_material,
+ context_smooth_group,
+ context_object,
+ ))
if strip_slash(line_split):
context_multi_line = b'f'
@@ -944,13 +962,12 @@
face_vert_tex_indices = []
# Instance a face
- faces.append((\
- face_vert_loc_indices,\
- face_vert_tex_indices,\
- context_material,\
- context_smooth_group,\
- context_object\
- ))
+ faces.append((face_vert_loc_indices,
+ face_vert_tex_indices,
+ context_material,
+ context_smooth_group,
+ context_object,
+ ))
if strip_slash(line_split):
context_multi_line = b'l'
@@ -1088,7 +1105,19 @@
for verts_loc_split, faces_split, unique_materials_split, dataname in split_mesh(verts_loc, faces, unique_materials, filepath, SPLIT_OB_OR_GROUP):
# Create meshes from the data, warning 'vertex_groups' wont support splitting
- create_mesh(new_objects, has_ngons, use_ngons, use_edges, verts_loc_split, verts_tex, faces_split, unique_materials_split, unique_material_images, unique_smooth_groups, vertex_groups, dataname)
+ create_mesh(new_objects,
+ has_ngons,
+ use_ngons,
+ use_edges,
+ verts_loc_split,
+ verts_tex,
+ faces_split,
+ unique_materials_split,
+ unique_material_images,
+ unique_smooth_groups,
+ vertex_groups,
+ dataname,
+ )
# nurbs support
for context_nurbs in nurbs:
Modified: trunk/py/scripts/addons/io_scene_x3d/export_x3d.py
===================================================================
--- trunk/py/scripts/addons/io_scene_x3d/export_x3d.py 2011-07-28 23:22:11 UTC (rev 2194)
+++ trunk/py/scripts/addons/io_scene_x3d/export_x3d.py 2011-07-29 06:26:13 UTC (rev 2195)
@@ -218,7 +218,7 @@
return ident
def writeFooter(ident):
-
+
if use_h3d:
# global
for route in h3d_material_route:
@@ -1012,7 +1012,7 @@
value = '%.6g %.6g %.6g' % (global_matrix * lamp_obj.matrix_world).to_translation()[:]
fw('%s<field name="%s" type="SFVec3f" accessType="inputOutput" value="%s" />\n' % (ident, uniform['varname'], value))
-
+
# ------------------------------------------------------
# shader-patch
fw('%s<field name="%s_transform" type="SFMatrix4f" accessType="inputOutput" />\n' % (ident, uniform['varname']))
@@ -1022,7 +1022,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-extensions-cvs
mailing list