home/three.js
2
0
Fork 0
mirror of https://github.com/wahyd4/three.js.git synced 2026-08-17 00:45:55 +10:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote branch 'alteredq/master'

Browse Source
This commit is contained in:
Mr.doob
2010-11-11 05:28:15 +00:00
parent 237c6656f2 f9ec9325f9
commit 55baeb7ee4
2 changed files with 35 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
utils/exporters/blender/2.54/scripts/op/io_mesh_threejs/export_threejs.py
+1 -1
View File
@@ -100,7 +100,7 @@ def save(operator, context, filepath="", use_modifiers=True, use_normals=True, u
# incase
color = uvcoord = uvcoord_key = normal = normal_key = None
file.write('// Generated with Blender 2.54 exporter\n')
file.write('// Generated with Blender exporter (compatible with Blender 2.54 / 2.55)\n')
file.write('// http://github.com/mrdoob/three.js/tree/master/utils/exporters/blender\n\n')
file.write('var %s = function () {\n\n' % classname)
utils/exporters/blender/2.54/scripts/op/io_mesh_threejs_slim/export_threejs_slim.py
+34 -28
View File
@@ -55,7 +55,7 @@ TEMPLATE_FILE_ASCII = """\
// faces: %(nface)d
// materials: %(nmaterial)d
//
// Generated with Blender 2.54 slim exporter
// Generated with Blender slim exporter (compatible with Blender 2.54 / 2.55)
// https://github.com/alteredq/three.js/tree/master/utils/exporters/blender/
@@ -453,31 +453,32 @@ def extract_materials(mesh, scene):
materials = {}
for m in mesh.materials:
materials[m.name] = {}
materials[m.name]['col_diffuse'] = [m.diffuse_intensity * m.diffuse_color[0],
m.diffuse_intensity * m.diffuse_color[1],
m.diffuse_intensity * m.diffuse_color[2]]
materials[m.name]['col_specular'] = [m.specular_intensity * m.specular_color[0],
m.specular_intensity * m.specular_color[1],
m.specular_intensity * m.specular_color[2]]
materials[m.name]['col_ambient'] = [m.ambient * world.ambient_color[0],
m.ambient * world.ambient_color[1],
m.ambient * world.ambient_color[2]]
materials[m.name]['transparency'] = m.alpha
# not sure about mapping values to Blinn-Phong shader
# Blender uses INT from [1,511] with default 0
# http://www.blender.org/documentation/blender_python_api_2_54_0/bpy.types.Material.html#bpy.types.Material.specular_hardness
materials[m.name]["specular_coef"] = m.specular_hardness
if m.active_texture and m.active_texture.type == 'IMAGE':
fn = bpy.path.abspath(m.active_texture.image.filepath)
fn = os.path.normpath(fn)
fn_strip = os.path.basename(fn)
materials[m.name]['map_diffuse'] = fn_strip
if m:
materials[m.name] = {}
materials[m.name]['col_diffuse'] = [m.diffuse_intensity * m.diffuse_color[0],
m.diffuse_intensity * m.diffuse_color[1],
m.diffuse_intensity * m.diffuse_color[2]]
materials[m.name]['col_specular'] = [m.specular_intensity * m.specular_color[0],
m.specular_intensity * m.specular_color[1],
m.specular_intensity * m.specular_color[2]]
materials[m.name]['col_ambient'] = [m.ambient * world.ambient_color[0],
m.ambient * world.ambient_color[1],
m.ambient * world.ambient_color[2]]
materials[m.name]['transparency'] = m.alpha
# not sure about mapping values to Blinn-Phong shader
# Blender uses INT from [1,511] with default 0
# http://www.blender.org/documentation/blender_python_api_2_54_0/bpy.types.Material.html#bpy.types.Material.specular_hardness
materials[m.name]["specular_coef"] = m.specular_hardness
if m.active_texture and m.active_texture.type == 'IMAGE':
fn = bpy.path.abspath(m.active_texture.image.filepath)
fn = os.path.normpath(fn)
fn_strip = os.path.basename(fn)
materials[m.name]['map_diffuse'] = fn_strip
return materials
@@ -486,8 +487,13 @@ def generate_materials_string(mesh, scene):
random.seed(42) # to get well defined color order for debug materials
materials = {}
for i, m in enumerate(mesh.materials):
materials[m.name] = i
if mesh.materials:
for i, m in enumerate(mesh.materials):
if m:
materials[m.name] = i
else:
materials["undefined_dummy_%0d" % i] = i
if not materials:
materials = { 'default':0 }