fixed video player and webview transform #5684
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
2youyou2
reviewed
Nov 6, 2019
| @@ -440,18 +440,17 @@ let VideoPlayerImpl = cc.Class({ | |||
| }, | |||
|
|
|||
| updateMatrix (node) { | |||
| if (!this._video || !this._visible || this._fullScreenEnabled) return; | |||
| if (!this._video || !this._visible || this._fullScreenEnabled || !this._forceUpdate) return; | |||
There was a problem hiding this comment.
不对吧，你这不是只有 _forceUpdate 才会更新了。
如果只是 position 改变了，没必要调用 _forceUpdate 吧
There was a problem hiding this comment.
如果放在原来的位置的话，会一直去计算 transform，那怕 _mat4_tempm 数值没变化也会一直计算
_forceUpdate 只在 video player 隐藏的时候才会为 false
knoxHuang
commented
Nov 6, 2019
| @@ -58,7 +58,6 @@ let VideoPlayerImpl = cc.Class({ | |||
| this._ignorePause = false; | |||
|
|
|||
| // update matrix cache | |||
| this._forceUpdate = true; | |||
| this._m00 = 0; | |||
There was a problem hiding this comment.
看了一下代码发现，在隐藏 videoplayer 的时，updateMatrix 是不会执行的，所以没必要设置该属性，进行移除
2youyou2
approved these changes
Nov 6, 2019
PPpro
reviewed
Nov 8, 2019
| scaleX /= dpr; | ||
| scaleY /= dpr; | ||
| let scaleX = 1 / dpr; | ||
| let scaleY = 1 / dpr; |
There was a problem hiding this comment.
这里可能还是要用 let scaleX = cc.view._scaleX / dpr
不同 canvas 适配模式，可能 scaleY scaleX 不一定为 1
| @@ -496,9 +490,6 @@ let VideoPlayerImpl = cc.Class({ | |||
| let appx = (w * _mat4_tempm[0]) * node._anchorPoint.x; | |||
| let appy = (h * _mat4_tempm[5]) * node._anchorPoint.y; | |||
|
|
|||
| let viewport = cc.view._viewportRect; | |||
| offsetX += viewport.x / dpr; | |||
| offsetY += viewport.y / dpr; | |||
There was a problem hiding this comment.
如果 canvas 组件是其他适配模式的话，可能还是得考虑 viewport 的偏移量
| scaleX /= dpr; | ||
| scaleY /= dpr; | ||
| let scaleX = 1 / dpr; | ||
| let scaleY = 1 / dpr; |
| let appx = (w * _mat4_tempm[0]) * node._anchorPoint.x; | ||
| let appy = (h * _mat4_tempm[5]) * node._anchorPoint.y; | ||
|
|
||
| let viewport = cc.view._viewportRect; | ||
| offsetX += viewport.x / dpr; | ||
| offsetY += viewport.y / dpr; |
|
已经在 camera 变换里计算了 scale 和 viewport 偏移，那就没问题了 |
PPpro
approved these changes
Nov 8, 2019
holycanvas
approved these changes
Nov 8, 2019
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#2050 cocos-creator/2d-tasks#2053
Changes: