[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25347] trunk/blender/release/scripts: pep8 warnings, remove unused imports
Campbell Barton
ideasman42 at gmail.com
Sun Dec 13 23:48:11 CET 2009
Revision: 25347
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25347
Author: campbellbarton
Date: 2009-12-13 23:48:11 +0100 (Sun, 13 Dec 2009)
Log Message:
-----------
pep8 warnings, remove unused imports
Modified Paths:
--------------
trunk/blender/release/scripts/io/engine_render_pov.py
trunk/blender/release/scripts/io/export_fbx.py
trunk/blender/release/scripts/io/export_mdd.py
trunk/blender/release/scripts/modules/rigify/copy.py
trunk/blender/release/scripts/modules/rigify/finger_curl.py
trunk/blender/release/scripts/op/console_shell.py
trunk/blender/release/scripts/op/mesh.py
trunk/blender/release/scripts/op/uvcalc_smart_project.py
trunk/blender/release/scripts/op/vertexpaint_dirt.py
trunk/blender/release/scripts/op/wm.py
Modified: trunk/blender/release/scripts/io/engine_render_pov.py
===================================================================
--- trunk/blender/release/scripts/io/engine_render_pov.py 2009-12-13 22:24:30 UTC (rev 25346)
+++ trunk/blender/release/scripts/io/engine_render_pov.py 2009-12-13 22:48:11 UTC (rev 25347)
@@ -33,7 +33,8 @@
else:
bitness = 32
-def write_pov(filename, scene=None, info_callback = None):
+
+def write_pov(filename, scene=None, info_callback=None):
file = open(filename, 'w')
# Only for testing
@@ -52,17 +53,16 @@
i = 1
while name in nameSeq:
name = '%s_%.3d' % (name_orig, i)
- i+=1
+ i += 1
return name
-
def writeMatrix(matrix):
file.write('\tmatrix <%.6f, %.6f, %.6f, %.6f, %.6f, %.6f, %.6f, %.6f, %.6f, %.6f, %.6f, %.6f>\n' %\
- (matrix[0][0], matrix[0][1], matrix[0][2], matrix[1][0], matrix[1][1], matrix[1][2], matrix[2][0], matrix[2][1], matrix[2][2], matrix[3][0], matrix[3][1], matrix[3][2]) )
+ (matrix[0][0], matrix[0][1], matrix[0][2], matrix[1][0], matrix[1][1], matrix[1][2], matrix[2][0], matrix[2][1], matrix[2][2], matrix[3][0], matrix[3][1], matrix[3][2]))
def writeObjectMaterial(material):
- if material and material.transparency_method=='RAYTRACE':
+ if material and material.transparency_method == 'RAYTRACE':
file.write('\tinterior { ior %.6f }\n' % material.raytrace_transparency.ior)
# Other interior args
@@ -75,6 +75,7 @@
materialNames = {}
DEF_MAT_NAME = 'Default'
+
def writeMaterial(material):
# Assumes only called once on each material
@@ -95,18 +96,18 @@
#file.write('\tambient rgb <%.3g, %.3g, %.3g>\n' % tuple([c*material.ambient for c in world.ambient_color])) # povray blends the global value
# map hardness between 0.0 and 1.0
- roughness = ((1.0 - ((material.specular_hardness-1.0)/510.0)))
+ roughness = ((1.0 - ((material.specular_hardness - 1.0) / 510.0)))
# scale from 0.0 to 0.1
roughness *= 0.1
# add a small value because 0.0 is invalid
- roughness += (1/511.0)
+ roughness += (1 / 511.0)
file.write('\troughness %.3g\n' % roughness)
# 'phong 70.0 '
if material.raytrace_mirror.enabled:
- raytrace_mirror= material.raytrace_mirror
+ raytrace_mirror = material.raytrace_mirror
if raytrace_mirror.reflect_factor:
file.write('\treflection {\n')
file.write('\t\trgb <%.3g, %.3g, %.3g>' % tuple(material.mirror_color))
@@ -136,14 +137,14 @@
matrix = camera.matrix
# compute resolution
- Qsize=float(render.resolution_x)/float(render.resolution_y)
+ Qsize = float(render.resolution_x) / float(render.resolution_y)
file.write('camera {\n')
file.write('\tlocation <0, 0, 0>\n')
file.write('\tlook_at <0, 0, -1>\n')
- file.write('\tright <%s, 0, 0>\n' % -Qsize)
+ file.write('\tright <%s, 0, 0>\n' % - Qsize)
file.write('\tup <0, 1, 0>\n')
- file.write('\tangle %f \n' % (360.0*atan(16.0/camera.data.lens)/pi))
+ file.write('\tangle %f \n' % (360.0 * atan(16.0 / camera.data.lens) / pi))
file.write('\trotate <%.6f, %.6f, %.6f>\n' % tuple([degrees(e) for e in matrix.rotationPart().toEuler()]))
file.write('\ttranslate <%.6f, %.6f, %.6f>\n' % (matrix[3][0], matrix[3][1], matrix[3][2]))
@@ -168,8 +169,8 @@
file.write('\tspotlight\n')
# Falloff is the main radius from the centre line
- file.write('\tfalloff %.2f\n' % (lamp.spot_size/2.0) ) # 1 TO 179 FOR BOTH
- file.write('\tradius %.6f\n' % ((lamp.spot_size/2.0) * (1-lamp.spot_blend)) )
+ file.write('\tfalloff %.2f\n' % (lamp.spot_size / 2.0)) # 1 TO 179 FOR BOTH
+ file.write('\tradius %.6f\n' % ((lamp.spot_size / 2.0) * (1.0 - lamp.spot_blend)))
# Blender does not have a tightness equivilent, 0 is most like blender default.
file.write('\ttightness 0\n') # 0:10f
@@ -218,9 +219,9 @@
file.write('\t\tthreshold %.4g\n' % meta.threshold)
try:
- material= meta.materials[0] # lame! - blender cant do enything else.
+ material = meta.materials[0] # lame! - blender cant do enything else.
except:
- material= None
+ material = None
for elem in meta.elements:
@@ -229,9 +230,9 @@
loc = elem.location
- stiffness= elem.stiffness
+ stiffness = elem.stiffness
if elem.negative:
- stiffness = -stiffness
+ stiffness = - stiffness
if elem.type == 'BALL':
@@ -243,19 +244,19 @@
elif elem.type == 'ELLIPSOID':
# location is modified by scale
- file.write('\tsphere { <%.6g, %.6g, %.6g>, %.4g, %.4g ' % (loc.x/elem.size_x, loc.y/elem.size_y, loc.z/elem.size_z, elem.radius, stiffness))
- file.write( 'scale <%.6g, %.6g, %.6g> ' % (elem.size_x, elem.size_y, elem.size_z))
+ file.write('\tsphere { <%.6g, %.6g, %.6g>, %.4g, %.4g ' % (loc.x / elem.size_x, loc.y / elem.size_y, loc.z / elem.size_z, elem.radius, stiffness))
+ file.write('scale <%.6g, %.6g, %.6g> ' % (elem.size_x, elem.size_y, elem.size_z))
if material:
diffuse_color = material.diffuse_color
- if material.transparency and material.transparency_method=='RAYTRACE': trans = 1-material.raytrace_transparency.filter
- else: trans = 0.0
+ if material.transparency and material.transparency_method == 'RAYTRACE':
+ trans = 1.0 - material.raytrace_transparency.filter
+ else:
+ trans = 0.0
- file.write(
- 'pigment {rgbft<%.3g, %.3g, %.3g, %.3g, %.3g>} finish {%s} }\n' % \
- (diffuse_color[0], diffuse_color[1], diffuse_color[2], 1-material.alpha, trans, materialNames[material.name])
- )
+ file.write('pigment {rgbft<%.3g, %.3g, %.3g, %.3g, %.3g>} finish {%s} }\n' % \
+ (diffuse_color[0], diffuse_color[1], diffuse_color[2], 1.0 - material.alpha, trans, materialNames[material.name]))
else:
file.write('pigment {rgb<1 1 1>} finish {%s} }\n' % DEF_MAT_NAME) # Write the finish last.
@@ -271,13 +272,13 @@
ob_num = 0
for ob in sel:
- ob_num+= 1
+ ob_num += 1
if ob.type in ('LAMP', 'CAMERA', 'EMPTY', 'META', 'ARMATURE'):
continue
me = ob.data
- me_materials= me.materials
+ me_materials = me.materials
me = ob.create_mesh(True, 'RENDER')
@@ -292,18 +293,22 @@
# me = ob.data
matrix = ob.matrix
- try: uv_layer = me.active_uv_texture.data
- except:uv_layer = None
+ try:
+ uv_layer = me.active_uv_texture.data
+ except:
+ uv_layer = None
- try: vcol_layer = me.active_vertex_color.data
- except:vcol_layer = None
+ try:
+ vcol_layer = me.active_vertex_color.data
+ except:
+ vcol_layer = None
faces_verts = [f.verts for f in me.faces]
faces_normals = [tuple(f.normal) for f in me.faces]
verts_normals = [tuple(v.normal) for v in me.verts]
# quads incur an extra face
- quadCount = len([f for f in faces_verts if len(f)==4])
+ quadCount = len([f for f in faces_verts if len(f) == 4])
file.write('mesh2 {\n')
file.write('\tvertex_vectors {\n')
@@ -332,7 +337,7 @@
for no, index in uniqueNormals.items():
file.write(',\n\t\t<%.6f, %.6f, %.6f>' % no) # vert count
index[0] = idx
- idx +=1
+ idx += 1
file.write('\n }\n')
@@ -345,7 +350,7 @@
for fi, uv in enumerate(uv_layer):
- if len(faces_verts[fi])==4:
+ if len(faces_verts[fi]) == 4:
uvs = uv.uv1, uv.uv2, uv.uv3, uv.uv4
else:
uvs = uv.uv1, uv.uv2, uv.uv3
@@ -360,7 +365,7 @@
for uv, index in uniqueUVs.items():
file.write(',\n\t\t<%.6f, %.6f>' % uv)
index[0] = idx
- idx +=1
+ idx += 1
'''
else:
# Just add 1 dummy vector, no real UV's
@@ -380,7 +385,7 @@
col = vcol_layer[fi]
- if len(faces_verts[fi])==4:
+ if len(faces_verts[fi]) == 4:
cols = col.color1, col.color2, col.color3, col.color4
else:
cols = col.color1, col.color2, col.color3
@@ -409,37 +414,41 @@
# Vert Colours
file.write('\ttexture_list {\n')
file.write('\t\t%s' % (len(vertCols))) # vert count
- idx=0
+ idx = 0
for col, index in vertCols.items():
if me_materials:
material = me_materials[col[3]]
material_finish = materialNames[material.name]
- if material.transparency and material.transparency_method=='RAYTRACE': trans = 1-material.raytrace_transparency.filter
- else: trans = 0.0
+ if material.transparency and material.transparency_method == 'RAYTRACE':
+ trans = 1.0 - material.raytrace_transparency.filter
+ else:
+ trans = 0.0
else:
material_finish = DEF_MAT_NAME # not working properly,
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list