Manual refactoring #23
Open
Conversation
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
alteous
reviewed
Jan 22, 2022
Comment on lines
+1
to
+106
| #[derive(Clone, Copy, PartialEq)] | ||
| pub struct Vec3 { | ||
| pub x: f32, | ||
| pub y: f32, | ||
| pub z: f32, | ||
| } | ||
|
|
||
| impl Vec3 { | ||
| #[inline] | ||
| pub fn not_zero(x: f32) -> bool { | ||
| x.abs() > f32::MIN_POSITIVE | ||
| } | ||
|
|
||
| pub const fn zero() -> Self { | ||
| Self::new(0.0, 0.0, 0.0) | ||
| } | ||
|
|
||
| pub const fn new(x: f32, y: f32, z: f32) -> Self { | ||
| Self { x, y, z } | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn safe_normalize(self) -> Self { | ||
| if Self::not_zero(self.x) || Self::not_zero(self.y) || Self::not_zero(self.z) { | ||
| self.normalize() | ||
| } else { | ||
| self | ||
| } | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn normalize(self) -> Self { | ||
| self * (1.0 / self.length()) | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn length(self) -> f32 { | ||
| self.length_squared().sqrt() | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn length_squared(self) -> f32 { | ||
| (self.x * self.x) + (self.y * self.y) + (self.z * self.z) | ||
| } | ||
|
|
||
| #[inline] | ||
| pub fn dot(&self, other: Self) -> f32 { | ||
| (self.x * other.x) + (self.y * other.y) + (self.z * other.z) | ||
| } | ||
| } | ||
|
|
||
| impl From<[f32; 3]> for Vec3 { | ||
| fn from([x, y, z]: [f32; 3]) -> Self { | ||
| Self { x, y, z } | ||
| } | ||
| } | ||
|
|
||
| impl From<Vec3> for [f32; 3] { | ||
| fn from(v: Vec3) -> Self { | ||
| [v.x, v.y, v.z] | ||
| } | ||
| } | ||
|
|
||
| impl core::ops::Add for Vec3 { | ||
| type Output = Self; | ||
| fn add(self, rhs: Self) -> Self { | ||
| Self { | ||
| x: self.x + rhs.x, | ||
| y: self.y + rhs.y, | ||
| z: self.z + rhs.z, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl core::ops::Sub for Vec3 { | ||
| type Output = Self; | ||
| fn sub(self, rhs: Self) -> Self { | ||
| Self { | ||
| x: self.x - rhs.x, | ||
| y: self.y - rhs.y, | ||
| z: self.z - rhs.z, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl core::ops::Mul<Vec3> for f32 { | ||
| type Output = Vec3; | ||
| fn mul(self, rhs: Vec3) -> Vec3 { | ||
| Vec3 { | ||
| x: rhs.x * self, | ||
| y: rhs.y * self, | ||
| z: rhs.z * self, | ||
| } | ||
| } | ||
| } | ||
|
|
||
| impl core::ops::Mul<f32> for Vec3 { | ||
| type Output = Self; | ||
| fn mul(self, rhs: f32) -> Self { | ||
| Self { | ||
| x: self.x * rhs, | ||
| y: self.y * rhs, | ||
| z: self.z * rhs, | ||
| } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Is any of this used anywhere? I'm concerned about introducing yet another vector library.
alteous
reviewed
Jan 22, 2022
| bi_tangent: [f32; 3], | ||
| mag_s: f32, | ||
| mag_t: f32, | ||
| [mag_s, mag_t]: [f32; 2], |
Member
There was a problem hiding this comment.
An interesting feature I haven't seen before. :)
alteous
reviewed
Jan 22, 2022
Comment on lines
+72
to
+75
| ctl_pts.push(ControlPoint { | ||
| uv: [0.0, 0.0], | ||
| dir: [1.0, -1.0, 1.0], | ||
| }); |
Member
There was a problem hiding this comment.
Are the formatting changes generated by something?
alteous
reviewed
Jan 22, 2022
| groups: &[Group], | ||
| indices: &[usize], | ||
| thres_cos: f32, | ||
| group_triange_buffer: &[usize], |
Member
There was a problem hiding this comment.
Is this meant to be group_triangle_buffer?
alteous
reviewed
Jan 22, 2022
| triangles: &[Triangle], | ||
| groups: &[Group], | ||
| indices: &[usize], | ||
| thres_cos: f32, |
Member
There was a problem hiding this comment.
It looks like this is trying to say threshold_cos (as in cosine)
alteous
reviewed
Jan 22, 2022
Comment on lines
583
to
584
| // /////////////////////////////////////////////////////////////////////////////////////////////////// | ||
| ///////////////////////////////////////////////////////////////////////////////////////////////////// |
Member
There was a problem hiding this comment.
Whilst you're at it, would you mind removing these comments?
alteous
reviewed
Jan 22, 2022
| mut psTriInfos: *mut STriInfo, | ||
| iMyTriIndex: i32, | ||
| mut pGroup: *mut SGroup, | ||
| fn assign_recur( |
Member
There was a problem hiding this comment.
Please expand: assign_recursive
alteous
reviewed
Jan 22, 2022
| triangles: &mut [Triangle], | ||
| index: usize, | ||
| group: &mut Group, | ||
| group_triange_buffer: &mut [usize], |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
The code has become more ideomatic.
There are no warnings.
There is only one unsafe left.
There are no external dependencies.
Required compiler version upgraded to 1.56. Edition 2021!
Perhaps it makes sense to update the API and release a new version.