提交 d0153596 编写于 作者: M Mr.doob

Updated builds.

上级 01de5bc6
......@@ -40593,15 +40593,14 @@
function ObjectLoader( manager ) {
Loader.call( this, manager );
}
Loader.call( this, manager );
ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
}
constructor: ObjectLoader,
ObjectLoader.prototype = Object.create( Loader.prototype );
ObjectLoader.prototype.constructor = ObjectLoader;
load: function ( url, onLoad, onProgress, onError ) {
ObjectLoader.prototype.load = function load ( url, onLoad, onProgress, onError ) {
var scope = this;
......@@ -40642,9 +40641,9 @@
}, onProgress, onError );
},
};
parse: function ( json, onLoad ) {
ObjectLoader.prototype.parse = function parse ( json, onLoad ) {
var shapes = this.parseShape( json.shapes );
var geometries = this.parseGeometries( json.geometries, shapes );
......@@ -40674,9 +40673,9 @@
return object;
},
};
parseShape: function ( json ) {
ObjectLoader.prototype.parseShape = function parseShape ( json ) {
var shapes = {};
......@@ -40694,9 +40693,9 @@
return shapes;
},
};
parseGeometries: function ( json, shapes ) {
ObjectLoader.prototype.parseGeometries = function parseGeometries ( json, shapes ) {
var geometries = {};
var geometryShapes;
......@@ -40976,9 +40975,9 @@
return geometries;
},
};
parseMaterials: function ( json, textures ) {
ObjectLoader.prototype.parseMaterials = function parseMaterials ( json, textures ) {
var cache = {}; // MultiMaterial
var materials = {};
......@@ -41032,9 +41031,9 @@
return materials;
},
};
parseAnimations: function ( json ) {
ObjectLoader.prototype.parseAnimations = function parseAnimations ( json ) {
var animations = [];
......@@ -41052,9 +41051,9 @@
return animations;
},
};
parseImages: function ( json, onLoad ) {
ObjectLoader.prototype.parseImages = function parseImages ( json, onLoad ) {
var scope = this;
var images = {};
......@@ -41122,9 +41121,9 @@
return images;
},
};
parseTextures: function ( json, images ) {
ObjectLoader.prototype.parseTextures = function parseTextures ( json, images ) {
function parseConstant( value, type ) {
......@@ -41209,9 +41208,9 @@
return textures;
},
};
parseObject: function ( data, geometries, materials ) {
ObjectLoader.prototype.parseObject = function parseObject ( data, geometries, materials ) {
var object;
......@@ -41508,9 +41507,16 @@
return object;
}
};
} );
/* DEPRECATED */
ObjectLoader.prototype.setTexturePath = function setTexturePath ( value ) {
console.warn( 'THREE.ObjectLoader: .setTexturePath() has been renamed to .setResourcePath().' );
return this.setResourcePath( value );
};
var TEXTURE_MAPPING = {
UVMapping: UVMapping,
......@@ -48831,17 +48837,6 @@
}
Object.assign( ObjectLoader.prototype, {
setTexturePath: function ( value ) {
console.warn( 'THREE.ObjectLoader: .setTexturePath() has been renamed to .setResourcePath().' );
return this.setResourcePath( value );
}
} );
//
Object.assign( Box2.prototype, {
此差异已折叠。
......@@ -40697,17 +40697,15 @@ const TYPED_ARRAYS = {
Float64Array: Float64Array
};
function ObjectLoader( manager ) {
class ObjectLoader extends Loader {
Loader.call( this, manager );
}
constructor( manager ) {
ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
super( manager );
constructor: ObjectLoader,
}
load: function ( url, onLoad, onProgress, onError ) {
load( url, onLoad, onProgress, onError ) {
const scope = this;
......@@ -40748,9 +40746,9 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
}, onProgress, onError );
},
}
parse: function ( json, onLoad ) {
parse( json, onLoad ) {
const shapes = this.parseShape( json.shapes );
const geometries = this.parseGeometries( json.geometries, shapes );
......@@ -40780,9 +40778,9 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
return object;
},
}
parseShape: function ( json ) {
parseShape( json ) {
const shapes = {};
......@@ -40800,9 +40798,9 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
return shapes;
},
}
parseGeometries: function ( json, shapes ) {
parseGeometries( json, shapes ) {
const geometries = {};
let geometryShapes;
......@@ -41082,9 +41080,9 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
return geometries;
},
}
parseMaterials: function ( json, textures ) {
parseMaterials( json, textures ) {
const cache = {}; // MultiMaterial
const materials = {};
......@@ -41138,9 +41136,9 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
return materials;
},
}
parseAnimations: function ( json ) {
parseAnimations( json ) {
const animations = [];
......@@ -41158,9 +41156,9 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
return animations;
},
}
parseImages: function ( json, onLoad ) {
parseImages( json, onLoad ) {
const scope = this;
const images = {};
......@@ -41228,9 +41226,9 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
return images;
},
}
parseTextures: function ( json, images ) {
parseTextures( json, images ) {
function parseConstant( value, type ) {
......@@ -41315,9 +41313,9 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
return textures;
},
}
parseObject: function ( data, geometries, materials ) {
parseObject( data, geometries, materials ) {
let object;
......@@ -41616,7 +41614,16 @@ ObjectLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
}
} );
/* DEPRECATED */
setTexturePath( value ) {
console.warn( 'THREE.ObjectLoader: .setTexturePath() has been renamed to .setResourcePath().' );
return this.setResourcePath( value );
}
}
const TEXTURE_MAPPING = {
UVMapping: UVMapping,
......@@ -49232,17 +49239,6 @@ function BinaryTextureLoader( manager ) {
}
Object.assign( ObjectLoader.prototype, {
setTexturePath: function ( value ) {
console.warn( 'THREE.ObjectLoader: .setTexturePath() has been renamed to .setResourcePath().' );
return this.setResourcePath( value );
}
} );
//
Object.assign( Box2.prototype, {
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册