diff options
| author | gingerBill <bill@gingerbill.org> | 2020-06-03 21:10:18 +0100 |
|---|---|---|
| committer | gingerBill <bill@gingerbill.org> | 2020-06-03 21:10:18 +0100 |
| commit | ac709b8afb788c795f7cdb1ccfeb2bfe55f2df51 (patch) | |
| tree | a7c557bdbcac02701715a7dcc53b9f82c3b1f3a0 | |
| parent | d80049bfd253b950ad0467717444c2135124af95 (diff) | |
| parent | 239f3c04181f0e04e6988b10decc4b2469d13a51 (diff) | |
Merge branch 'master' of https://github.com/odin-lang/Odin
| -rw-r--r-- | core/math/linalg/specific.odin | 1 | ||||
| -rw-r--r-- | core/math/math.odin | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/core/math/linalg/specific.odin b/core/math/linalg/specific.odin index d8d432494..4eca42000 100644 --- a/core/math/linalg/specific.odin +++ b/core/math/linalg/specific.odin @@ -1,7 +1,6 @@ package linalg import "core:math" -import "intrinsics" // Specific diff --git a/core/math/math.odin b/core/math/math.odin index 86d2ca57a..b0ae373ea 100644 --- a/core/math/math.odin +++ b/core/math/math.odin @@ -116,7 +116,7 @@ unlerp :: proc{unlerp_f32, unlerp_f64}; wrap :: proc(x, y: $T) -> T where intrinsics.type_is_numeric(T), !intrinsics.type_is_array(T) { tmp := mod(x, y); - return wrap + tmp if tmp < 0 else tmp; + return y + tmp if tmp < 0 else tmp; } angle_diff :: proc(a, b: $T) -> T where intrinsics.type_is_numeric(T), !intrinsics.type_is_array(T) { |