From a2c33129e0f0d5b25a5e26f217765d11d4588c15 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Sun, 19 Aug 2012 13:15:21 +0200 Subject: [PATCH] GUI: Handle STL files. --- examples/js/loaders/OBJLoader.js | 8 +++--- examples/js/loaders/STLLoader.js | 1 + gui/index.html | 46 ++++++++++++++++++++------------ 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/examples/js/loaders/OBJLoader.js b/examples/js/loaders/OBJLoader.js index 37ca156b49..62eb3f750e 100644 --- a/examples/js/loaders/OBJLoader.js +++ b/examples/js/loaders/OBJLoader.js @@ -141,7 +141,7 @@ THREE.OBJLoader.prototype = { // ["f 1 2 3", "1", "2", "3", undefined] if ( result[ 4 ] === undefined ) { - + geometry.faces.push( face3( parseInt( result[ 1 ] ) - 1, parseInt( result[ 2 ] ) - 1, @@ -170,7 +170,7 @@ THREE.OBJLoader.prototype = { // ["f 1/1 2/2 3/3", " 1/1", "1", "1", " 2/2", "2", "2", " 3/3", "3", "3", undefined, undefined, undefined] if ( result[ 10 ] === undefined ) { - + geometry.faces.push( face3( parseInt( result[ 2 ] ) - 1, parseInt( result[ 5 ] ) - 1, @@ -212,7 +212,7 @@ THREE.OBJLoader.prototype = { // ["f 1/1/1 2/2/2 3/3/3", " 1/1/1", "1", "1", "1", " 2/2/2", "2", "2", "2", " 3/3/3", "3", "3", "3", undefined, undefined, undefined, undefined] if ( result[ 13 ] === undefined ) { - + geometry.faces.push( face3( parseInt( result[ 2 ] ) - 1, parseInt( result[ 6 ] ) - 1, @@ -266,7 +266,7 @@ THREE.OBJLoader.prototype = { // ["f 1//1 2//2 3//3", " 1//1", "1", "1", " 2//2", "2", "2", " 3//3", "3", "3", undefined, undefined, undefined] if ( result[ 10 ] === undefined ) { - + geometry.faces.push( face3( parseInt( result[ 2 ] ) - 1, parseInt( result[ 5 ] ) - 1, diff --git a/examples/js/loaders/STLLoader.js b/examples/js/loaders/STLLoader.js index 0b553f539d..68d914b9a9 100644 --- a/examples/js/loaders/STLLoader.js +++ b/examples/js/loaders/STLLoader.js @@ -93,6 +93,7 @@ THREE.STLLoader.prototype = { } geometry.computeCentroids(); + geometry.computeBoundingSphere(); return geometry; diff --git a/gui/index.html b/gui/index.html index a1e9a16fbb..bdbeffbc77 100644 --- a/gui/index.html +++ b/gui/index.html @@ -19,23 +19,24 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + +