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.

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

Pull request for 2.6.x CSFML #186

Merged
merged 3 commits into from Jun 26, 2023
Merged

Pull request for 2.6.x CSFML #186

merged 3 commits into from Jun 26, 2023

Conversation

dogunbound
Copy link
Contributor

@dogunbound dogunbound commented May 17, 2023

This PR will be for getting all of the 2.6.x features into CSFML. Here is a test project that I have an open source to test the project with. Currently, I have font enabled and disabled by pressing the s key https://github.com/dogunbound/CSFML_2.6_sample

I hope we can hack this out. 2.6.x is pretty stable, so I think it would be good to begin working on this.

Basically, we need to slowly go through EVERY pull request and see if any change needs to be made and make those changes. If there aren't any changes needed for a specific pull request, mark it as complete.
todo list:

@dogunbound dogunbound marked this pull request as draft May 17, 2023 01:37
@eXpl0it3r
Copy link
Member

eXpl0it3r commented May 17, 2023

Oh what a list! Thanks for putting this together, even though many fixes won't have a direct effect on CSFML's API.

Need to update the ci.yml to use the 2.6.x branch (and later 2.6.0 tag)

ref: 2.5.1

@dogunbound dogunbound force-pushed the 2.6_branch branch 2 times, most recently from b5b3924 to 5b8acd2 Compare May 25, 2023 21:04
@dogunbound
Copy link
Contributor Author

dogunbound commented May 26, 2023

Someone Might want to test the packets getter function added in this function 5b8acd2 . I haven't got the slightest idea as to how I would test it.

@shane-tran-whitmire
Copy link

@eXpl0it3r @ChrisThrasher

I managed to hack through the entire list for all of the obvious ones that don't need updates on CSFML's end. The rest of the unchecked issues / PRs are ones that I wasn't sure needed changes to CSFML's end, or one's that need changes to CSFML's end. If you could help me go through the rest of this list, that would be grand.

@ChrisThrasher
Copy link
Member

To make sure I understand, you went through every PR after 2.5.1 and make checkboxes in this issue with indicating whether or not we have more work to do to implement a given PR in CSFML? Wow that's an incredible effort and I really appreciate it. This will make it so much easier to know what all is remaining to do on CSFML 2.6.0.

@shane-tran-whitmire
Copy link

To make sure I understand, you went through every PR after 2.5.1 and make checkboxes in this issue with indicating whether or not we have more work to do to implement a given PR in CSFML? Wow that's an incredible effort and I really appreciate it. This will make it so much easier to know what all is remaining to do on CSFML 2.6.0.

To be specific, I got the changelog.md change from this PR https://github.com/SFML/SFML/pull/2482/files?diff=unified&w=0 and parsed all of the numbers for matching pull requests.

@shane-tran-whitmire
Copy link

shane-tran-whitmire commented Jun 7, 2023

@ChrisThrasher I should also add, there are already a couple of additions in this pull request. I have font smoothing disabling (a feature I REALLY want on rust-sfml), and some networking feature already committed.

Copy link
Member

@ChrisThrasher ChrisThrasher left a comment

Choose a reason for hiding this comment

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

Just a few simple formatting fixes to get started

include/SFML/Graphics/Font.h Outdated Show resolved Hide resolved
include/SFML/Graphics/Font.h Outdated Show resolved Hide resolved
src/SFML/Graphics/Font.cpp Show resolved Hide resolved
src/SFML/Graphics/Font.cpp Show resolved Hide resolved
src/SFML/Graphics/Font.cpp Show resolved Hide resolved
src/SFML/Network/Packet.cpp Show resolved Hide resolved
src/SFML/Network/Packet.cpp Show resolved Hide resolved
@eXpl0it3r
Copy link
Member

Re-triggered the job runs, now that the 2.6.0 tag actually exists.

@ChrisThrasher
Copy link
Member

Can we move this list into a separate issue that we can incrementally tackle these changes over multiple PRs? That will make it easier for multiple people to work concurrently if need be. We can still merge the progress already made in this PR.

@ChrisThrasher
Copy link
Member

See #187 for this same list but in a separate issue. Please do not use this particular PR for more work progress tracking.

@dogunbound dogunbound marked this pull request as ready for review June 25, 2023 17:39
@dogunbound
Copy link
Contributor Author

Marked it as non-draft. You can merge it now.

@eXpl0it3r eXpl0it3r merged commit 7d2ebaf into SFML:master Jun 26, 2023
5 checks passed
@eXpl0it3r
Copy link
Member

Thank you for getting this started! 🙂

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants