X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMoof%2FMath.hh;h=a38af8b049dd77357c175aa79ecb2c5d5969c810;hp=26c4b5180dc61395c97752bd133b606de9285b10;hb=bfa6212d09d8735d8fd5e2638188e4a99f21ada4;hpb=eebb993ca929c3f4c235cad9e01dc4797fcd2945 diff --git a/src/Moof/Math.hh b/src/Moof/Math.hh index 26c4b51..a38af8b 100644 --- a/src/Moof/Math.hh +++ b/src/Moof/Math.hh @@ -68,12 +68,27 @@ inline Vector3& demoteVector(Vector3& left, const Vector4& right) return left; } -inline Vector4& promoteVector(Vector4& left, const Vector3& right) +inline Vector2& demoteVector(Vector2& left, const Vector3& right) +{ + left[0] = right[0]; + left[1] = right[1]; + return left; +} + +inline Vector4& promoteVector(Vector4& left, const Vector3& right, Scalar extra = 1.0) { left[0] = right[0]; left[1] = right[1]; left[2] = right[2]; - left[3] = 1.0; + left[3] = extra; + return left; +} + +inline Vector3& promoteVector(Vector3& left, const Vector2& right, Scalar extra = 1.0) +{ + left[0] = right[0]; + left[1] = right[1]; + left[3] = extra; return left; }