提交 c748ab35 编写于 作者: M Mugen87

Loaders: Clean up.

上级 538533d0
......@@ -65,7 +65,7 @@ THREE.GLTFLoader = ( function () {
// Tells the LoadingManager to track an extra item, which resolves after
// the model is fully loaded. This means the count of items loaded will
// be incorrect, but ensures manager.onLoad() does not fire early.
scope.manager.itemStart( url );
this.manager.itemStart( url );
var _onError = function ( e ) {
......@@ -84,12 +84,12 @@ THREE.GLTFLoader = ( function () {
};
var loader = new THREE.FileLoader( scope.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( data ) {
......
......@@ -585,7 +585,7 @@ THREE.LDrawLoader = ( function () {
var fileLoader = new THREE.FileLoader( this.manager );
fileLoader.setPath( this.path );
fileLoader.setRequestHeader( this.requestHeader );
fileLoader.setWithCredentials( scope.withCredentials );
fileLoader.setWithCredentials( this.withCredentials );
fileLoader.load( url, function ( text ) {
scope.processObject( text, onLoad, null, url );
......
......@@ -35,7 +35,7 @@ THREE.MTLLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
var loader = new THREE.FileLoader( this.manager );
loader.setPath( this.path );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
try {
......
......@@ -433,10 +433,10 @@ THREE.OBJLoader = ( function () {
var scope = this;
var loader = new THREE.FileLoader( scope.manager );
var loader = new THREE.FileLoader( this.manager );
loader.setPath( this.path );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
try {
......
......@@ -46,7 +46,7 @@ THREE.PLYLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
try {
......
......@@ -65,11 +65,11 @@ THREE.STLLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
var scope = this;
var loader = new THREE.FileLoader( scope.manager );
loader.setPath( scope.path );
var loader = new THREE.FileLoader( this.manager );
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
......
......@@ -39,13 +39,13 @@ THREE.TDSLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
var scope = this;
var path = ( scope.path === '' ) ? THREE.LoaderUtils.extractUrlBase( url ) : scope.path;
var path = ( this.path === '' ) ? THREE.LoaderUtils.extractUrlBase( url ) : this.path;
var loader = new THREE.FileLoader( this.manager );
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( data ) {
......
......@@ -19,7 +19,7 @@ THREE.TGALoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
var loader = new THREE.FileLoader( this.manager );
loader.setResponseType( 'arraybuffer' );
loader.setPath( this.path );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( buffer ) {
......
......@@ -26,7 +26,7 @@ THREE.TTFLoader.prototype = Object.assign( Object.create( THREE.Loader.prototype
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( buffer ) {
try {
......
......@@ -128,7 +128,7 @@ var GLTFLoader = ( function () {
// Tells the LoadingManager to track an extra item, which resolves after
// the model is fully loaded. This means the count of items loaded will
// be incorrect, but ensures manager.onLoad() does not fire early.
scope.manager.itemStart( url );
this.manager.itemStart( url );
var _onError = function ( e ) {
......@@ -147,12 +147,12 @@ var GLTFLoader = ( function () {
};
var loader = new FileLoader( scope.manager );
var loader = new FileLoader( this.manager );
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( data ) {
......
......@@ -601,7 +601,7 @@ var LDrawLoader = ( function () {
var fileLoader = new FileLoader( this.manager );
fileLoader.setPath( this.path );
fileLoader.setRequestHeader( this.requestHeader );
fileLoader.setWithCredentials( scope.withCredentials );
fileLoader.setWithCredentials( this.withCredentials );
fileLoader.load( url, function ( text ) {
scope.processObject( text, onLoad, null, url );
......
......@@ -46,7 +46,7 @@ MTLLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
var loader = new FileLoader( this.manager );
loader.setPath( this.path );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
try {
......
......@@ -447,10 +447,10 @@ var OBJLoader = ( function () {
var scope = this;
var loader = new FileLoader( scope.manager );
var loader = new FileLoader( this.manager );
loader.setPath( this.path );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
try {
......
......@@ -52,7 +52,7 @@ PLYLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
try {
......
......@@ -73,11 +73,11 @@ STLLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
var scope = this;
var loader = new FileLoader( scope.manager );
loader.setPath( scope.path );
var loader = new FileLoader( this.manager );
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
......
......@@ -53,13 +53,13 @@ TDSLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
var scope = this;
var path = ( scope.path === '' ) ? LoaderUtils.extractUrlBase( url ) : scope.path;
var path = ( this.path === '' ) ? LoaderUtils.extractUrlBase( url ) : this.path;
var loader = new FileLoader( this.manager );
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( data ) {
......
......@@ -23,7 +23,7 @@ TGALoader.prototype = Object.assign( Object.create( Loader.prototype ), {
var loader = new FileLoader( this.manager );
loader.setResponseType( 'arraybuffer' );
loader.setPath( this.path );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( buffer ) {
......
......@@ -30,7 +30,7 @@ TTFLoader.prototype = Object.assign( Object.create( Loader.prototype ), {
loader.setPath( this.path );
loader.setResponseType( 'arraybuffer' );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( buffer ) {
try {
......
......@@ -71,10 +71,10 @@ class ObjectLoader extends Loader {
const path = ( this.path === '' ) ? LoaderUtils.extractUrlBase( url ) : this.path;
this.resourcePath = this.resourcePath || path;
const loader = new FileLoader( scope.manager );
const loader = new FileLoader( this.manager );
loader.setPath( this.path );
loader.setRequestHeader( this.requestHeader );
loader.setWithCredentials( scope.withCredentials );
loader.setWithCredentials( this.withCredentials );
loader.load( url, function ( text ) {
let json = null;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册