-
Notifications
You must be signed in to change notification settings - Fork 245
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
Conversation
There was a problem hiding this 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
Line 19 in bfa0f50
glam = { git = "https://github.com/EmbarkStudios/glam-rs", rev = "d55ff75e91aab01c4fd9808e3ca9c079dfa7315c" } |
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" } |
There was a problem hiding this comment.
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.
crates/spirv-std/src/lib.rs
Outdated
@@ -39,8 +39,6 @@ | |||
mod math_ext; | |||
pub use math_ext::MathExt; | |||
|
|||
pub use glam; |
There was a problem hiding this comment.
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.
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. |
@Mergifyio refresh |
Command
|
Does what it says on the tin ;)