浏览代码

Made Editor work again with ascii JSON models.

This got broken after GeometryLoader got removed, using instead JSONLoader.
alteredq 12 年之前
父节点
当前提交
fa8c69d342
共有 1 个文件被更改,包括 12 次插入7 次删除
  1. 12 7
      editor/index.html

+ 12 - 7
editor/index.html

@@ -264,15 +264,20 @@
 
 
 							if ( data.metadata.type === 'geometry' ) {
 							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' ) {
 							} else if ( data.metadata.type === 'scene' ) {