diff --git a/cocos2d/core/components/CCSprite.js b/cocos2d/core/components/CCSprite.js index e2e0a9a2be9..6dc443f7330 100644 --- a/cocos2d/core/components/CCSprite.js +++ b/cocos2d/core/components/CCSprite.js @@ -649,9 +649,8 @@ var Sprite = cc.Class({ } }, - _calDynamicAtlas () - { - if (!this._spriteFrame) return; + _calDynamicAtlas () { + if (!this._spriteFrame || (CC_TEST && cc.game.renderType === cc.game.RENDER_TYPE_CANVAS)) return; if (!this._spriteFrame._original && dynamicAtlasManager) { let frame = dynamicAtlasManager.insertSpriteFrame(this._spriteFrame); diff --git a/cocos2d/core/renderer/canvas/renderers/sprite/index.js b/cocos2d/core/renderer/canvas/renderers/sprite/index.js index 4ffa73820f7..e971d988d4f 100644 --- a/cocos2d/core/renderer/canvas/renderers/sprite/index.js +++ b/cocos2d/core/renderer/canvas/renderers/sprite/index.js @@ -30,7 +30,8 @@ let simple = require('./simple'); let sliced = require('./sliced'); let tiled = require('./tiled'); -module.exports = { +// 2.x not support test with the canvas simple, in order to test in local test construct. +let spriteAssembler = CC_TEST ? require('../../../webgl/assemblers/sprite/index.js') : { getAssembler: function (sprite) { switch (sprite.type) { case SpriteType.SIMPLE: @@ -52,4 +53,8 @@ module.exports = { createData (sprite) { return sprite._assembler.createData(sprite); } -}; \ No newline at end of file +}; + +module.exports = spriteAssembler; + + diff --git a/test/qunit/unit-es5/test-spriteRenderer.js b/test/qunit/unit-es5/test-spriteRenderer.js index b39de423b70..effca1ff55f 100644 --- a/test/qunit/unit-es5/test-spriteRenderer.js +++ b/test/qunit/unit-es5/test-spriteRenderer.js @@ -190,6 +190,7 @@ if (!isPhantomJS) { sprite._assembler.updateRenderData(sprite); var vertices = sprite._renderData._data; + var uvs = sprite._spriteFrame.uv; strictEqual(vertices.length == 8, true, 'have 8 vertices'); strictEqual(vertices[0].x, 0, 'x0 test success'); @@ -200,14 +201,10 @@ if (!isPhantomJS) { strictEqual(vertices[1].y, 60, 'y1 test success'); strictEqual(vertices[2].y, 100, 'y2 test success'); // - deepClose(vertices[0].u, 10 / 100, 0.01, 'full quad u0 test success'); - deepClose(vertices[0].v, 70 / 100, 0.01, 'full quad v0 test success'); - deepClose(vertices[3].u, 50 / 100, 0.01, 'full quad u1 test success'); - deepClose(vertices[3].v, 10 / 100, 0.01, 'full quad v1 test success'); - deepClose(vertices[4].u, 10 / 100, 0.01, 'part quad u0 test success'); - deepClose(vertices[4].v, 70 / 100, 0.01, 'part quad v0 test success'); - deepClose(vertices[7].u, 30 / 100, 0.01, 'part quad u1 test success'); - deepClose(vertices[7].v, 30 / 100, 0.01, 'part quad v1 test success'); + deepClose(uvs[0], 10 / 100, 0.01, 'full quad u0 test success'); + deepClose(uvs[1], 70 / 100, 0.01, 'full quad v0 test success'); + deepClose(uvs[6], 50 / 100, 0.01, 'full quad u1 test success'); + deepClose(uvs[7], 10 / 100, 0.01, 'full quad v1 test success'); }; if (spriteFrame.textureLoaded()) { testCallBack();