From f6d5b7213961dc130c8b6d7b2f15bb5a195b555c Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Mon, 7 Nov 2011 14:22:32 +0100 Subject: [PATCH] GUI now supports the new json format The picking code seems to be buggy... will investigate. --- gui/index.html | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/gui/index.html b/gui/index.html index c00cbe26..3db2a774 100644 --- a/gui/index.html +++ b/gui/index.html @@ -133,13 +133,8 @@ case 'js': - var blob = new BlobBuilder(); - blob.append( contents ); - - var url = URL.createObjectURL( blob.getBlob() ); - var loader = new THREE.JSONLoader(); - loader.load( url, function ( geometry ) { + loader.createModel( JSON.parse( contents ), function ( geometry ) { geometry.gui = { paremeters: { @@ -168,8 +163,6 @@ var loader = new THREE.ColladaLoader(); loader.parse( xml, function ( collada ) { - // console.log( collada ); - signals.added.dispatch( collada.scene ); } );