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 subscript operator optimizations, remove usage #451

Merged
merged 3 commits into from
Nov 3, 2024
Merged

Add subscript operator optimizations, remove usage #451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2eabbee
Normalize Vector Implementations
kdt3rd Nov 3, 2024
2ac0e8f
Favor using direct member access
kdt3rd Nov 3, 2024
6c05a14
Prefer using getValue
kdt3rd Nov 3, 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
142 changes: 56 additions & 86 deletions src/Imath/ImathBox.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,6 +150,9 @@ typedef Box<V2i> Box2i;
/// 2D box of base type `int64_t`.
typedef Box<V2i64> Box2i64;

/// 2D box of base type `half`.
typedef Box<V2h> Box2h;

/// 2D box of base type `float`.
typedef Box<V2f> Box2f;

Expand All @@ -165,6 +168,9 @@ typedef Box<V3i> Box3i;
/// 3D box of base type `int64_t`.
typedef Box<V3i64> Box3i64;

/// 3D box of base type `half`.
typedef Box<V3h> Box3h;

/// 3D box of base type `float`.
typedef Box<V3f> Box3f;

Expand Down Expand Up @@ -515,48 +521,36 @@ template <class T>
IMATH_HOSTDEVICE inline void
Box<Vec2<T>>::extendBy (const Vec2<T>& point) IMATH_NOEXCEPT
{
if (point[0] < min[0]) min[0] = point[0];

if (point[0] > max[0]) max[0] = point[0];

if (point[1] < min[1]) min[1] = point[1];

if (point[1] > max[1]) max[1] = point[1];
min.x = std::min (min.x, point.x);
max.x = std::max (max.x, point.x);
min.y = std::min (min.y, point.y);
max.y = std::max (max.y, point.y);
}

template <class T>
IMATH_HOSTDEVICE inline void
Box<Vec2<T>>::extendBy (const Box<Vec2<T>>& box) IMATH_NOEXCEPT
{
if (box.min[0] < min[0]) min[0] = box.min[0];

if (box.max[0] > max[0]) max[0] = box.max[0];

if (box.min[1] < min[1]) min[1] = box.min[1];

if (box.max[1] > max[1]) max[1] = box.max[1];
min.x = std::min (min.x, box.min.x);
max.x = std::max (max.x, box.max.x);
min.y = std::min (min.y, box.min.y);
max.y = std::max (max.y, box.max.y);
}

template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec2<T>>::intersects (const Vec2<T>& point) const IMATH_NOEXCEPT
{
if (point[0] < min[0] || point[0] > max[0] || point[1] < min[1] ||
point[1] > max[1])
return false;

return true;
return (point.x >= min.x) && (point.x <= max.x) &&
(point.y >= min.y) && (point.y <= max.y);
}

template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec2<T>>::intersects (const Box<Vec2<T>>& box) const IMATH_NOEXCEPT
{
if (box.max[0] < min[0] || box.min[0] > max[0] || box.max[1] < min[1] ||
box.min[1] > max[1])
return false;

return true;
return (box.min.x <= max.x) && (box.max.x >= min.x) &&
(box.min.y <= max.y) && (box.max.y >= min.y);
}

template <class T>
Expand All @@ -579,19 +573,17 @@ template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec2<T>>::isEmpty () const IMATH_NOEXCEPT
{
if (max[0] < min[0] || max[1] < min[1]) return true;

return false;
return (max.x < min.x || max.y < min.y);
}

