mirror of
https://github.com/wahyd4/three.js.git
synced 2026-08-09 04:56:01 +10:00
Merge remote branch 'alteredq/master'
This commit is contained in:
Mr.doob
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
+115
-55
@@ -50,12 +50,14 @@ THREE.Loader.prototype = {
|
||||
|
||||
function init_vertices() {
|
||||
|
||||
var i, l, d;
|
||||
var i, l, x, y, z;
|
||||
|
||||
for( i = 0, l = data.vertices.length; i < l; i++ ) {
|
||||
for( i = 0, l = data.vertices.length/3; i < l; i++ ) {
|
||||
|
||||
d = data.vertices[i];
|
||||
v( d[0], d[1], d[2] );
|
||||
x = data.vertices[ i*3 ];
|
||||
y = data.vertices[ i*3 + 1 ];
|
||||
z = data.vertices[ i*3 + 2 ];
|
||||
v( x, y, z );
|
||||
|
||||
}
|
||||
|
||||
@@ -63,51 +65,104 @@ THREE.Loader.prototype = {
|
||||
|
||||
function init_uvs() {
|
||||
|
||||
var i, l, d;
|
||||
var i, l, d, ua, ub, uc, ud, va, vb, vc, vd;
|
||||
|
||||
for( i = 0, l = data.uvs.length; i < l; i++ ) {
|
||||
for( i = 0, l = data.uvs_tri.length; i < l; i++ ) {
|
||||
|
||||
d = data.uvs[i];
|
||||
if ( d.length == 6 ) {
|
||||
|
||||
uv( d[0], d[1], d[2], d[3], d[4], d[5] );
|
||||
|
||||
} else if ( d.length == 8 ) {
|
||||
ua = data.uvs_tri[ i*6 ];
|
||||
va = data.uvs_tri[ i*6 + 1 ];
|
||||
|
||||
uv( d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7] );
|
||||
ub = data.uvs_tri[ i*6 + 2 ];
|
||||
vb = data.uvs_tri[ i*6 + 3 ];
|
||||
|
||||
}
|
||||
|
||||
uc = data.uvs_tri[ i*6 + 4 ];
|
||||
vc = data.uvs_tri[ i*6 + 5 ];
|
||||
|
||||
uv( ua, va, ub, vb, uc, vc );
|
||||
|
||||
}
|
||||
|
||||
for( i = 0, l = data.uvs_quad.length; i < l; i++ ) {
|
||||
|
||||
ua = data.uvs_quad[ i*8 ];
|
||||
va = data.uvs_quad[ i*8 + 1 ];
|
||||
|
||||
ub = data.uvs_quad[ i*8 + 2 ];
|
||||
vb = data.uvs_quad[ i*8 + 3 ];
|
||||
|
||||
uc = data.uvs_quad[ i*8 + 4 ];
|
||||
vc = data.uvs_quad[ i*8 + 5 ];
|
||||
|
||||
ud = data.uvs_quad[ i*8 + 6 ];
|
||||
vd = data.uvs_quad[ i*8 + 7 ];
|
||||
|
||||
uv( ua, va, ub, vb, uc, vc, ud, vd );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function init_faces() {
|
||||
|
||||
var i, l, d;
|
||||
var i, l, a, b, c, d, m, na, nb, nc, nd;
|
||||
|
||||
for( i = 0, l = data.triangles.length/4; i < l; i++ ) {
|
||||
|
||||
a = data.triangles[ i*4 ];
|
||||
b = data.triangles[ i*4 + 1 ];
|
||||
c = data.triangles[ i*4 + 2 ];
|
||||
|
||||
m = data.triangles[ i*4 + 3 ];
|
||||
|
||||
f3( a, b, c, m );
|
||||
|
||||
for( i = 0, l = data.faces.length; i < l; i++ ) {
|
||||
}
|
||||
|
||||
for( i = 0, l = data.triangles_n.length/7; i < l; i++ ) {
|
||||
|
||||
d = data.faces[i];
|
||||
a = data.triangles_n[ i*7 ];
|
||||
b = data.triangles_n[ i*7 + 1 ];
|
||||
c = data.triangles_n[ i*7 + 2 ];
|
||||
|
||||
if ( d.length == 4 ) {
|
||||
|
||||
f3( d[0], d[1], d[2], d[3] );
|
||||
|
||||
} else if ( d.length == 5 ) {
|
||||
m = data.triangles_n[ i*7 + 3 ];
|
||||
|
||||
f4( d[0], d[1], d[2], d[3], d[4] );
|
||||
na = data.triangles_n[ i*7 + 4 ];
|
||||
nb = data.triangles_n[ i*7 + 5 ];
|
||||
nc = data.triangles_n[ i*7 + 6 ];
|
||||
|
||||
} else if ( d.length == 7 ) {
|
||||
f3n( a, b, c, m, na, nb, nc );
|
||||
|
||||
}
|
||||
|
||||
for( i = 0, l = data.quads.length/5; i < l; i++ ) {
|
||||
|
||||
f3n( d[0], d[1], d[2], d[3], d[4], d[5], d[6] );
|
||||
a = data.quads[ i*5 ];
|
||||
b = data.quads[ i*5 + 1 ];
|
||||
c = data.quads[ i*5 + 2 ];
|
||||
d = data.quads[ i*5 + 3 ];
|
||||
|
||||
} else if ( d.length == 9 ) {
|
||||
m = data.quads[ i*5 + 4 ];
|
||||
|
||||
f4n( d[0], d[1], d[2], d[3], d[4], d[5], d[6], d[7], d[8] );
|
||||
f4( a, b, c, d, m );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
for( i = 0, l = data.quads_n.length/9; i < l; i++ ) {
|
||||
|
||||
a = data.quads_n[ i*9 ];
|
||||
b = data.quads_n[ i*9 + 1 ];
|
||||
c = data.quads_n[ i*9 + 2 ];
|
||||
d = data.quads_n[ i*9 + 3 ];
|
||||
|
||||
m = data.quads_n[ i*9 + 4 ];
|
||||
|
||||
na = data.quads_n[ i*9 + 5 ];
|
||||
nb = data.quads_n[ i*9 + 6 ];
|
||||
nc = data.quads_n[ i*9 + 7 ];
|
||||
nd = data.quads_n[ i*9 + 8 ];
|
||||
|
||||
f4n( a, b, c, d, m, na, nb, nc, nd );
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
@@ -132,43 +187,48 @@ THREE.Loader.prototype = {
|
||||
|
||||
}
|
||||
|
||||
function f3n( a, b, c, mi, n1, n2, n3 ) {
|
||||
function f3n( a, b, c, mi, na, nb, nc ) {
|
||||
|
||||
var material = scope.materials[ mi ],
|
||||
n1x = data.normals[n1][0],
|
||||
n1y = data.normals[n1][1],
|
||||
n1z = data.normals[n1][2],
|
||||
n2x = data.normals[n2][0],
|
||||
n2y = data.normals[n2][1],
|
||||
n2z = data.normals[n2][2],
|
||||
n3x = data.normals[n3][0],
|
||||
n3y = data.normals[n3][1],
|
||||
n3z = data.normals[n3][2];
|
||||
nax = data.normals[ na*3 ],
|
||||
nay = data.normals[ na*3 + 1 ],
|
||||
naz = data.normals[ na*3 + 2 ],
|
||||
|
||||
nbx = data.normals[ nb*3 ],
|
||||
nby = data.normals[ nb*3 + 1 ],
|
||||
nbz = data.normals[ nb*3 + 2 ],
|
||||
|
||||
ncx = data.normals[ nc*3 ],
|
||||
ncy = data.normals[ nc*3 + 1 ],
|
||||
ncz = data.normals[ nc*3 + 2 ];
|
||||
|
||||
scope.faces.push( new THREE.Face3( a, b, c,
|
||||
[new THREE.Vector3( n1x, n1y, n1z ), new THREE.Vector3( n2x, n2y, n2z ), new THREE.Vector3( n3x, n3y, n3z )],
|
||||
[new THREE.Vector3( nax, nay, naz ), new THREE.Vector3( nbx, nby, nbz ), new THREE.Vector3( ncx, ncy, ncz )],
|
||||
material ) );
|
||||
|
||||
}
|
||||
|
||||
function f4n( a, b, c, d, mi, n1, n2, n3, n4 ) {
|
||||
function f4n( a, b, c, d, mi, na, nb, nc, nd ) {
|
||||
|
||||
var material = scope.materials[ mi ],
|
||||
n1x = data.normals[n1][0],
|
||||
n1y = data.normals[n1][1],
|
||||
n1z = data.normals[n1][2],
|
||||
n2x = data.normals[n2][0],
|
||||
n2y = data.normals[n2][1],
|
||||
n2z = data.normals[n2][2],
|
||||
n3x = data.normals[n3][0],
|
||||
n3y = data.normals[n3][1],
|
||||
n3z = data.normals[n3][2],
|
||||
n4x = data.normals[n4][0],
|
||||
n4y = data.normals[n4][1],
|
||||
n4z = data.normals[n4][2];
|
||||
nax = data.normals[ na*3 ],
|
||||
nay = data.normals[ na*3 + 1 ],
|
||||
naz = data.normals[ na*3 + 2 ],
|
||||
|
||||
nbx = data.normals[ nb*3 ],
|
||||
nby = data.normals[ nb*3 + 1 ],
|
||||
nbz = data.normals[ nb*3 + 2 ],
|
||||
|
||||
ncx = data.normals[ nc*3 ],
|
||||
ncy = data.normals[ nc*3 + 1 ],
|
||||
ncz = data.normals[ nc*3 + 2 ],
|
||||
|
||||
ndx = data.normals[ nd*3 ],
|
||||
ndy = data.normals[ nd*3 + 1 ],
|
||||
ndz = data.normals[ nd*3 + 2 ];
|
||||
|
||||
scope.faces.push( new THREE.Face4( a, b, c, d,
|
||||
[new THREE.Vector3( n1x, n1y, n1z ), new THREE.Vector3( n2x, n2y, n2z ), new THREE.Vector3( n3x, n3y, n3z ), new THREE.Vector3( n4x, n4y, n4z )],
|
||||
[new THREE.Vector3( nax, nay, naz ), new THREE.Vector3( nbx, nby, nbz ), new THREE.Vector3( ncx, ncy, ncz ), new THREE.Vector3( ndx, ndy, ndz )],
|
||||
material ) );
|
||||
|
||||
}
|
||||
|
||||
@@ -143,28 +143,33 @@ var model = {
|
||||
|
||||
'vertices': [%(vertices)s],
|
||||
|
||||
'uvs': [%(uvs)s],
|
||||
'uvs_tri': [%(uvs_tri)s],
|
||||
'uvs_quad': [%(uvs_quad)s],
|
||||
|
||||
'triangles': [%(triangles)s],
|
||||
'triangles_n': [%(triangles_n)s],
|
||||
|
||||
'quads': [%(quads)s],
|
||||
'quads_n': [%(quads_n)s],
|
||||
|
||||
'faces': [%(faces)s],
|
||||
|
||||
'end': (new Date).getTime()
|
||||
}
|
||||
|
||||
postMessage( model );
|
||||
"""
|
||||
|
||||
TEMPLATE_VERTEX = "[%f,%f,%f]"
|
||||
TEMPLATE_VERTEX = "%f,%f,%f"
|
||||
|
||||
TEMPLATE_UV3 = "[%f,%f,%f,%f,%f,%f]"
|
||||
TEMPLATE_UV4 = "[%f,%f,%f,%f,%f,%f,%f,%f]"
|
||||
TEMPLATE_UV_TRI = "%f,%f,%f,%f,%f,%f"
|
||||
TEMPLATE_UV_QUAD = "%f,%f,%f,%f,%f,%f,%f,%f"
|
||||
|
||||
TEMPLATE_FACE3 = "[%d,%d,%d,%d]"
|
||||
TEMPLATE_FACE4 = "[%d,%d,%d,%d,%d]"
|
||||
TEMPLATE_TRI = "%d,%d,%d,%d"
|
||||
TEMPLATE_QUAD = "%d,%d,%d,%d,%d"
|
||||
|
||||
TEMPLATE_FACE3N = "[%d,%d,%d,%d,%d,%d,%d]"
|
||||
TEMPLATE_FACE4N = "[%d,%d,%d,%d,%d,%d,%d,%d,%d]"
|
||||
TEMPLATE_TRI_N = "%d,%d,%d,%d,%d,%d,%d"
|
||||
TEMPLATE_QUAD_N = "%d,%d,%d,%d,%d,%d,%d,%d,%d"
|
||||
|
||||
TEMPLATE_N = "[%f,%f,%f]"
|
||||
TEMPLATE_N = "%f,%f,%f"
|
||||
|
||||
# #####################################################
|
||||
# Utils
|
||||
@@ -509,37 +514,43 @@ def parse_obj(fname):
|
||||
def generate_vertex(v):
|
||||
return TEMPLATE_VERTEX % (v[0], v[1], v[2])
|
||||
|
||||
def generate_uv(f, uvs):
|
||||
def generate_uv_tri(f, uvs):
|
||||
ui = f['uv']
|
||||
if len(ui) == 3:
|
||||
return TEMPLATE_UV3 % (uvs[ui[0]-1][0], 1.0 - uvs[ui[0]-1][1],
|
||||
uvs[ui[1]-1][0], 1.0 - uvs[ui[1]-1][1],
|
||||
uvs[ui[2]-1][0], 1.0 - uvs[ui[2]-1][1])
|
||||
elif len(ui) == 4:
|
||||
return TEMPLATE_UV4 % (uvs[ui[0]-1][0], 1.0 - uvs[ui[0]-1][1],
|
||||
uvs[ui[1]-1][0], 1.0 - uvs[ui[1]-1][1],
|
||||
uvs[ui[2]-1][0], 1.0 - uvs[ui[2]-1][1],
|
||||
uvs[ui[3]-1][0], 1.0 - uvs[ui[3]-1][1])
|
||||
return ""
|
||||
return TEMPLATE_UV_TRI % (uvs[ui[0]-1][0], 1.0 - uvs[ui[0]-1][1],
|
||||
uvs[ui[1]-1][0], 1.0 - uvs[ui[1]-1][1],
|
||||
uvs[ui[2]-1][0], 1.0 - uvs[ui[2]-1][1])
|
||||
|
||||
def generate_face(f):
|
||||
def generate_uv_quad(f, uvs):
|
||||
ui = f['uv']
|
||||
return TEMPLATE_UV_QUAD % (uvs[ui[0]-1][0], 1.0 - uvs[ui[0]-1][1],
|
||||
uvs[ui[1]-1][0], 1.0 - uvs[ui[1]-1][1],
|
||||
uvs[ui[2]-1][0], 1.0 - uvs[ui[2]-1][1],
|
||||
uvs[ui[3]-1][0], 1.0 - uvs[ui[3]-1][1])
|
||||
|
||||
def generate_triangle(f):
|
||||
vi = f['vertex']
|
||||
if f["normal"] and SHADING == "smooth":
|
||||
ni = f['normal']
|
||||
if len(vi) == 3:
|
||||
return TEMPLATE_FACE3N % (vi[0]-1, vi[1]-1, vi[2]-1, f['material'], ni[0]-1, ni[1]-1, ni[2]-1)
|
||||
elif len(vi) == 4:
|
||||
return TEMPLATE_FACE4N % (vi[0]-1, vi[1]-1, vi[2]-1, vi[3]-1, f['material'], ni[0]-1, ni[1]-1, ni[2]-1, ni[3]-1)
|
||||
else:
|
||||
if len(vi) == 3:
|
||||
return TEMPLATE_FACE3 % (vi[0]-1, vi[1]-1, vi[2]-1, f['material'])
|
||||
elif len(vi) == 4:
|
||||
return TEMPLATE_FACE4 % (vi[0]-1, vi[1]-1, vi[2]-1, vi[3]-1, f['material'])
|
||||
return ""
|
||||
return TEMPLATE_TRI % (vi[0]-1, vi[1]-1, vi[2]-1, f['material'])
|
||||
|
||||
def generate_triangle_n(f):
|
||||
vi = f['vertex']
|
||||
ni = f['normal']
|
||||
return TEMPLATE_TRI_N % (vi[0]-1, vi[1]-1, vi[2]-1, f['material'], ni[0]-1, ni[1]-1, ni[2]-1)
|
||||
|
||||
def generate_quad(f):
|
||||
vi = f['vertex']
|
||||
return TEMPLATE_QUAD % (vi[0]-1, vi[1]-1, vi[2]-1, vi[3]-1, f['material'])
|
||||
|
||||
def generate_quad_n(f):
|
||||
vi = f['vertex']
|
||||
ni = f['normal']
|
||||
return TEMPLATE_QUAD_N % (vi[0]-1, vi[1]-1, vi[2]-1, vi[3]-1, f['material'], ni[0]-1, ni[1]-1, ni[2]-1, ni[3]-1)
|
||||
|
||||
def generate_normal(n):
|
||||
return TEMPLATE_N % (n[0], n[1], n[2])
|
||||
|
||||
# #####################################################
|
||||
# Materials
|
||||
# #####################################################
|
||||
def generate_color(i):
|
||||
"""Generate hex color corresponding to integer.
|
||||
|
||||
@@ -598,6 +609,21 @@ def generate_mtl(materials):
|
||||
}
|
||||
return mtl
|
||||
|
||||
# #####################################################
|
||||
# Faces
|
||||
# #####################################################
|
||||
def is_triangle_flat(f):
|
||||
return len(f['vertex'])==3 and not (f["normal"] and SHADING == "smooth")
|
||||
|
||||
def is_triangle_smooth(f):
|
||||
return len(f['vertex'])==3 and f["normal"] and SHADING == "smooth"
|
||||
|
||||
def is_quad_flat(f):
|
||||
return len(f['vertex'])==4 and not (f["normal"] and SHADING == "smooth")
|
||||
|
||||
def is_quad_smooth(f):
|
||||
return len(f['vertex'])==4 and f["normal"] and SHADING == "smooth"
|
||||
|
||||
# #####################################################
|
||||
# API
|
||||
# #####################################################
|
||||
@@ -623,9 +649,11 @@ def convert(infile, outfile):
|
||||
|
||||
random.seed(42) # to get well defined color order for materials
|
||||
|
||||
uv_string = ""
|
||||
uv_string_tri = ""
|
||||
uv_string_quad = ""
|
||||
if len(uvs)>0:
|
||||
uv_string = ",".join([generate_uv(f, uvs) for f in faces])
|
||||
uv_string_tri = ",".join([generate_uv_tri(f, uvs) for f in faces if len(f['uv']) == 3])
|
||||
uv_string_quad = ",".join([generate_uv_quad(f, uvs) for f in faces if len(f['uv']) == 4])
|
||||
|
||||
|
||||
# default materials with debug colors for when
|
||||
@@ -653,11 +681,15 @@ def convert(infile, outfile):
|
||||
normals_string = ",".join(generate_normal(n) for n in normals)
|
||||
|
||||
text = TEMPLATE_FILE % {
|
||||
"name" : get_name(outfile),
|
||||
"vertices" : ",".join([generate_vertex(v) for v in vertices]),
|
||||
"faces" : ",".join([generate_face(f) for f in faces]),
|
||||
"uvs" : uv_string,
|
||||
"normals" : normals_string,
|
||||
"name" : get_name(outfile),
|
||||
"vertices" : ",".join([generate_vertex(v) for v in vertices]),
|
||||
"triangles" : ",".join([generate_triangle(f) for f in faces if is_triangle_flat(f)]),
|
||||
"triangles_n": ",".join([generate_triangle_n(f) for f in faces if is_triangle_smooth(f)]),
|
||||
"quads" : ",".join([generate_quad(f) for f in faces if is_quad_flat(f)]),
|
||||
"quads_n" : ",".join([generate_quad_n(f) for f in faces if is_quad_smooth(f)]),
|
||||
"uvs_tri" : uv_string_tri,
|
||||
"uvs_quad" : uv_string_quad,
|
||||
"normals" : normals_string,
|
||||
|
||||
"materials" : generate_materials(mtl, materials),
|
||||
|
||||
|
||||
Reference in New Issue
Block a user