-
Notifications
You must be signed in to change notification settings - Fork 68
Add Shape::transform
#213
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
Open
tymokvo
wants to merge
10
commits into
bschwind:main
Choose a base branch
from
TEECOM:tmk/transform-shape
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Add Shape::transform
#213
Changes from all commits
Commits
Show all changes
10 commits
Select commit
Hold shift + click to select a range
85b87ee
Stub transform method
tymokvo c03e313
Add transform module
tymokvo 3db289c
Pass transform test
tymokvo 6033b71
Document transform function
tymokvo a16cecb
Add transform lib
tymokvo 2a17091
Add comments
tymokvo 8b31087
Rearrange test to ensure state validity
tymokvo fd708b7
Use more complex matrix in test
tymokvo a87a19d
Remove unused comment section
tymokvo 28885f6
Allow too many arguments for cpp SetValues wrapper
tymokvo File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| use cxx::UniquePtr; | ||
| use glam::DMat4; | ||
| use opencascade_sys::ffi; | ||
|
|
||
| /// Create a `gp_Trsf` from a `DMat4`. | ||
| /// | ||
| /// Note that OCC only allows setting values for the upper 3x4 matrix. I.e. the | ||
| /// XYZ components of each column. | ||
| /// | ||
| /// Additionally, OCC ensures orthogonality of the matrix before the method | ||
| /// returns. | ||
| pub fn gp_trsf(mat: &DMat4) -> UniquePtr<ffi::gp_Trsf> { | ||
| let mut t = ffi::new_transform(); | ||
| t.pin_mut().SetValues( | ||
| mat.x_axis.x, | ||
| mat.y_axis.x, | ||
| mat.z_axis.x, | ||
| mat.w_axis.x, | ||
| mat.x_axis.y, | ||
| mat.y_axis.y, | ||
| mat.z_axis.y, | ||
| mat.w_axis.y, | ||
| mat.x_axis.z, | ||
| mat.y_axis.z, | ||
| mat.z_axis.z, | ||
| mat.w_axis.z, | ||
| ); | ||
| t | ||
| } | ||
|
|
||
| #[cfg(test)] | ||
| mod test { | ||
| use super::*; | ||
| #[test] | ||
| fn set_gp_trsf_values() { | ||
| // Matrix with permuted axes | ||
| let m = glam::dmat4( | ||
| glam::dvec4(0.0, 0.0, 1.0, 0.0), | ||
| glam::dvec4(1.0, 0.0, 0.0, 0.0), | ||
| glam::dvec4(0.0, 1.0, 0.0, 0.0), | ||
| glam::dvec4(0.0, 0.0, 0.0, 1.0), | ||
| ); | ||
|
|
||
| let t = gp_trsf(&m); | ||
|
|
||
| // 3D diagonal is 0 | ||
| assert_eq!(t.Value(1, 1), 0.0); | ||
| assert_eq!(t.Value(2, 2), 0.0); | ||
| assert_eq!(t.Value(3, 3), 0.0); | ||
|
|
||
| // Permuted axes are preserved | ||
| assert_eq!(t.Value(1, 2), 1.0); | ||
| assert_eq!(t.Value(3, 1), 1.0); | ||
| assert_eq!(t.Value(2, 3), 1.0); | ||
| } | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.
Could you pull
trueinto a named local variable?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.
Will do! Sorry for taking so long. Very busy at work the past several weeks!