diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-02-24 00:10:27 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2024-02-24 00:10:27 +0000 |
| commit | 80529930ea3bc874c8da22c66343745ff6fdd45b (patch) | |
| tree | 6441b090f24cf33638c5257e6b9eea4f14929503 /game/geoData.h | |
| parent | Merge branch 'glcontainer-fix' (diff) | |
| download | ilt-80529930ea3bc874c8da22c66343745ff6fdd45b.tar.bz2 ilt-80529930ea3bc874c8da22c66343745ff6fdd45b.tar.xz ilt-80529930ea3bc874c8da22c66343745ff6fdd45b.zip | |
Simplify vector addition/subtraction with differnt types
Automatically applies correct rounding with float to int operations, adjusts test
expectations accordingly.
Diffstat (limited to 'game/geoData.h')
| -rw-r--r-- | game/geoData.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/game/geoData.h b/game/geoData.h index e234bfe..15143e8 100644 --- a/game/geoData.h +++ b/game/geoData.h @@ -65,8 +65,7 @@ public: operator*(BaryPosition bari) const { const auto & t {*this}; - return t[0] + GlobalPosition<Dim>(RelativePosition<Dim>(t[1] - t[0]) * bari.x) - + GlobalPosition<Dim>(RelativePosition<Dim>(t[2] - t[1]) * bari.y); + return t[0] + (RelativePosition<Dim>(t[1] - t[0]) * bari.x) + (RelativePosition<Dim>(t[2] - t[1]) * bari.y); } }; |