-
-
Notifications
You must be signed in to change notification settings - Fork 22k
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.
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
Add support for external camera feed from external plugin on Android #96705
Conversation
CI failed, you need to fix it and squash the commits after that. |
Here's two previous PRs that have aimed to implement One of the important notes from the discussion on the first PR, is that we already have something in the OpenGL renderer that we're calling an "external texture". To avoid confusion, I think we should rename the old On that PR, I gave the following name suggestions:
|
This needs to be rebased on top of PR #96982, now that that has been merged |
5defe32
to
d4aea7f
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! I haven't tested, but for the most part the code looks good to me :-)
There's just a handful of changes that I don't think are needed.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is looking really good. Few small nitpicking cleanup things David and myself noted, once those are cleaned up this can be merged IMHO.
d4aea7f
to
f810272
Compare
@dsnopek and @BastiaanOlij, just push force the commit to take into account your comments |
f810272
to
5f116dc
Compare
Look good to me! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks! The code looks good to me after the latest changes. The PR is currently failing CI due to minor code formatting issues, but once those are resolved and this is passing tests, then I think it's ready to go :-)
5f116dc
to
c630cf1
Compare
86a11cf
to
b532781
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
And the fix for the comma
b532781
to
90e9fc3
Compare
90e9fc3
to
08dc2fb
Compare
08dc2fb
to
64ae665
Compare
@@ -361,6 +361,7 @@ RasterizerGLES3::RasterizerGLES3() { | |||
cubemap_filter = memnew(GLES3::CubemapFilter); | |||
glow = memnew(GLES3::Glow); | |||
post_effects = memnew(GLES3::PostEffects); | |||
feed_effects = memnew(GLES3::FeedEffects); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This also needs to be freed in RasterizerGLES3::finalize
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
One small nitpick fix and I think this is good to merge.
The commits will need to be squashed before this can be merged; check out the documentation for a guide |
@Repiteo my last fork sync with master seams to have messed up my commit history, do you think I need to do anything more than squashing the fixup? i.e. can the merge stay or do I need to remove that and rebase instead? |
It should be removed and rebased, yeah. Merging against master is a common beginner's trap for amend/rebase workflows, but it's thankfully one that's relatively easy to resolve. For the sake of clarity: the endgoal is to make the |
Yes I don't know why this latest sync ended up being a merge when all the
previous ones where rebase. I will do it manually for now on.
Le mer. 30 oct. 2024, 16:39, Thaddeus Crews ***@***.***> a
écrit :
… It should be removed and rebased, yeah. Merging against master is a common
beginner's trap for amend/rebase workflows, but it's thankfully one that's
relatively easy to resolve. For the sake of clarity: the endgoal is to make
the Added external camera feed from external plugin on Android commit the
*only* commit on this PR
—
Reply to this email directly, view it on GitHub
<#96705 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AK6RF3FBZJKSDBGYKFDKIVLZ6D4T5AVCNFSM6AAAAABN22X32CVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDINBXGU4DCMRTHA>
.
You are receiving this because you authored the thread.Message ID:
***@***.***>
|
5c85afa
to
6f846eb
Compare
Thanks! Congratulations on your first contribution! 🎉 |
This MR reflects the implementation of proposal godotengine/godot-proposals#10678
As indicated in the proposal, these changes are needed for the creation of an ARCore plugin basic feature: camera feed display.