|
@@ -7,6 +7,8 @@ var Loader = function ( editor ) {
|
|
var scope = this;
|
|
var scope = this;
|
|
var signals = editor.signals;
|
|
var signals = editor.signals;
|
|
|
|
|
|
|
|
+ this.texturePath = '';
|
|
|
|
+
|
|
this.loadFile = function ( file ) {
|
|
this.loadFile = function ( file ) {
|
|
|
|
|
|
var filename = file.name;
|
|
var filename = file.name;
|
|
@@ -386,6 +388,8 @@ var Loader = function ( editor ) {
|
|
} else if ( data.metadata.type.toLowerCase() === 'geometry' ) {
|
|
} else if ( data.metadata.type.toLowerCase() === 'geometry' ) {
|
|
|
|
|
|
var loader = new THREE.JSONLoader();
|
|
var loader = new THREE.JSONLoader();
|
|
|
|
+ loader.setTexturePath( scope.texturePath );
|
|
|
|
+
|
|
var result = loader.parse( data );
|
|
var result = loader.parse( data );
|
|
|
|
|
|
var geometry = result.geometry;
|
|
var geometry = result.geometry;
|
|
@@ -432,6 +436,8 @@ var Loader = function ( editor ) {
|
|
} else if ( data.metadata.type.toLowerCase() === 'object' ) {
|
|
} else if ( data.metadata.type.toLowerCase() === 'object' ) {
|
|
|
|
|
|
var loader = new THREE.ObjectLoader();
|
|
var loader = new THREE.ObjectLoader();
|
|
|
|
+ loader.setTexturePath( scope.texturePath );
|
|
|
|
+
|
|
var result = loader.parse( data );
|
|
var result = loader.parse( data );
|
|
|
|
|
|
if ( result instanceof THREE.Scene ) {
|
|
if ( result instanceof THREE.Scene ) {
|