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

Update to 2.4 #102

Merged
merged 20 commits into from Sep 29, 2016
Merged

Update to 2.4 #102

merged 20 commits into from Sep 29, 2016

Conversation

dabbertorres
Copy link
Contributor

@dabbertorres dabbertorres commented Aug 12, 2016 •
edited

I went through the changelogs for 2.3 and 2.4 and made the relevant changes in CSFML.

I believe I got everything. Let me know if I am missing anything.

I left the commits split up for easier navigation/checking before merging - I can squash them beforehand, if a merge is desired.

If it is decided this looks good, I can update SFML.NET as well.

zsbzsb and others added 18 commits September 26, 2015 10:09
@zsbzsb
Added support for outlined text
068bb14
@DJMaster
Added return value to function sfSoundBufferRecorder_start
9d75758
@DJMaster
Added missing sfShader_isGeometryAvailable(void) function
da9cce8
@DJMaster
Modified sfShader_createFromFile, sfShader_createFromMemory and sfSha…
bf46c53 
…der_createFromStream functions to allow loading of all three vertex + geometry + fragment shaders
@dabbertorres
Copied/Converted SFML_DEPRECATED to CSFML.
21e8e05
@dabbertorres
Deprecated capture(), added mouse grabbing API.
ce5e3a3 
Deprecated: sfImage* sfRenderWindow_capture(const sfRenderWindow*);

Added: sfRenderWindow_setMouseCursorGrabbed(sfRenderWindow*, sfBool);
Added: sfWindow_setMouseCursorGrabbed(sfWindow*, sfBool);

Also reordered some functions according to order in SFML.
@dabbertorres
Add Glsl typedefs for sf::Shader::setUniform API.
826ebac
@dabbertorres
Added geometry shader support.
36430b1
@dabbertorres
Implemented new setUniform API for shaders.
16ea259 
Deprecated old setParameter API.
@dabbertorres
Merged zsbzsb's outlined text branch.
864d7b8
@dabbertorres
Renamed/deprecated sfPrimitiveType values.
490a21f 
sfLinesStrip     -> sfLineStrip
sfTrianglesStrip -> sfTriangleStrip
sfTrianglesFan   -> sfTriangleFan
@dabbertorres
Added sRGB support to sfTexture.
784b200
@dabbertorres
Added ReverseSubtract sfBlendMode
ae727f0
@dabbertorres
Added mipmaps to sfRenderTexture and sfTexture.
962a685
@dabbertorres
Fixed spacing...
15995fa
@dabbertorres
Added stereo recording support to sfSoundRecorder.
3c70f99
@dabbertorres
Added address arg to listen/bind on (sockets)
41fa944
@dabbertorres
Correctly deprecated sfMouseWheelEvent.
470bf3d 
Corrected some spacing/alignment.
@dabbertorres
Merge pull request #1 from DJMaster/audio-patch
ac9b33d 
Added return value to function sfSoundBufferRecorder_start
@dabbertorres
Copy link
Contributor Author

Added the changes by @DJMaster in #101.

@DJMaster
Copy link
Contributor

Hello Alec,
looking at 36430b1 it looks to me that only last compiled shader is loaded. Infact I've tested your changes, but they don't work for me (testing SFML Shader example, rewritten in FreePascal, using a CSFML FreePascal binding).

My implementation is available at https://github.com/DJMaster/CSFML/tree/shader-patch (commits DJMaster@da9cce8 and DJMaster@bf46c53)

Please also take a look at #100.

@dabbertorres
Copy link
Contributor Author

Oh, oops. That would do it. Thanks. Do you mind if I just merge your branch onto this?

@oprypin
Copy link
Member

oprypin commented Aug 13, 2016

Here's a compilation of API changes, check it out in case you forgot something

https://gist.github.com/a8bc3e28fe52076c2ca2a2c4bbcedc06

@dabbertorres
Copy link
Contributor Author

dabbertorres commented Aug 13, 2016 •
edited

@DJMaster, I merged your DJMaster/CSFML@da9cce8 and DJMaster/CSFML@bf46c53 over this branch.

Thanks for the list @BlaXpirit.

@DJMaster
Copy link
Contributor

@dabbertorres well done, but as I mentioned in #100 I consider it a temporary workaround.

@dabbertorres
Copy link
Contributor Author

dabbertorres commented Aug 13, 2016 •
edited

I took it as more than temporary because it is most in line with SFML's API.

Personally, I'd go for an API with an add(shaderSource, shaderType) and compile() functions, as that resolves this issue.

But, that'd have to wait for yet another version. Haha.

@DJMaster
Copy link
Contributor

@dabbertorres: sfShader_add and sfShader_compile functions will be much more flexible.

@tapir
Copy link

tapir commented Aug 18, 2016 •
edited

Is there any news about merger of this pull? I would like to update my Go bindings. (Shameless plug: https://gitlab.com/tapir/sfml)

@zsbzsb
Copy link
Member

zsbzsb commented Aug 18, 2016

I will look over it this weekend, btw thanks @dabbertorres for organizing this.

@LaurentGomila
Copy link
Member

I will look over it this weekend

👍

@dabbertorres
Copy link
Contributor Author

dabbertorres commented Aug 19, 2016 •
edited

In addition, I've got a SFML.NET fork based off this PR. Once issues here get ironed out, I'll update it accordingly and can make a PR there.

btw thanks @dabbertorres for organizing this.

Happy to help!

@tapir
Copy link

tapir commented Aug 26, 2016

@zsbzsb any news :)

@crumblingstatue crumblingstatue mentioned this pull request Aug 30, 2016
Closed
3 tasks
@crumblingstatue
Copy link
Contributor

Are there any blockers on this?

I'd really like to update rust-sfml against SFML 2.4, as it fixes a really annoying music playback bug.

@tapir
Copy link

tapir commented Sep 9, 2016

I need this too. Please can we merge it

On 9 Sep 2016 22:16, "Mika Attila" notifications@github.com wrote:

Are there any blockers on this?

I'd really like to update rust-sfml against SFML 2.4, as it fixes a really
annoying music playback bug.

—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#102 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AANq8OoHyD2lk72DhqpspXStYuuYTjm8ks5qobCbgaJpZM4Jji0g
.

@tapir
Copy link

tapir commented Sep 29, 2016

What is the problem with this merge? Can you at least point out the problem so we can make a new PR maybe.

@LaurentGomila
Copy link
Member

The only problem with this PR is that nobody has had the time yet to review it.

It's a big modification, and it would take a huge amount of time to compare every added/modified function against the SFML 2.4 changelog, so I'll have to trust you ;)

Let's merge it so that people can use it (and unlock their own bindings based on CSFML), and if something's wrong we can write patches later.

Thanks for this huge contribution!

@LaurentGomila LaurentGomila merged commit 0e8c637 into SFML:master Sep 29, 2016
@crumblingstatue crumblingstatue mentioned this pull request Sep 29, 2016
Closed
@crumblingstatue
Copy link
Contributor

Note to self: Actually try out a pull request before asking for it to be merged.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@dabbertorres @DJMaster @oprypin @tapir @zsbzsb @LaurentGomila @crumblingstatue