diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-12-29 14:12:40 +0000 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2023-12-29 14:12:40 +0000 |
| commit | 048f18e2a0b32044525cef41fa053984433c74b9 (patch) | |
| tree | dfa4a11169654924c55a4dbfb0de3863e1f33342 /gfx | |
| parent | Remove weird operator! on vec2/3 (diff) | |
| download | ilt-048f18e2a0b32044525cef41fa053984433c74b9.tar.bz2 ilt-048f18e2a0b32044525cef41fa053984433c74b9.tar.xz ilt-048f18e2a0b32044525cef41fa053984433c74b9.zip | |
Remove misleading power operator^ on vec2/3
Diffstat (limited to 'gfx')
| -rw-r--r-- | gfx/followCameraController.cpp | 2 | ||||
| -rw-r--r-- | gfx/gl/camera.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/gfx/followCameraController.cpp b/gfx/followCameraController.cpp index 9b23173..5114840 100644 --- a/gfx/followCameraController.cpp +++ b/gfx/followCameraController.cpp @@ -24,7 +24,7 @@ FollowCameraController::updateCamera(Camera * camera) const break; case Mode::Ride: - camera->setView(pos + GlobalPosition3D(up * 4.8F), -sincosf(rot.y) ^ 0.F); + camera->setView(pos + GlobalPosition3D(up * 4.8F), -sincosf(rot.y) || 0.F); break; case Mode::ISO: diff --git a/gfx/gl/camera.cpp b/gfx/gl/camera.cpp index 06e409e..9f40998 100644 --- a/gfx/gl/camera.cpp +++ b/gfx/gl/camera.cpp @@ -18,7 +18,7 @@ Camera::unProject(const ScreenRelCoord & mouse) const { static constexpr const glm::vec4 screen {0, 0, 1, 1}; const auto mouseProjection = glm::lookAt(::origin, forward, up); - return {position, glm::normalize(glm::unProject(mouse ^ 1, mouseProjection, projection, screen))}; + return {position, glm::normalize(glm::unProject(mouse || 1.F, mouseProjection, projection, screen))}; } void |