From fa8c69d3425a4667bc34e9c0aa53e6dba9e3c20d Mon Sep 17 00:00:00 2001 From: alteredq Date: Wed, 28 Nov 2012 20:01:56 +0100 Subject: [PATCH] Made Editor work again with ascii JSON models. This got broken after GeometryLoader got removed, using instead JSONLoader. --- editor/index.html | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/editor/index.html b/editor/index.html index e0bb95872f..b1547134ce 100644 --- a/editor/index.html +++ b/editor/index.html @@ -264,15 +264,20 @@ if ( data.metadata.type === 'geometry' ) { - var geometry = new THREE.GeometryLoader().parse( data ); - geometry.sourceType = "ascii"; - geometry.sourceFile = file.name; + var loader = new THREE.JSONLoader(); - var mesh = new THREE.Mesh( geometry, createDummyMaterial() ); - mesh.name = filename; + loader.createModel( data, function ( geometry ) { - signals.objectAdded.dispatch( mesh ); - signals.objectSelected.dispatch( mesh ); + geometry.sourceType = "ascii"; + geometry.sourceFile = file.name; + + var mesh = new THREE.Mesh( geometry, createDummyMaterial() ); + mesh.name = filename; + + signals.objectAdded.dispatch( mesh ); + signals.objectSelected.dispatch( mesh ); + + } ); } else if ( data.metadata.type === 'scene' ) { -- GitLab