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

Add trunc and fract to MathExt #222

Merged
merged 1 commit into from
Nov 13, 2020
Merged

Add trunc and fract to MathExt #222

merged 1 commit into from
Nov 13, 2020

Conversation

fu5ha
Copy link
Member

@fu5ha fu5ha commented Nov 10, 2020

Does what it says on the tin ;)

@fu5ha fu5ha requested a review from khyperia November 10, 2020 22:18
@fu5ha fu5ha added c: spirv-std Issues specific to the spirv-std crate t: enhancement A new feature or improvement to an existing one. t: ergonomics Language ergonomics discussions and experimentation labels Nov 10, 2020
Copy link
Contributor

@khyperia khyperia left a comment

Choose a reason for hiding this comment

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

neat! this commit is included in the other PR, so github might get a little confused here, but yeah~

also looks like the commit hash in

glam = { git = "https://github.com/EmbarkStudios/glam-rs", rev = "d55ff75e91aab01c4fd9808e3ca9c079dfa7315c" }
is absolutely borked - I think you're going to have to update that to whatever the spirv branch is for CI to pass (I'm guessing someone force-pushed the branch)

Cargo.toml Outdated
@@ -16,4 +16,4 @@ members = [

[patch.crates-io]
# https://github.com/bitshifter/glam-rs/pull/85
glam = { git = "https://github.com/EmbarkStudios/glam-rs", rev = "d55ff75e91aab01c4fd9808e3ca9c079dfa7315c" }
glam = { git = "https://github.com/EmbarkStudios/glam-rs", branch = "spirv" }
Copy link
Member

Choose a reason for hiding this comment

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

Probably want to rebase onto #220 since that will conflict with this change.

@fu5ha fu5ha mentioned this pull request Nov 11, 2020
@fu5ha fu5ha requested a review from khyperia November 11, 2020 22:01
@@ -39,8 +39,6 @@
mod math_ext;
pub use math_ext::MathExt;

pub use glam;
Copy link
Contributor

@khyperia khyperia Nov 12, 2020

Choose a reason for hiding this comment

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

@XAMPPRocky explicitly added this in #220, so we should figure out if we want this or not (I said 👍 to her adding it, so I think we should keep it).

Also, there's some issues with overriding versions in cargo.toml, in particular people referencing crates through a git reference will not pick up the workspace override, so keeping the override in the crate instead of the workspace is good.

edit: oh, sorry, missed the recent conversation in 220. Let's talk about it in the meeting today.

@khyperia khyperia mentioned this pull request Nov 12, 2020
@fu5ha
Copy link
Member Author

fu5ha commented Nov 12, 2020

Okay, so based on meeting convo, I reverted back to pub use glam for now, pending figuring out how we can upstream to glam. Will just be using patching in ark/macaw for now.

@khyperia
Copy link
Contributor

@Mergifyio refresh

@mergify
Copy link
Contributor

mergify bot commented Nov 13, 2020

Command refresh: success

Pull request refreshed

@mergify mergify bot merged commit a79da96 into EmbarkStudios:main Nov 13, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
c: spirv-std Issues specific to the spirv-std crate t: enhancement A new feature or improvement to an existing one. t: ergonomics Language ergonomics discussions and experimentation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants