Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix crash when no camera render EidtBox, VIdeoPlayer, WebView on native platform #332

Merged
merged 2 commits into from
Aug 28, 2020
Merged

fix crash when no camera render EidtBox, VIdeoPlayer, WebView on native platform #332

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8162b83
fix crash when no camera render EidtBox, VIdeoPlayer, WebView on nati…
PPpro Aug 24, 2020
12a6c7c
update
PPpro Aug 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions engine/jsb-editbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,9 @@
node.getWorldMatrix(worldMat);

let camera = cc.Camera.findCamera(node);
if (!camera) {
return new cc.Rect();
}
camera.getWorldToScreenMatrix2D(cameraMat);
cc.Mat4.multiply(cameraMat, cameraMat, worldMat);

Expand Down
3 changes: 3 additions & 0 deletions engine/jsb-videoplayer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,9 @@
this._h = node._contentSize.height;

let camera = cc.Camera.findCamera(node)._camera;
if (!camera) {
return;
}

let canvas_width = cc.game.canvas.width;
let canvas_height = cc.game.canvas.height;
Expand Down
3 changes: 3 additions & 0 deletions engine/jsb-webview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -269,6 +269,9 @@
this._h = node._contentSize.height;

let camera = cc.Camera.findCamera(node)._camera;
if (!camera) {
return;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should validate camera at the beginning, just after line 253

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

updated

}

let canvas_width = cc.game.canvas.width;
let canvas_height = cc.game.canvas.height;
Expand Down