Upgrade WebGL Renderer with auto batching #900
Merged
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
| cc.gl.blendFunc(this._blendFunc.src, this._blendFunc.dst); | ||
|
|
||
| var wt = this._worldTransform; | ||
| this._matrix.mat[0] = wt.a; |
There was a problem hiding this comment.
可以把 this._matrix.mat 做个 local property, 下面调用次数还比较多
| if (constructor) { | ||
| return findComponent(this, constructor); | ||
| if (typeOrClassName) { | ||
| var constructor = getConstructor(typeOrClassName); |
There was a problem hiding this comment.
为啥要报错来阻断执行呢？有一些应用场景里面，可能只是尝试获取，获取不到就算了
There was a problem hiding this comment.
只是报错，没有阻断。如果要尝试获取，传入参数更不应该是空。
There was a problem hiding this comment.
哦，是这样的，在 CCNodePool 里面，用户有可能初始化的时候不传递 component，那我在那边处理一下也可以
|
Issues fixed, can be merged now |
| @@ -427,7 +403,7 @@ cc.LabelTTF._firsrEnglish = /^[a-zA-Z0-9ÄÖÜäöüßéèçàùêâîôû]/; | |||
|
|
|||
| if (node._string.length === 0) { | |||
| locLabelCanvas.width = width; | |||
| locLabelCanvas.height = locContentSize.height || 1; | |||
| locLabelCanvas.height = height; | |||
There was a problem hiding this comment.
这里的 height 不是 ContentSize 了，是 texture height
| } | ||
|
|
||
| var locIDs = this._cacheInstanceIds; | ||
| cc.arrayRemoveObject(locIDs, instanceID); |
There was a problem hiding this comment.
cc.arrayRemoveObject 已经被废弃了，现在是 cc.js.array.remove
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/fireball#2787
Changes proposed in this pull request:
@cocos-creator/engine-admins