[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [25333] trunk/blender/release/scripts/io: tabs 2 spaces

Campbell Barton ideasman42 at gmail.com
Sun Dec 13 15:00:39 CET 2009


Revision: 25333
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=25333
Author:   campbellbarton
Date:     2009-12-13 15:00:39 +0100 (Sun, 13 Dec 2009)

Log Message:
-----------
tabs 2 spaces

Modified Paths:
--------------
    trunk/blender/release/scripts/io/engine_render_pov.py
    trunk/blender/release/scripts/io/export_3ds.py
    trunk/blender/release/scripts/io/export_fbx.py
    trunk/blender/release/scripts/io/export_mdd.py
    trunk/blender/release/scripts/io/export_obj.py
    trunk/blender/release/scripts/io/export_ply.py
    trunk/blender/release/scripts/io/export_x3d.py
    trunk/blender/release/scripts/io/import_anim_bvh.py
    trunk/blender/release/scripts/io/import_scene_3ds.py
    trunk/blender/release/scripts/io/import_scene_obj.py

Modified: trunk/blender/release/scripts/io/engine_render_pov.py
===================================================================
--- trunk/blender/release/scripts/io/engine_render_pov.py	2009-12-13 13:59:16 UTC (rev 25332)
+++ trunk/blender/release/scripts/io/engine_render_pov.py	2009-12-13 14:00:39 UTC (rev 25333)
@@ -4,12 +4,12 @@
 #  modify it under the terms of the GNU General Public License
 #  as published by the Free Software Foundation; either version 2
 #  of the License, or (at your option) any later version.
-# 
+#
 #  This program is distributed in the hope that it will be useful,
 #  but WITHOUT ANY WARRANTY; without even the implied warranty of
 #  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 #  GNU General Public License for more details.
-# 
+#
 #  You should have received a copy of the GNU General Public License
 #  along with this program; if not, write to the Free Software Foundation,
 #  Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
@@ -27,615 +27,615 @@
 import platform as pltfrm
 
 if pltfrm.architecture()[0] == '64bit':
-	bitness = 64
+    bitness = 64
 else:
-	bitness = 32
+    bitness = 32
 
 def write_pov(filename, scene=None, info_callback = None):
-	file = open(filename, 'w')
-	
-	# Only for testing
-	if not scene:
-		scene = bpy.data.scenes[0]
-	
-	render = scene.render_data
-	world = scene.world
-	
-	# --- taken from fbx exporter 
-	## This was used to make V, but faster not to do all that
-	##valid = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_,.()[]{}'
-	##v = range(255)
-	##for c in valid: v.remove(ord(c))
-	v = [0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,42,43,46,47,58,59,60,61,62,63,64,92,94,96,124,126,127,128,129,130,131,132,133,134,135,136,137,138,139,140,141,142,143,144,145,146,147,148,149,150,151,152,153,154,155,156,157,158,159,160,161,162,163,164,165,166,167,168,169,170,171,172,173,174,175,176,177,178,179,180,181,182,183,184,185,186,187,188,189,190,191,192,193,194,195,196,197,198,199,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254]
-	invalid = ''.join([chr(i) for i in v])
-	def cleanName(name):
-		for ch in invalid:	name = name.replace(ch, '_')
-		return name
-	del v
-	
-	# --- done with clean name.
-	
-	def uniqueName(name, nameSeq):
-		
-		if name not in nameSeq:
-			return name
-		
-		name_orig = name
-		i = 1
-		while name in nameSeq:
-			name = '%s_%.3d' % (name_orig, i)
-			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]) )
-	
-	def writeObjectMaterial(material):
-		if material and material.transparency_method=='RAYTRACE':
-			file.write('\tinterior { ior %.6f }\n' % material.raytrace_transparency.ior)
-			
-			# Other interior args
-			# fade_distance 2
-			# fade_power [Value]
-			# fade_color
-			
-			# dispersion
-			# dispersion_samples
-	
-	materialNames = {}
-	DEF_MAT_NAME = 'Default'
-	def writeMaterial(material):
-		# Assumes only called once on each material
-		
-		if material:
-			name_orig = material.name
-		else:
-			name_orig = DEF_MAT_NAME
-		
-		name = materialNames[name_orig] = uniqueName(cleanName(name_orig), materialNames)
-		
-		file.write('#declare %s = finish {\n' % name)
-		
-		if material:
-			file.write('\tdiffuse %.3g\n' % material.diffuse_intensity)
-			file.write('\tspecular %.3g\n' % material.specular_intensity)
-			
-			file.write('\tambient %.3g\n' % material.ambient)
-			#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)))
-			# scale from 0.0 to 0.1
-			roughness *= 0.1
-			# add a small value because 0.0 is invalid
-			roughness += (1/511.0)
-			
-			file.write('\troughness %.3g\n' % roughness)
-			
-			# 'phong 70.0 '
-			
-			if material.raytrace_mirror.enabled:
-				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))
-					file.write('\t\tfresnel 1 falloff %.3g exponent %.3g metallic %.3g} ' % (raytrace_mirror.fresnel, raytrace_mirror.fresnel_factor, raytrace_mirror.reflect_factor))
-		
-		else:
-			file.write('\tdiffuse 0.8\n')
-			file.write('\tspecular 0.2\n')
-			
+    file = open(filename, 'w')
 
