diff --git a/src/core/utils/index.js b/src/core/utils/index.js index b74608c..ddf3216 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -223,6 +223,15 @@ } }, + /** + * @todo Describe property usage + * @private + */ TextureCache: {}, + + /** + * @todo Describe property usage + * @private + */ BaseTextureCache: {} }; diff --git a/src/core/utils/index.js b/src/core/utils/index.js index b74608c..ddf3216 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -223,6 +223,15 @@ } }, + /** + * @todo Describe property usage + * @private + */ TextureCache: {}, + + /** + * @todo Describe property usage + * @private + */ BaseTextureCache: {} }; diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 5ffdf77..0d174f9 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -1,6 +1,5 @@ var Resource = require('resource-loader').Resource, core = require('../core'), - utils = require('../core/utils'), extras = require('../extras'), path = require('path'); @@ -99,9 +98,9 @@ xmlUrl += '/'; } var textureUrl = xmlUrl + resource.data.getElementsByTagName('page')[0].getAttribute('file'); - if (utils.TextureCache[textureUrl]) { + if (core.utils.TextureCache[textureUrl]) { //reuse existing texture - parse(resource, utils.TextureCache[textureUrl]); + parse(resource, core.utils.TextureCache[textureUrl]); next(); } else { diff --git a/src/core/utils/index.js b/src/core/utils/index.js index b74608c..ddf3216 100644 --- a/src/core/utils/index.js +++ b/src/core/utils/index.js @@ -223,6 +223,15 @@ } }, + /** + * @todo Describe property usage + * @private + */ TextureCache: {}, + + /** + * @todo Describe property usage + * @private + */ BaseTextureCache: {} }; diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index 5ffdf77..0d174f9 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -1,6 +1,5 @@ var Resource = require('resource-loader').Resource, core = require('../core'), - utils = require('../core/utils'), extras = require('../extras'), path = require('path'); @@ -99,9 +98,9 @@ xmlUrl += '/'; } var textureUrl = xmlUrl + resource.data.getElementsByTagName('page')[0].getAttribute('file'); - if (utils.TextureCache[textureUrl]) { + if (core.utils.TextureCache[textureUrl]) { //reuse existing texture - parse(resource, utils.TextureCache[textureUrl]); + parse(resource, core.utils.TextureCache[textureUrl]); next(); } else { diff --git a/src/mesh/webgl/MeshRenderer.js b/src/mesh/webgl/MeshRenderer.js index e520b10..f3310bc 100644 --- a/src/mesh/webgl/MeshRenderer.js +++ b/src/mesh/webgl/MeshRenderer.js @@ -1,5 +1,4 @@ -var ObjectRenderer = require('../../core/renderers/webgl/utils/ObjectRenderer'), - WebGLRenderer = require('../../core/renderers/webgl/WebGLRenderer'), +var core = require('../../core'); Mesh = require('../Mesh'); /** @@ -23,7 +22,7 @@ */ function MeshRenderer(renderer) { - ObjectRenderer.call(this, renderer); + core.ObjectRenderer.call(this, renderer); /** @@ -45,11 +44,11 @@ } } -MeshRenderer.prototype = Object.create(ObjectRenderer.prototype); +MeshRenderer.prototype = Object.create(core.ObjectRenderer.prototype); MeshRenderer.prototype.constructor = MeshRenderer; module.exports = MeshRenderer; -WebGLRenderer.registerPlugin('mesh', MeshRenderer); +core.WebGLRenderer.registerPlugin('mesh', MeshRenderer); /** * Sets up the renderer context and necessary buffers.