diff --git a/src/loaders/Cache.js b/src/loaders/Cache.js index 6859ae01b62243d56adee14518abfb0e8b74d17e..87227cba05479356efe154eba0a9e0ec38a565e3 100644 --- a/src/loaders/Cache.js +++ b/src/loaders/Cache.js @@ -2,15 +2,9 @@ * @author mrdoob / http://mrdoob.com/ */ -THREE.Cache = function () { +THREE.Cache = { - this.files = {}; - -}; - -THREE.Cache.prototype = { - - constructor: THREE.Cache, + files: {}, add: function ( key, file ) { diff --git a/src/loaders/ImageLoader.js b/src/loaders/ImageLoader.js index d5ef39ca75aad79faa17cbe38fe5abed18c6fd44..a73a75c46b84f9c898d7c0e646a7e48f3a336200 100644 --- a/src/loaders/ImageLoader.js +++ b/src/loaders/ImageLoader.js @@ -4,7 +4,6 @@ THREE.ImageLoader = function ( manager ) { - this.cache = new THREE.Cache(); this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager; }; @@ -17,7 +16,7 @@ THREE.ImageLoader.prototype = { var scope = this; - var cached = scope.cache.get( url ); + var cached = THREE.Cache.get( url ); if ( cached !== undefined ) { @@ -28,18 +27,15 @@ THREE.ImageLoader.prototype = { var image = document.createElement( 'img' ); - if ( onLoad !== undefined ) { + image.addEventListener( 'load', function ( event ) { - image.addEventListener( 'load', function ( event ) { + THREE.Cache.add( url, this ); - scope.cache.add( url, this ); + if ( onLoad ) onLoad( this ); + + scope.manager.itemEnd( url ); - onLoad( this ); - scope.manager.itemEnd( url ); - - }, false ); - - } + }, false ); if ( onProgress !== undefined ) { diff --git a/src/loaders/XHRLoader.js b/src/loaders/XHRLoader.js index 0440d45a0c956d02c836bc56dce1132b7f936978..1080719a7b52b4b5c2accb1040ba832622482005 100644 --- a/src/loaders/XHRLoader.js +++ b/src/loaders/XHRLoader.js @@ -4,7 +4,6 @@ THREE.XHRLoader = function ( manager ) { - this.cache = new THREE.Cache(); this.manager = ( manager !== undefined ) ? manager : THREE.DefaultLoadingManager; }; @@ -17,7 +16,7 @@ THREE.XHRLoader.prototype = { var scope = this; - var cached = scope.cache.get( url ); + var cached = THREE.Cache.get( url ); if ( cached !== undefined ) { @@ -31,7 +30,7 @@ THREE.XHRLoader.prototype = { request.addEventListener( 'load', function ( event ) { - scope.cache.add( url, this.response ); + THREE.Cache.add( url, this.response ); if ( onLoad ) onLoad( this.response );