From ca89f4654b7e86e99e449cf0790b69714dec7ae1 Mon Sep 17 00:00:00 2001 From: Alex Weiss Date: Sat, 9 Nov 2013 13:59:55 -0500 Subject: [PATCH] OBJLoader & OBJMTLLoader: Fixed sharing of Vector2 & Vector3 objects by UVs & normals. Should bring the OBJ(MTL)Loader into compliance with #3762. --- examples/js/loaders/OBJLoader.js | 12 ++++++------ examples/js/loaders/OBJMTLLoader.js | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/js/loaders/OBJLoader.js b/examples/js/loaders/OBJLoader.js index cf109ffdae..6f834d36d9 100644 --- a/examples/js/loaders/OBJLoader.js +++ b/examples/js/loaders/OBJLoader.js @@ -63,9 +63,9 @@ THREE.OBJLoader.prototype = { parseInt( b ) - (face_offset + 1), parseInt( c ) - (face_offset + 1), [ - normals[ parseInt( normals_inds[ 0 ] ) - 1 ], - normals[ parseInt( normals_inds[ 1 ] ) - 1 ], - normals[ parseInt( normals_inds[ 2 ] ) - 1 ] + normals[ parseInt( normals_inds[ 0 ] ) - 1 ].clone(), + normals[ parseInt( normals_inds[ 1 ] ) - 1 ].clone(), + normals[ parseInt( normals_inds[ 2 ] ) - 1 ].clone() ] ) ); } @@ -73,9 +73,9 @@ THREE.OBJLoader.prototype = { function add_uvs( a, b, c ) { geometry.faceVertexUvs[ 0 ].push( [ - uvs[ parseInt( a ) - 1 ], - uvs[ parseInt( b ) - 1 ], - uvs[ parseInt( c ) - 1 ] + uvs[ parseInt( a ) - 1 ].clone(), + uvs[ parseInt( b ) - 1 ].clone(), + uvs[ parseInt( c ) - 1 ].clone() ] ); } diff --git a/examples/js/loaders/OBJMTLLoader.js b/examples/js/loaders/OBJMTLLoader.js index 8e66f07e2b..56e8397f1c 100644 --- a/examples/js/loaders/OBJMTLLoader.js +++ b/examples/js/loaders/OBJMTLLoader.js @@ -133,9 +133,9 @@ THREE.OBJMTLLoader.prototype = { parseInt( b ) - (face_offset + 1), parseInt( c ) - (face_offset + 1), [ - normals[ parseInt( normals_inds[ 0 ] ) - 1 ], - normals[ parseInt( normals_inds[ 1 ] ) - 1 ], - normals[ parseInt( normals_inds[ 2 ] ) - 1 ] + normals[ parseInt( normals_inds[ 0 ] ) - 1 ].clone(), + normals[ parseInt( normals_inds[ 1 ] ) - 1 ].clone(), + normals[ parseInt( normals_inds[ 2 ] ) - 1 ].clone() ] ) ); } @@ -143,9 +143,9 @@ THREE.OBJMTLLoader.prototype = { function add_uvs( a, b, c ) { geometry.faceVertexUvs[ 0 ].push( [ - uvs[ parseInt( a ) - 1 ], - uvs[ parseInt( b ) - 1 ], - uvs[ parseInt( c ) - 1 ] + uvs[ parseInt( a ) - 1 ].clone(), + uvs[ parseInt( b ) - 1 ].clone(), + uvs[ parseInt( c ) - 1 ].clone() ] ); } -- GitLab