Skip to content

Update dependencies. The piston_window version used in examples should now use rusttype instead of freetype! #710

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

Merged
merged 5 commits into from
Apr 16, 2016

Conversation

mitchmindtree
Copy link
Contributor

This PR is in preparation for the rustc 1.8.0 stable release (which we are waiting for as a result of this issue).

The use of rusttype instead of freetype has not yet been tested and it is very possible that once 1.8.0 drops and this can be tested that we may need to review the rusttype CharacterCache implementation upstream, or re-adjust the text handling in conrod. Hopefully everything just goes smoothly and we're able to merge and publish this straight away!

This should also fix a number of issues:

Note: travis will fail for now, but we'll re-run once travis gets 1.8.0 stable.

@bvssvni
Copy link
Member

bvssvni commented Apr 14, 2016

I was wondering to send an update, but thought you would merge #703 first.

Rust 1.8 was just announced: http://blog.rust-lang.org/2016/04/14/Rust-1.8.html

num = "0.1.30"
rand = "0.3.13"
time = "0.1.34"
vecmath = "0.2.0"

[dev-dependencies]
find_folder = "0.3.0"
piston_window = "0.37.0"
piston = "0.17.0"
Copy link
Contributor

Choose a reason for hiding this comment

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

Did you delete this dependency to piston on purpose?

Copy link
Member

Choose a reason for hiding this comment

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

piston_window reexports everything from piston.

@mitchmindtree mitchmindtree changed the title [Blocked on rustc 1.8.0 stable] Update dependencies. The piston_window version used in examples should now use rusttype instead of freetype! Update dependencies. The piston_window version used in examples should now use rusttype instead of freetype! Apr 15, 2016
@mitchmindtree
Copy link
Contributor Author

Woohoo! rusttype seems to be working nicely!! 🎉 🎈

screen shot 2016-04-15 at 1 33 47 pm

@dylanede thought you might wanna see :)

There's a little blurring, but no worse than what we were getting with freetype-rs, and it looks like we may be able to improve this by using rusttype's gpu cache within the gfx_graphics glyph cache implementation?

Ahh, the scizzor seems to no longer be working:

screen shot 2016-04-15 at 1 37 08 pm

In the above image, the dropdown list should be cropped to the top and bottom of the scrollbar. Here is what the cropping should look like (compiled with current master, so the issue must have been introduced in this PR):

screen shot 2016-04-15 at 1 44 29 pm

@bvssvni any ideas on what might be going on there? Despite how exciting it is that rusttype is working nicely, I think we should probably wait to fix this before merging 😸

@kvark
Copy link
Member

kvark commented Apr 15, 2016

@mitchmindtree once 0.10.2 is published, your scissor should be fixed. Would be best to confirm first, of course. Or you can just go ahead and merge now, since 0.10.2 is not a breaking change and will be picked up automatically, assuming it does fix it.

@kvark
Copy link
Member

kvark commented Apr 16, 2016

@mitchmindtree I've uploaded gfx-0.10.2, and your scissor should be working now.

@mitchmindtree
Copy link
Contributor Author

@kvark Thank you kind sir, you are a legend! Just tested this locally and it's working nicely 👍

Guess it's time to publish and merge then!

Published as 0.33.0

@mitchmindtree mitchmindtree merged commit 996e724 into PistonDevelopers:master Apr 16, 2016
@kvark
Copy link
Member

kvark commented Apr 16, 2016

@mitchmindtree sweet, I was fixing it in a blind 🙈

@bvssvni
Copy link
Member

bvssvni commented Apr 16, 2016

I'm having some problems with the graphics card on my main computer for work. Need some time to set up stuff and make purchases.

@mitchmindtree mitchmindtree deleted the update_deps branch July 31, 2016 06:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
4 participants