template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec2<T>>::isInfinite () const IMATH_NOEXCEPT
{
if (min[0] != std::numeric_limits<T>::lowest () ||
max[0] != std::numeric_limits<T>::max () ||
min[1] != std::numeric_limits<T>::lowest () ||
max[1] != std::numeric_limits<T>::max ())
if (min.x != std::numeric_limits<T>::lowest () ||
max.x != std::numeric_limits<T>::max () ||
min.y != std::numeric_limits<T>::lowest () ||
max.y != std::numeric_limits<T>::max ())
return false;

return true;
Expand All @@ -601,7 +593,7 @@ template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec2<T>>::hasVolume () const IMATH_NOEXCEPT
{
if (max[0] <= min[0] || max[1] <= min[1]) return false;
if (max.x <= min.x || max.y <= min.y) return false;

return true;
}
Expand All @@ -610,12 +602,9 @@ template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline unsigned int
Box<Vec2<T>>::majorAxis () const IMATH_NOEXCEPT
{
unsigned int major = 0;
Vec2<T> s = size ();

if (s[1] > s[major]) major = 1;
Vec2<T> s = size ();

return major;
return (s.x >= s.y) ? 0 : 1;
}

///
Expand Down Expand Up @@ -769,56 +758,42 @@ template <class T>
IMATH_HOSTDEVICE inline void
Box<Vec3<T>>::extendBy (const Vec3<T>& point) IMATH_NOEXCEPT
{
if (point[0] < min[0]) min[0] = point[0];

if (point[0] > max[0]) max[0] = point[0];

if (point[1] < min[1]) min[1] = point[1];

if (point[1] > max[1]) max[1] = point[1];

if (point[2] < min[2]) min[2] = point[2];

if (point[2] > max[2]) max[2] = point[2];
min.x = std::min (min.x, point.x);
min.y = std::min (min.y, point.y);
min.z = std::min (min.z, point.z);
max.x = std::max (max.x, point.x);
max.y = std::max (max.y, point.y);
max.z = std::max (max.z, point.z);
}

template <class T>
IMATH_HOSTDEVICE inline void
Box<Vec3<T>>::extendBy (const Box<Vec3<T>>& box) IMATH_NOEXCEPT
{
if (box.min[0] < min[0]) min[0] = box.min[0];

if (box.max[0] > max[0]) max[0] = box.max[0];

if (box.min[1] < min[1]) min[1] = box.min[1];

if (box.max[1] > max[1]) max[1] = box.max[1];

if (box.min[2] < min[2]) min[2] = box.min[2];

if (box.max[2] > max[2]) max[2] = box.max[2];
min.x = std::min (min.x, box.min.x);
min.y = std::min (min.y, box.min.y);
min.z = std::min (min.z, box.min.z);
max.x = std::max (max.x, box.max.x);
max.y = std::max (max.y, box.max.y);
max.z = std::max (max.z, box.max.z);
}

template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec3<T>>::intersects (const Vec3<T>& point) const IMATH_NOEXCEPT
{
if (point[0] < min[0] || point[0] > max[0] || point[1] < min[1] ||
point[1] > max[1] || point[2] < min[2] || point[2] > max[2])
return false;

return true;
return (point.x >= min.x) && (point.x <= max.x) &&
(point.y >= min.y) && (point.y <= max.y) &&
(point.z >= min.z) && (point.z <= max.z);
}

template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec3<T>>::intersects (const Box<Vec3<T>>& box) const IMATH_NOEXCEPT
{
if (box.max[0] < min[0] || box.min[0] > max[0] || box.max[1] < min[1] ||
box.min[1] > max[1] || box.max[2] < min[2] || box.min[2] > max[2])
return false;

return true;
return (box.min.x <= max.x) && (box.max.x >= min.x) &&
(box.min.y <= max.y) && (box.max.y >= min.y) &&
(box.min.z <= max.z) && (box.max.z >= min.z);
}

template <class T>
Expand All @@ -841,21 +816,19 @@ template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec3<T>>::isEmpty () const IMATH_NOEXCEPT
{
if (max[0] < min[0] || max[1] < min[1] || max[2] < min[2]) return true;

return false;
return (max.x < min.x || max.y < min.y || max.z < min.z);
}

template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec3<T>>::isInfinite () const IMATH_NOEXCEPT
{
if (min[0] != std::numeric_limits<T>::lowest () ||
max[0] != std::numeric_limits<T>::max () ||
min[1] != std::numeric_limits<T>::lowest () ||
max[1] != std::numeric_limits<T>::max () ||
min[2] != std::numeric_limits<T>::lowest () ||
max[2] != std::numeric_limits<T>::max ())
if (min.x != std::numeric_limits<T>::lowest () ||
max.x != std::numeric_limits<T>::max () ||
min.y != std::numeric_limits<T>::lowest () ||
max.y != std::numeric_limits<T>::max () ||
min.z != std::numeric_limits<T>::lowest () ||
max.z != std::numeric_limits<T>::max ())
return false;

return true;
Expand All @@ -865,7 +838,7 @@ template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline bool
Box<Vec3<T>>::hasVolume () const IMATH_NOEXCEPT
{
if (max[0] <= min[0] || max[1] <= min[1] || max[2] <= min[2]) return false;
if (max.x <= min.x || max.y <= min.y || max.z <= min.z) return false;

return true;
}
Expand All @@ -874,14 +847,11 @@ template <class T>
IMATH_HOSTDEVICE IMATH_CONSTEXPR14 inline unsigned int
Box<Vec3<T>>::majorAxis () const IMATH_NOEXCEPT
{
unsigned int major = 0;
Vec3<T> s = size ();

if (s[1] > s[major]) major = 1;
Vec3<T> s = size ();

if (s[2] > s[major]) major = 2;

return major;
if (s.x >= s.y)
return (s.x >= s.z) ? 0 : 2;
return (s.y >= s.z) ? 1 : 2;
}

IMATH_INTERNAL_NAMESPACE_HEADER_EXIT
Expand Down
22 changes: 10 additions & 12 deletions src/Imath/ImathEuler.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -877,18 +877,16 @@ IMATH_HOSTDEVICE Quat<T>
if (_initialRepeated)
{
a[i] = cj * (cs + sc);
a[j] = sj * (cc + ss) *
parity, // NOSONAR - suppress SonarCloud bug report.
a[k] = sj * (cs - sc);
q.r = cj * (cc - ss);
a[j] = sj * (cc + ss) * parity;
a[k] = sj * (cs - sc);
q.r = cj * (cc - ss);
}
else
{
a[i] = cj * sc - sj * cs,
a[j] = (cj * ss + sj * cc) *
parity, // NOSONAR - suppress SonarCloud bug report.
a[k] = cj * cs - sj * sc;
q.r = cj * cc + sj * ss;
a[i] = cj * sc - sj * cs;
a[j] = (cj * ss + sj * cc) * parity;
a[k] = cj * cs - sj * sc;
q.r = cj * cc + sj * ss;
}

q.v = a;
Expand Down Expand Up @@ -984,9 +982,9 @@ Euler<T>::simpleXYZRotation (Vec3<T>& xyzRot, const Vec3<T>& targetXyzRot)
IMATH_NOEXCEPT
{
Vec3<T> d = xyzRot - targetXyzRot;
xyzRot[0] = targetXyzRot[0] + angleMod (d[0]);
xyzRot[1] = targetXyzRot[1] + angleMod (d[1]);
xyzRot[2] = targetXyzRot[2] + angleMod (d[2]);
xyzRot.x = targetXyzRot.x + angleMod (d.x);
xyzRot.y = targetXyzRot.y + angleMod (d.y);
xyzRot.z = targetXyzRot.z + angleMod (d.z);
}

template <class T>
Expand Down
34 changes: 19 additions & 15 deletions src/Imath/ImathFrame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,11 @@ Matrix44<T> constexpr firstFrame (
n.normalize ();
if (n.length () == 0.0f)
{
int i = fabs (t[0]) < fabs (t[1]) ? 0 : 1;
if (fabs (t[2]) < fabs (t[i])) i = 2;

Vec3<T> v (0.0, 0.0, 0.0);

int i = fabs (t.x) < fabs (t.y) ? 0 : 1;
if (fabs (t.z) < fabs (t[i])) i = 2;

v[i] = 1.0;
n = t.cross (v);
n.normalize ();
Expand All @@ -102,18 +103,21 @@ Matrix44<T> constexpr firstFrame (

Matrix44<T> M;

M[0][0] = t[0];
M[0][1] = t[1];
M[0][2] = t[2];
M[0][3] = 0.0, M[1][0] = n[0];
M[1][1] = n[1];
M[1][2] = n[2];
M[1][3] = 0.0, M[2][0] = b[0];
M[2][1] = b[1];
M[2][2] = b[2];
M[2][3] = 0.0, M[3][0] = pi[0];
M[3][1] = pi[1];
M[3][2] = pi[2];
M[0][0] = t.x;
M[0][1] = t.y;
M[0][2] = t.z;
M[0][3] = 0.0;
M[1][0] = n.x;
M[1][1] = n.y;
M[1][2] = n.z;
M[1][3] = 0.0;
M[2][0] = b.x;
M[2][1] = b.y;
M[2][2] = b.z;
M[2][3] = 0.0;
M[3][0] = pi.x;
M[3][1] = pi.y;
M[3][2] = pi.z;
M[3][3] = 1.0;

return M;
Expand Down
12 changes: 6 additions & 6 deletions src/Imath/ImathMatrixAlgo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,10 +834,10 @@ twoSidedJacobiSVD (

// The off-diagonal entries are (effectively) 0, so whatever's left on the
// diagonal are the singular values:
S[0] = A[0][0];
S[1] = A[1][1];
S[2] = A[2][2];
S[3] = A[3][3];
S.x = A[0][0];
S.y = A[1][1];
S.z = A[2][2];
S.w = A[3][3];

// Nothing thus far has guaranteed that the singular values are positive,
// so let's go back through and flip them if not (since by contract we are
Expand Down Expand Up @@ -901,14 +901,14 @@ twoSidedJacobiSVD (
{
for (int i = 0; i < 4; ++i)
U[i][3] = -U[i][3];
S[3] = -S[3];
S.w = -S.w;
}

if (V.determinant () < 0)
{
for (int i = 0; i < 4; ++i)
V[i][3] = -V[i][3];
S[3] = -S[3];
S.w = -S.w;
}
}
}
Expand Down
Loading
Loading