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

Add newer Variant types to typed_array.h #87992

Merged
merged 1 commit into from
Feb 7, 2024
Merged

Add newer Variant types to typed_array.h #87992

merged 1 commit into from
Feb 7, 2024

Conversation

allenwp
Copy link
Contributor

@allenwp allenwp commented Feb 5, 2024

Fixes #87991

This intentionally omits Object for reasons mentioned in the discussion of the original issue.

@allenwp allenwp requested a review from a team as a code owner February 5, 2024 20:39
@AThousandShips AThousandShips added this to the 4.3 milestone Feb 5, 2024
@allenwp allenwp marked this pull request as draft February 5, 2024 21:12
@allenwp allenwp force-pushed the 87991-typed-array-additions branch from 70a17ce to fe9f124 Compare February 5, 2024 21:14
@fire
Copy link
Member

fire commented Feb 5, 2024 •
edited
Loading

If it's ok, you could leave a comment mentioning the omission intentionally with reasoning.

@allenwp
Copy link
Contributor Author

allenwp commented Feb 5, 2024

If it's ok, you could leave a comment mentioning the omission intentionally with reasoning.

Good idea, I'll make that change.

@allenwp allenwp force-pushed the 87991-typed-array-additions branch from fe9f124 to f4134fd Compare February 5, 2024 21:37
@Mickeon
Copy link
Contributor

Mickeon commented Feb 6, 2024

If the PR is a draft it cannot be considered ready for review, but the PR looks pretty "ready" to me. Are you sure this is still work in progress?

@allenwp
Copy link
Contributor Author

allenwp commented Feb 6, 2024

If the PR is a draft it cannot be considered ready for review, but the PR looks pretty "ready" to me. Are you sure this is still work in progress?

Yes, sorry, just needed to head home for the day yesterday — wanted to actually build it and test it after adding the INFO lines before taking it out of draft. (I put it back into draft when I realized I forgot to update these INFO lines). I plan to have this back in review in about 4 or 5 hours when I’m back in the office and can build again :)

@akien-mga akien-mga changed the title Added newer Variant types to typed_array.h Added newer Variant types to typed_array.h Feb 6, 2024
@Mickeon
Copy link
Contributor

Mickeon commented Feb 6, 2024

No worries! There's no rush, of course. I just wanted to make sure this was not a mistake.

allenwp added a commit to allenwp/godot-cpp that referenced this pull request Feb 6, 2024
@allenwp
Added newer Variant types to typed_array.hpp
fe9dc62 
This is a companion commit to the godot PR godotengine/godot#87992 which fixes godotengine/godot#87991
allenwp added a commit to allenwp/godot-cpp that referenced this pull request Feb 6, 2024
@allenwp
Added newer Variant types to typed_array.hpp
c57f926 
This is a companion commit to the godot PR godotengine/godot#87992 which fixes godotengine/godot#87991
@allenwp allenwp mentioned this pull request Feb 6, 2024
Merged
@allenwp
Copy link
Contributor Author

allenwp commented Feb 6, 2024 •
edited
Loading

No worries! There's no rush, of course. I just wanted to make sure this was not a mistake.

Thanks for the feedback! I'll make a note next time I leave something hanging -- I expect that it's not entirely unheard of for a PR to be left in an unmergable state.

I don't think I've a good job testing the MAKE_TYPED_ARRAY_INFO lines, but they at least build fine. I'll move this back out of draft.

@allenwp allenwp marked this pull request as ready for review February 6, 2024 15:31
allenwp added a commit to allenwp/godot-cpp that referenced this pull request Feb 6, 2024
@allenwp
Added newer Variant types to typed_array.hpp
cd9089c 
This is a companion commit to the godot PR godotengine/godot#87992 which fixes godotengine/godot#87991
allenwp added a commit to allenwp/godot-cpp that referenced this pull request Feb 6, 2024
@allenwp
Added newer Variant types to typed_array.hpp
480e397 
This is a companion commit to the godot PR godotengine/godot#87992 which fixes godotengine/godot#87991
Also syncs up change from godot to undefine typed array templates after use.
allenwp added a commit to allenwp/godot-cpp that referenced this pull request Feb 6, 2024
@allenwp
Added newer Variant types to typed_array.hpp
349b5a3 
This is a companion commit to the godot PR godotengine/godot#87992 which fixes godotengine/godot#87991
Also undefines typed array templates after use to match Godot's typed_array.h
@akien-mga akien-mga merged commit deda5f7 into godotengine:master Feb 7, 2024
16 checks passed
@akien-mga
Copy link
Member

Thanks!

@allenwp allenwp deleted the 87991-typed-array-additions branch February 7, 2024 12:32
enetheru pushed a commit to enetheru/godot-cpp that referenced this pull request Mar 12, 2024
@allenwp @enetheru
Added newer Variant types to typed_array.hpp
aea0603 
This is a companion commit to the godot PR godotengine/godot#87992 which fixes godotengine/godot#87991
Also undefines typed array templates after use to match Godot's typed_array.h
@akien-mga akien-mga added the cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release label May 2, 2024
@akien-mga akien-mga changed the title Added newer Variant types to typed_array.h Add newer Variant types to typed_array.h May 7, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AThousandShips AThousandShips AThousandShips approved these changes

Assignees
No one assigned
Labels
bug cherrypick:4.2 Considered for cherry-picking into a future 4.2.x release topic:core
Projects
None yet
Milestone
4.3
Development

Successfully merging this pull request may close these issues.

C++ MAKE_TYPED_ARRAY does not include newer Variant types
5 participants
@allenwp @fire @Mickeon @akien-mga @AThousandShips