diff --git a/package.json b/package.json index 5dc29c8..5ecc1ee 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "README.md" ], "dependencies": { - "async": "^1.5.2", "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^1.1.1", @@ -73,4 +72,4 @@ "browserify-versionify" ] } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 5dc29c8..5ecc1ee 100644 --- a/package.json +++ b/package.json @@ -40,7 +40,6 @@ "README.md" ], "dependencies": { - "async": "^1.5.2", "bit-twiddle": "^1.0.2", "earcut": "^2.0.7", "eventemitter3": "^1.1.1", @@ -73,4 +72,4 @@ "browserify-versionify" ] } -} \ No newline at end of file +} diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js index 8bf810d..97fd258 100644 --- a/src/loaders/spritesheetParser.js +++ b/src/loaders/spritesheetParser.js @@ -1,7 +1,6 @@ var Resource = require('resource-loader').Resource, path = require('path'), - core = require('../core'), - async = require('async'); + core = require('../core'); var BATCH_SIZE = 1000; @@ -25,11 +24,11 @@ }; // Prepend url path unless the resource image is a data url - if (resource.isDataUrl) + if (resource.isDataUrl) { resourcePath = resource.data.meta.image; - } - else + } + else { resourcePath = path.dirname(resource.url.replace(this.baseUrl, '')) + '/' + resource.data.meta.image; } @@ -101,6 +100,16 @@ setTimeout(done, 0); } + function iteration() { + processNextBatch(function() { + if (shouldProcessNextBatch()) { + iteration(); + } else { + next(); + } + }); + } + if (frameKeys.length <= BATCH_SIZE) { processFrames(0, BATCH_SIZE); @@ -108,7 +117,7 @@ } else { - async.whilst(shouldProcessNextBatch, processNextBatch, next); + iteration(); } }); };