diff --git a/package.json b/package.json index 3706307..66a8039 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "eventemitter3": "^1.1.1", "gulp-header": "^1.7.1", "object-assign": "^4.0.1", - "resource-loader": "^1.6.2" + "resource-loader": "^1.6.3" }, "devDependencies": { "browserify": "^11.1.0", diff --git a/package.json b/package.json index 3706307..66a8039 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "eventemitter3": "^1.1.1", "gulp-header": "^1.7.1", "object-assign": "^4.0.1", - "resource-loader": "^1.6.2" + "resource-loader": "^1.6.3" }, "devDependencies": { "browserify": "^11.1.0", diff --git a/src/core/index.js b/src/core/index.js index 1cc4552..1e18b74 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -46,6 +46,7 @@ // renderers - webgl WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), + WebGLManager: require('./renderers/webgl/managers/WebGLManager'), ShaderManager: require('./renderers/webgl/managers/ShaderManager'), Shader: require('./renderers/webgl/shaders/Shader'), ObjectRenderer: require('./renderers/webgl/utils/ObjectRenderer'), diff --git a/package.json b/package.json index 3706307..66a8039 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "eventemitter3": "^1.1.1", "gulp-header": "^1.7.1", "object-assign": "^4.0.1", - "resource-loader": "^1.6.2" + "resource-loader": "^1.6.3" }, "devDependencies": { "browserify": "^11.1.0", diff --git a/src/core/index.js b/src/core/index.js index 1cc4552..1e18b74 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -46,6 +46,7 @@ // renderers - webgl WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), + WebGLManager: require('./renderers/webgl/managers/WebGLManager'), ShaderManager: require('./renderers/webgl/managers/ShaderManager'), Shader: require('./renderers/webgl/shaders/Shader'), ObjectRenderer: require('./renderers/webgl/utils/ObjectRenderer'), diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index c6bc554..4bf08bf 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -106,7 +106,8 @@ else { var loadOptions = { crossOrigin: resource.crossOrigin, - loadType: Resource.LOAD_TYPE.IMAGE + loadType: Resource.LOAD_TYPE.IMAGE, + metadata: resource.metadata.imageMetadata }; // load the texture for the font this.add(resource.name + '_image', textureUrl, loadOptions, function (res) { diff --git a/package.json b/package.json index 3706307..66a8039 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "eventemitter3": "^1.1.1", "gulp-header": "^1.7.1", "object-assign": "^4.0.1", - "resource-loader": "^1.6.2" + "resource-loader": "^1.6.3" }, "devDependencies": { "browserify": "^11.1.0", diff --git a/src/core/index.js b/src/core/index.js index 1cc4552..1e18b74 100644 --- a/src/core/index.js +++ b/src/core/index.js @@ -46,6 +46,7 @@ // renderers - webgl WebGLRenderer: require('./renderers/webgl/WebGLRenderer'), + WebGLManager: require('./renderers/webgl/managers/WebGLManager'), ShaderManager: require('./renderers/webgl/managers/ShaderManager'), Shader: require('./renderers/webgl/shaders/Shader'), ObjectRenderer: require('./renderers/webgl/utils/ObjectRenderer'), diff --git a/src/loaders/bitmapFontParser.js b/src/loaders/bitmapFontParser.js index c6bc554..4bf08bf 100644 --- a/src/loaders/bitmapFontParser.js +++ b/src/loaders/bitmapFontParser.js @@ -106,7 +106,8 @@ else { var loadOptions = { crossOrigin: resource.crossOrigin, - loadType: Resource.LOAD_TYPE.IMAGE + loadType: Resource.LOAD_TYPE.IMAGE, + metadata: resource.metadata.imageMetadata }; // load the texture for the font this.add(resource.name + '_image', textureUrl, loadOptions, function (res) { diff --git a/src/loaders/spritesheetParser.js b/src/loaders/spritesheetParser.js index f30032c..b318d6f 100644 --- a/src/loaders/spritesheetParser.js +++ b/src/loaders/spritesheetParser.js @@ -14,7 +14,8 @@ var loadOptions = { crossOrigin: resource.crossOrigin, - loadType: Resource.LOAD_TYPE.IMAGE + loadType: Resource.LOAD_TYPE.IMAGE, + metadata: resource.metadata.imageMetadata }; var route = path.dirname(resource.url.replace(this.baseUrl, ''));