-		# This is written into the object
-		'''
-		if material and material.transparency_method=='RAYTRACE':
-			'interior { ior %.3g} ' % material.raytrace_transparency.ior
-		'''
-		
-		#file.write('\t\t\tcrand 1.0\n') # Sand granyness
-		#file.write('\t\t\tmetallic %.6f\n' % material.spec)
-		#file.write('\t\t\tphong %.6f\n' % material.spec)
-		#file.write('\t\t\tphong_size %.6f\n' % material.spec)
-		#file.write('\t\t\tbrilliance %.6f ' % (material.specular_hardness/256.0) # Like hardness
-		
-		file.write('}\n')
-	
-	def exportCamera():
-		camera = scene.camera
-		matrix = camera.matrix
-		
-		# compute resolution
-		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('\tup <0, 1, 0>\n')
-		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]))
-		file.write('}\n')
+    # Only for testing
+    if not scene:
+        scene = bpy.data.scenes[0]
 
-	def exportLamps(lamps):
-		# Get all lamps
-		for ob in lamps:
-			lamp = ob.data
-			
-			matrix = ob.matrix
-			
-			color = tuple([c * lamp.energy for c in lamp.color]) # Colour is modified by energy
-			
-			file.write('light_source {\n')
-			file.write('\t< 0,0,0 >\n')
-			file.write('\tcolor rgb<%.3g, %.3g, %.3g>\n' % color)
-			
-			if lamp.type == 'POINT': # Point Lamp 
-				pass
-			elif lamp.type == 'SPOT': # Spot
-				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)) ) 
-				
-				# Blender does not have a tightness equivilent, 0 is most like blender default.
-				file.write('\ttightness 0\n') # 0:10f
-				
-				file.write('\tpoint_at  <0, 0, -1>\n')
-			elif lamp.type == 'SUN':
-				file.write('\tparallel\n')
-				file.write('\tpoint_at  <0, 0, -1>\n') # *must* be after 'parallel'
-				
-			elif lamp.type == 'AREA':
-				
-				size_x = lamp.size
-				samples_x = lamp.shadow_ray_samples_x
-				if lamp.shape == 'SQUARE':
-					size_y = size_x
-					samples_y = samples_x
-				else:
-					size_y = lamp.size_y
-					samples_y = lamp.shadow_ray_samples_y
+    render = scene.render_data
+    world = scene.world
 
-				file.write('\tarea_light <%d,0,0>,<0,0,%d> %d, %d\n' % (size_x, size_y, samples_x, samples_y))
-				if lamp.shadow_ray_sampling_method == 'CONSTANT_JITTERED':
-					if lamp.jitter:
-						file.write('\tjitter\n')
-				else:
-					file.write('\tadaptive 1\n')
-					file.write('\tjitter\n')
-			
-			if lamp.shadow_method == 'NOSHADOW':
-				file.write('\tshadowless\n')	
-			
-			file.write('\tfade_distance %.6f\n' % lamp.distance)
-			file.write('\tfade_power %d\n' % 1) # Could use blenders lamp quad?
-			writeMatrix(matrix)
-			
-			file.write('}\n')
-	
-	def exportMeta(metas):
-		
-		# TODO - blenders 'motherball' naming is not supported.
-		
-		for ob in metas:
-			meta = ob.data
-			
-			file.write('blob {\n')
-			file.write('\t\tthreshold %.4g\n' % meta.threshold)
-			
-			try:
-				material= meta.materials[0] # lame! - blender cant do enything else.
-			except:
-				material= None
-			
-			for elem in meta.elements:
-				
-				if elem.type not in ('BALL', 'ELLIPSOID'):
-					continue # Not supported
-				
-				loc = elem.location
-				
-				stiffness= elem.stiffness
-				if elem.negative:
-					stiffness = -stiffness
-				
-				if elem.type == 'BALL':
-					
-					file.write('\tsphere { <%.6g, %.6g, %.6g>, %.4g, %.4g ' % (loc.x, loc.y, loc.z, elem.radius, stiffness))
-					
-					# After this wecould do something simple like...
-					# 	"pigment {Blue} }"
-					# except we'll write the color
-				
-				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))
-				
-				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
-					
-					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])
-					)
-					
-				else:
-					file.write('pigment {rgb<1 1 1>} finish {%s} }\n' % DEF_MAT_NAME)		# Write the finish last.
-			
-			writeObjectMaterial(material)
+    # --- taken from fbx exporter
+    ## This was used to make V, but faster not to do all that
+    ##valid = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789-_,.()[]{}'
+    ##v = range(255)
+    ##for c in valid: v.remove(ord(c))

@@ Diff output truncated at 10240 characters. @@




More information about the Bf-blender-cvs mailing list