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 /gfx | |
| 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 'gfx')
| -rw-r--r-- | gfx/followCameraController.cpp | 4 | ||||
| -rw-r--r-- | gfx/gl/camera.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp index 5114840..52dfb35 100644 --- a/gfx/followCameraController.cpp +++ b/gfx/followCameraController.cpp @@ -24,11 +24,11 @@ FollowCameraController::updateCamera(Camera * camera) const break; case Mode::Ride: - camera->setView(pos + GlobalPosition3D(up * 4.8F), -sincosf(rot.y) || 0.F); + camera->setView(pos + (up * 4.8F), -sincosf(rot.y) || 0.F); break; case Mode::ISO: - camera->setView(pos + GlobalPosition3D((up + north + east) * 40.F), glm::normalize(down + south + west), + camera->setView(pos + ((up + north + east) * 40.F), glm::normalize(down + south + west), glm::normalize(up - north - east)); break; } diff --git a/gfx/gl/camera.cpp b/gfx/gl/camera.cpp index fb711dd..82b11a6 100644 --- a/gfx/gl/camera.cpp +++ b/gfx/gl/camera.cpp @@ -43,7 +43,7 @@ Camera::extentsAtDist(const GlobalDistance dist) const if (target.z < -1500) { const CalcPosition3D diff = target - position; const CalcDistance limit = -1500 - position.z; - return {position + GlobalPosition3D((limit * diff) / diff.z), (limit * dist) / diff.z}; + return {position + ((limit * diff) / diff.z), (limit * dist) / diff.z}; } return {target, dist}; }; |