From 4b99e61cf2a94c59fb7f1cc1d6520bfd814af301 Mon Sep 17 00:00:00 2001 From: Willian Padovani Germano Date: Mon, 30 May 2005 02:26:40 +0000 Subject: No "release ahoy" yet, so it's probably still ok for these last minute updates (excuse me anyway): Script bug fixes: - Paths import: SVG update sent by author Jean-Michel Soler; - Wavefront OBJ import / export updates sent by author Campbell Barton. --- release/scripts/bpymodules/svg2obj.py | 27 ++++++--- release/scripts/obj_export.py | 100 ++++++++++------------------------ release/scripts/obj_import.py | 82 ++++++++++++++++------------ 3 files changed, 96 insertions(+), 113 deletions(-) (limited to 'release') diff --git a/release/scripts/bpymodules/svg2obj.py b/release/scripts/bpymodules/svg2obj.py index 7445b13a4a7..e7837b9bb15 100644 --- a/release/scripts/bpymodules/svg2obj.py +++ b/release/scripts/bpymodules/svg2obj.py @@ -1,7 +1,7 @@ """ -SVG 2 OBJ translater, 0.2.6 +SVG 2 OBJ translater, 0.2.7 (c) jm soler juillet/novembre 2004, released under Blender Artistic Licence - for the Blender 2.34/35 Python Scripts Bundle. + for the Blender 2.34/33 Python Scripts Bundle. #--------------------------------------------------------------------------- # Page officielle : # http://jmsoler.free.fr/didacticiel/blender/tutor/cpl_import_svg.htm @@ -56,7 +56,8 @@ Changelog: 0.2.4 : - better hash for command with followed by a lone data (h,v) or uncommun number (a) 0.2.5 : - correction for gimp import - 0.2.6 : - correction for illustrator 10 SVG + 0.2.6 : - correction for illustrator 10 SVG + 0.2.7 : - correction for inskape 0.40 cvs SVG ================================================================================== ==================================================================================""" @@ -118,11 +119,11 @@ def filtreFICHIER(nom): t=t.replace('\n','') if t.upper().find('Export" menu to export all meshes. # New name based on old with a different extension # #==================================================# def newFName(ext): - return Get('filename')[: -len(Get('filename').split('.', -1)[-1]) ] + ext - - -#===============================================# -# Strips the slashes from the front of a string # -#===============================================# -def stripPath(path): - for CH in range(len(path), 0, -1): - if path[CH-1] == "/" or path[CH-1] == "\\": - path = path[CH:] - break - return path - -#==================# -# Apply Transform # -#==================# -def apply_transform(vert, matrix_4x4): - vertCopy = Mathutils.CopyVec(vert) - vertCopy.resize4D() - return Mathutils.VecMultMat(vertCopy, matrix_4x4) - -#=================================# -# Apply Transform (normal vector) # -#=================================# -def apply_normal_transform(norm, matrix_3x3): - vertCopy = Mathutils.CopyVec(norm) - vertCopy.resize3D() - return Mathutils.VecMultMat(vertCopy, matrix_3x3) + return Get('filename')[: -len(Get('filename').split('.', -1)[-1]) ] + ext + from Blender import * NULL_MAT = '(null)' -NULL_IMG = '(null)' +NULL_IMG = '(null)' # from docs at http://astronomy.swin.edu.au/~pbourke/geomformats/obj/ also could be 'off' def save_mtl(filename): file = open(filename, "w") @@ -117,8 +91,9 @@ def save_mtl(filename): def save_obj(filename): time1 = sys.time() + scn = Scene.GetCurrent() # First output all material - mtlfilename = filename[:-4] + '.mtl' + mtlfilename = '%s.mtl' % '.'.join(filename.split('.')[:-1]) save_mtl(mtlfilename) file = open(filename, "w") @@ -128,63 +103,48 @@ def save_obj(filename): file.write('# www.blender.org\n') # Tell the obj file what material file to use. - file.write('mtllib %s\n' % (stripPath(mtlfilename))) + file.write('mtllib %s\n' % ( mtlfilename.split('\\')[-1].split('/')[-1] )) # Initialize totals, these are updated each object totverts = totuvco = 0 - + # Get all meshs - for ob in Object.Get(): + for ob in scn.getChildren(): if ob.getType() != 'Mesh': continue m = NMesh.GetRawFromObject(ob.name) - - # remove any edges, is not written back to the mesh so its not going to - # modify the open file. - for f in m.faces: - if len(f.v) < 3: - m.faces.remove(f) - - if len(m.faces) == 0: # Make sure there is somthing to write. + m.transform(ob.matrix) + + if not m.faces: # Make sure there is somthing to write continue #dont bother with this mesh. - + # Set the default mat currentMatName = NULL_MAT currentImgName = NULL_IMG - - #file.write('o ' + ob.getName() + '_' + m.name + '\n') # Write Object name + file.write('o %s_%s\n' % (ob.getName(), m.name)) # Write Object name - - # Works 100% Yay - matrix_4x4 = ob.getMatrix('worldspace') - - # matrix for transformation of normal vectors - matrix_3x3 = Mathutils.Matrix([matrix_4x4[0][0], matrix_4x4[0][1], matrix_4x4[0][2]], - [matrix_4x4[1][0], matrix_4x4[1][1], matrix_4x4[1][2]], - [matrix_4x4[2][0], matrix_4x4[2][1], matrix_4x4[2][2]]) - + # Vert for v in m.verts: - # Transform the vert - vTx = apply_transform(v.co, matrix_4x4) - file.write('v %s %s %s\n' % (vTx[0], vTx[1], vTx[2])) - + file.write('v %s %s %s\n' % (v.co.x, v.co.y, v.co.z)) + # UV for f in m.faces: + ''' # Export edges? + if len(f.v) < 3: + continue + ''' for uvIdx in range(len(f.v)): if f.uv: file.write('vt %s %s 0.0\n' % (f.uv[uvIdx][0], f.uv[uvIdx][1])) else: file.write('vt 0.0 0.0 0.0\n') - + # NORMAL for f1 in m.faces: for v in f1.v: - # Transform the normal - noTx = apply_normal_transform(v.no, matrix_3x3) - noTx.normalize() - file.write('vn %s %s %s\n' % (noTx[0], noTx[1], noTx[2])) - + file.write('vn %s %s %s\n' % (v.no.x, v.no.y, v.no.z)) + uvIdx = 0 for f in m.faces: # Check material and change if needed. @@ -192,23 +152,23 @@ def save_obj(filename): if currentMatName != m.materials[f.mat].getName(): currentMatName = m.materials[f.mat].getName() file.write('usemtl %s\n' % (currentMatName)) - + elif currentMatName != NULL_MAT: currentMatName = NULL_MAT file.write('usemtl %s\n' % (currentMatName)) - + # UV IMAGE # If the face uses a different image from the one last set then add a usemap line. if f.image: if f.image.filename != currentImgName: currentImgName = f.image.filename # Set a new image for all following faces - file.write( 'usemat %s\n' % (stripPath(currentImgName))) - + file.write( 'usemapusemap %s\n' % currentImgName.split('\\')[-1].split('/')[-1] ) + elif currentImgName != NULL_IMG: # Not using an image so set to NULL_IMG currentImgName = NULL_IMG # Set a new image for all following faces - file.write( 'usemat %s\n' % (stripPath(currentImgName))) + file.write( 'usemap %s\n' % currentImgName) # No splitting needed. file.write('f ') for v in f.v: @@ -216,7 +176,7 @@ def save_obj(filename): uvIdx+=1 file.write('\n') - + # Make the indicies global rather then per mesh totverts += len(m.verts) totuvco += uvIdx diff --git a/release/scripts/obj_import.py b/release/scripts/obj_import.py index 2750625fd81..2913cc015ec 100644 --- a/release/scripts/obj_import.py +++ b/release/scripts/obj_import.py @@ -2,7 +2,7 @@ """ Name: 'Wavefront (.obj)...' -Blender: 232 +Blender: 237 Group: 'Import' Tooltip: 'Load a Wavefront OBJ File' """ @@ -65,11 +65,7 @@ def pathName(path,name): # Strips the slashes from the back of a string # #==============================================# def stripPath(path): - for CH in range(len(path), 0, -1): - if path[CH-1] == "/" or path[CH-1] == "\\": - path = path[CH:] - break - return path + return path.split('/')[-1].split('\\')[-1] #====================================================# # Strips the prefix off the name before writing # @@ -146,7 +142,7 @@ def load_mat_image(mat, img_fileName, type, mesh): #==================================================================================# def load_mtl(dir, mtl_file, mesh): # Remove ./ - if mtl_file[:2] == './': + if mtl_file.endswith('./'): mtl_file= mtl_file[2:] mtl_fileName = dir + mtl_file @@ -190,22 +186,22 @@ def load_mtl(dir, mtl_file, mesh): load_mat_image(currentMat, img_fileName, 'Kd', mesh) lIdx+=1 -#======================================================================# -# Returns unique name of object (preserve overwriting existing meshes) # -#======================================================================# +#===========================================================================# +# Returns unique name of object/mesh (preserve overwriting existing meshes) # +#===========================================================================# def getUniqueName(name): uniqueInt = 0 while 1: try: ob = Object.Get(name) # Okay, this is working, so lets make a new name - name += '.' + str(uniqueInt) + name = '%s.%d' % (name, uniqueInt) uniqueInt +=1 except: - if NMesh.GetRaw(name) == None: + if name not in NMesh.GetNames(): return name else: - name += '.' + str(uniqueInt) + name = '%s.%d' % (name, uniqueInt) uniqueInt +=1 #==================================================================================# @@ -246,7 +242,7 @@ def load_obj(file): # This dummy vert makes life a whole lot easier- # pythons index system then aligns with objs, remove later - vertList = [NMesh.Vert(0, 0, 0)] # store tuple uv pairs here + vertList = [NMesh.Vert(0, 0, 0)] nullMat = getMat(NULL_MAT) @@ -266,7 +262,7 @@ def load_obj(file): # Load all verts first (texture verts too) # #==================================================================================# lIdx = 0 - print len(fileLines) + print 'file length: %d' % len(fileLines) while lIdx < len(fileLines): l = fileLines[lIdx] @@ -442,7 +438,7 @@ def load_obj(file): unique_count = 0 while newObjectName in meshList.keys(): - newObjectName = l[0] + '_' + str(unique_count) + newObjectName = '%s_%d' % (l[0], unique_count) unique_count +=1 else: # The the object/group name given newObjectName += '_'.join(l[1:]) @@ -460,17 +456,17 @@ def load_obj(file): # MATERIAL elif l[0] == 'usemtl': - if l[1] == '(null)': + if len(l) == 1 or l[1] == '(null)': currentMat = getMat(NULL_MAT) else: currentMat = getMat(' '.join(l[1:])) # Use join in case of spaces # MATERIAL - elif l[0] == 'usemat': - if l[1] == '(null)': + elif l[0] == 'usemat' or l[0] == 'usemap': + if len(l) == 1 or l[1] == '(null)' or l[1] == 'off': currentImg = NULL_IMG else: - currentImg = getImg(DIR + ' '.join(l[1:])) # Use join in case of spaces + currentImg = getImg('%s%s' % (DIR, ' '.join(l[1:]).replace('./', '') ) ) # Use join in case of spaces # MATERIAL FILE elif l[0] == 'mtllib': @@ -481,29 +477,43 @@ def load_obj(file): #==============================================# # Write all meshs in the dictionary # - #==============================================# + #==============================================# + for ob in Scene.GetCurrent().getChildren(): # Deselect all + ob.sel = 0 + + importedObjects = [] for mk in meshList.keys(): # Applies material properties to materials alredy on the mesh as well as Textures. if mtl_fileName != '': load_mtl(DIR, mtl_fileName, meshList[mk][0]) - if len(meshList[mk][0].verts) >1: - meshList[mk][0].verts.pop(0) - - name = getUniqueName(mk) - ob = NMesh.PutRaw(meshList[mk][0], name) - ob.name = name + + meshList[mk][0].verts.pop(0) + + # Ignore no vert meshes. + if not meshList[mk][0].verts: + continue + + name = getUniqueName(mk) + ob = NMesh.PutRaw(meshList[mk][0], name) + ob.name = name + + importedObjects.append(ob) + + # Select all imported objects. + for ob in importedObjects: + ob.sel = 1 print "obj import time: ", sys.time() - time1 Window.FileSelector(load_obj, 'Import Wavefront OBJ') - +''' # For testing compatibility -#import os -#for obj in os.listdir('/obj/'): -# if obj[-3:] == 'obj': -# print obj -# newScn = Scene.New(obj) -# newScn.makeCurrent() -# load_obj('/obj/' + obj) - +import os +for obj in os.listdir('/obj/'): + if obj.lower().endswith('obj'): + print obj + newScn = Scene.New(obj) + newScn.makeCurrent() + load_obj('/obj/' + obj) +''' -- cgit v1.2.3