fix unit test for sprite #3870
Merged
fix unit test for sprite #3870
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pandamicro
suggested changes
Feb 19, 2019
| @@ -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') : { | |||
There was a problem hiding this comment.
为了充分隔离 canvas 和 webgl 实现，不影响阅读，这里改为
if (CC_TEST) {
cc._Test._spriteWebGLAssembler = require('../../../webgl/assemblers/sprite/index.js');
}
在 sprite renderer test case 中用这个属性来访问
cocos2d/core/components/CCSprite.js
Outdated
| { | ||
| if (!this._spriteFrame) return; | ||
| _calDynamicAtlas () { | ||
| if (!this._spriteFrame || (CC_TEST && cc.game.renderType === cc.game.RENDER_TYPE_CANVAS)) return; |
| @@ -190,6 +190,7 @@ if (!isPhantomJS) { | |||
|
|
|||
| sprite._assembler.updateRenderData(sprite); | |||
There was a problem hiding this comment.
改为
let assembler = cc._Test._spriteWebGLAssembler.getAssembler(sprite);
sprite._calDynamicAtlas = function () {};
assembler.updateRenderData(sprite);
pandamicro
approved these changes
Feb 21, 2019
pandamicro
pushed a commit
that referenced
this pull request
Mar 11, 2019
* Add RenderMode TS support (#3879) Add spine assembler var define * fix unit test for sprite (#3870) * Fix 1.x to 2.x particle custom data is invalid bug (#3885) * Improve particle definition data code (#3892) * fix event failed to reorder after modifying zIndex for 2d-tasks/issues/1130 (#3895) * Move BlendFunctionFactors to Sprite and ParticleSystem only (#3900) * change API:loadSubpackage to load index.js (#3899) * mark component.enabled as animatable (#3898) * ban JIT support on baidugame (#3903) * Fix dragonbones multiple texture bug (#3897) * Fix dragonbones change cloth bug * Adapt to old api-> on off once * DragonBonesAsset do not store dragonBones data * fix some error * fix web spine debug draw color error * Set limit time to 30s * fix label rendering in open data context (#3911) * fix: shaders have same uniform name, different type will effect wrong (#3876) * fix: shaders have same uniform name, different type will effect wrong * fix shaders have same uniform name, different type will effect wrong * fix shaders have same uniform name, different type will effect wrong, refine * add deprecated property in EditBox in v2.0 (#3912) * Fix dragonbones exception (#3914) * revert particles system attribute definition (#3919) * fix emit target scale changed events twice (#3922) * add the tween test case (#3908) * add the tween test case * modify the format of the test-tween.js 1. keep all chain method start at the char 'n' below * fixed the tween bugs * Fix spine premultipliedAlpha serialize bug (#3924) * cancel disable dynamic atlas on chrome. (#3929) * Add cache mode of label. (#3916) * Add cache mode of label. * fix revised comments of pr. * Simplified variable name. * share canvas pool. * cancel use node color. * modify comment and reserve _batchAsBitMap. * optimize the assignment of color and delete blendFactor. * delete reserveImage. * modify to center alignment. * modify letter-font do not use node color. * add outline support of letter-font * add letter atlas reset on editor when scene loaded. * change LETTER to CHAR * modify comment * Wechat -> WeChat * Add spine render mode chinese tip (#3933) * fix label rendering error on native (#3936) * fix label rendering error on native * fix rendering error on native * revert first commit * clear letter atlas when scene launch. (#3938) * reset the CHAR mode to NONE on subdomin. (#3940) * reset the CHAR mode to NONE on subdomin. * reset CHAR mode on subdomin * set rigidbody awake visible is false (#3941) * fix canvasPool error on subdomin (#3942) * update rigidbody awake tips and add awakeOnLoad (#3944) * fix label error when font change on editor. (#3946) * Rename skeleton RenderMode to AnimationCacheMode (#3947) * Rename skeleton RenderMode to AnimationCacheMode * Rename skeleton RenderMode to AnimationCacheMode * fix label blur when using dark font color (#3949) * optimize editBox style (#3952) * To adapt the adjust of the webview impl in the jsb (#3697) (#3951) * fix the problem of label that first modified is invalid. (#3959) * Fix create ArmatureDisplay by code but no set asset, then invoke some api about event, will throw error (#3966) * fix get auido state bug (#3974) * small fixed * small fixed
minggo
pushed a commit
that referenced
this pull request
Feb 10, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Re: cocos-creator/2d-tasks#
Changes:
修复前：
修复后：