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.

Sign up for GitHub

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 swizzle variants of with_X methods #584

Merged
merged 7 commits into from
Nov 13, 2024
Merged

Add swizzle variants of with_X methods #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
1068752
Add swizzle variants of `with_X` methods
tim-blackbird Nov 10, 2024
72a760f
Rename trait template variables
tim-blackbird Nov 10, 2024
23ca972
Merge branch 'main' of https://github.com/bitshifter/glam-rs into wit…
tim-blackbird Nov 11, 2024
b0c2ce1
Add tests
tim-blackbird Nov 11, 2024
c5435c7
fmt :/
tim-blackbird Nov 11, 2024
db7c241
Greatly increase readability of the tests
tim-blackbird Nov 11, 2024
16778bd
Cleanup macro invocation
tim-blackbird Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 38 additions & 0 deletions codegen/templates/swizzle_impl.rs.tera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,24 @@ impl Vec{{ dim }}Swizzles for {{ self_t }} {
#[must_use]
fn {{ e[j0] }}{{ e[j1] }}(self) -> {{ vec2_t }} {
{{ vec2_t }} { x: self.{{ e[j0] }}, y: self.{{ e[j1] }} }
}
{% endif %}
{% set skip = dim == 2 or j0 == j1 %}
{% if not skip %}
#[inline]
#[must_use]
fn with_{{ e[j0] }}{{ e[j1] }}(self, rhs: {{ vec2_t }}) -> Self {
Self::new(
{% for l in range(start = 0, end = dim) %}
{% if j0 == l %}
rhs.x,
{% elif j1 == l %}
rhs.y,
{% else %}
self.{{e[l]}},
{% endif %}
{% endfor %}
)
}
{% endif %}
{% else %}
Expand All @@ -78,6 +96,26 @@ impl Vec{{ dim }}Swizzles for {{ self_t }} {
{% else %}
{{ vec3_t }}::new(self.{{ e[j0] }}, self.{{ e[j1] }}, self.{{ e[j2] }})
{% endif %}
}
{% endif %}
{% set skip = dim == 3 or j0 == j1 or j0 == j2 or j1 == j2 %}
{% if not skip %}
#[inline]
#[must_use]
fn with_{{ e[j0] }}{{ e[j1] }}{{ e[j2] }}(self, rhs: {{ vec3_t }}) -> Self {
Self::new(
{% for l in range(start = 0, end = dim) %}
{% if j0 == l %}
rhs.x,
{% elif j1 == l %}
rhs.y,
{% elif j2 == l %}
rhs.z,
{% else %}
self.{{e[l]}},
{% endif %}
{% endfor %}
)
}
{% endif %}
{% else %}
Expand Down
26 changes: 17 additions & 9 deletions codegen/templates/swizzle_traits.rs.tera
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,16 +3,16 @@
{% set components = ["x", "y", "z", "w"] %}
{% set dimensions = [2, 3, 4] %}
{% for dim in dimensions %}
{% set ret2 = "Self::Vec2" %}
{% set ret3 = "Self::Vec3" %}
{% set ret4 = "Self::Vec4" %}
{% set vec2_t = "Self::Vec2" %}
{% set vec3_t = "Self::Vec3" %}
{% set vec4_t = "Self::Vec4" %}

{% if dim == 4 %}
{% set ret4 = "Self" %}
{% set vec4_t = "Self" %}
{% elif dim == 3 %}
{% set ret3 = "Self" %}
{% set vec3_t = "Self" %}
{% elif dim == 2 %}
{% set ret2 = "Self" %}
{% set vec2_t = "Self" %}
{% endif %}

pub trait Vec{{ dim }}Swizzles: Sized + Copy + Clone {
Expand Down Expand Up @@ -52,20 +52,28 @@
{% if i == 2 %}
{% set skip = dim == 2 and e0 == "x" and e1 == "y" %}
{% if not skip %}
fn {{e0}}{{e1}}(self) -> {{ret2}};
fn {{e0}}{{e1}}(self) -> {{ vec2_t }};
{% endif %}
{% set skip = dim == 2 or e0 == e1 %}
{% if not skip %}
fn with_{{e0}}{{e1}}(self, rhs: {{ vec2_t }}) -> Self;
{% endif %}
{% else %}
{% for e2 in components | slice(end=dim) %}
{% if i == 3 %}
{% set skip = dim == 3 and e0 == "x" and e1 == "y" and e2 == "z" %}
{% if not skip %}
fn {{e0}}{{e1}}{{e2}}(self) -> {{ret3}};
fn {{e0}}{{e1}}{{e2}}(self) -> {{ vec3_t }};
{% endif %}
{% set skip = dim == 3 or e0 == e1 or e0 == e2 or e1 == e2 %}
{% if not skip %}
fn with_{{e0}}{{e1}}{{e2}}(self, rhs: {{ vec3_t }}) -> Self;
{% endif %}
{% else %}
{% for e3 in components | slice(end=dim) %}
{% set skip = dim == 4 and e0 == "x" and e1 == "y" and e2 == "z" and e3 == "w" %}
{% if not skip %}
fn {{e0}}{{e1}}{{e2}}{{e3}}(self) -> {{ret4}};
fn {{e0}}{{e1}}{{e2}}{{e3}}(self) -> {{ vec4_t }};
{% endif %}
{% endfor %}
{% endif %}
Expand Down
36 changes: 36 additions & 0 deletions src/swizzles/coresimd/vec3a_impl.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ impl Vec3Swizzles for Vec3A {
}
}

#[inline]
#[must_use]
fn with_xy(self, rhs: Vec2) -> Self {
Self::new(rhs.x, rhs.y, self.z)
}

#[inline]
#[must_use]
fn xz(self) -> Vec2 {
Expand All @@ -38,6 +44,12 @@ impl Vec3Swizzles for Vec3A {
}
}

#[inline]
#[must_use]
fn with_xz(self, rhs: Vec2) -> Self {
Self::new(rhs.x, self.y, rhs.y)
}

#[inline]
#[must_use]
fn yx(self) -> Vec2 {
Expand All @@ -47,6 +59,12 @@ impl Vec3Swizzles for Vec3A {
}
}

#[inline]
#[must_use]
fn with_yx(self, rhs: Vec2) -> Self {
Self::new(rhs.y, rhs.x, self.z)
}

#[inline]
#[must_use]
fn yy(self) -> Vec2 {
Expand All @@ -65,6 +83,12 @@ impl Vec3Swizzles for Vec3A {
}
}

#[inline]
#[must_use]
fn with_yz(self, rhs: Vec2) -> Self {
Self::new(self.x, rhs.x, rhs.y)
}

#[inline]
#[must_use]
fn zx(self) -> Vec2 {
Expand All @@ -74,6 +98,12 @@ impl Vec3Swizzles for Vec3A {
}
}

#[inline]
#[must_use]
fn with_zx(self, rhs: Vec2) -> Self {
Self::new(rhs.y, self.y, rhs.x)
}

#[inline]
#[must_use]
fn zy(self) -> Vec2 {
Expand All @@ -83,6 +113,12 @@ impl Vec3Swizzles for Vec3A {
}
}

#[inline]
#[must_use]
fn with_zy(self, rhs: Vec2) -> Self {
Self::new(self.x, rhs.y, rhs.x)
}

#[inline]
#[must_use]
fn zz(self) -> Vec2 {
Expand Down
Loading