summaryrefslogtreecommitdiff
path: root/gfx/gl/camera.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gfx/gl/camera.cpp')
-rw-r--r--gfx/gl/camera.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/gfx/gl/camera.cpp b/gfx/gl/camera.cpp
index d362b94..fb711dd 100644
--- a/gfx/gl/camera.cpp
+++ b/gfx/gl/camera.cpp
@@ -13,7 +13,7 @@ Camera::Camera(GlobalPosition3D pos, Angle fov, Angle aspect, GlobalDistance zNe
updateView();
}
-Ray
+Ray<GlobalPosition3D>
Camera::unProject(const ScreenRelCoord & mouse) const
{
static constexpr const glm::vec4 screen {0, 0, 1, 1};
@@ -31,8 +31,8 @@ Camera::updateView()
Direction3D
Camera::upFromForward(const Direction3D & forward)
{
- const auto right = glm::cross(forward, ::down);
- return glm::cross(forward, right);
+ const auto right = crossProduct(forward, ::down);
+ return crossProduct(forward, right);
}
std::array<GlobalPosition4D, 4>