Fix calculation of focal length for RPRMakie

MakieOrg · Dec 20, 2023 · f2dba05 · f2dba05
1 parent e3d834d
commit f2dba05
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/RPRMakie/src/scene.jl b/RPRMakie/src/scene.jl
@@ -5,7 +5,6 @@ function update_rpr_camera!(oldvals, camera, cam_controls, cam)
     c = cam_controls
     l, u, p, fov = c.lookat[], c.upvector[], c.eyeposition[], c.fov[]
     far, near, res = c.far[], c.near[], cam.resolution[]
-    fov = 45f0 # The current camera ignores fov updates
     new_vals = (; l, u, p, fov, far, near, res)
     new_vals == oldvals && return oldvals
     wd = norm(l - p)
@@ -14,8 +13,8 @@ function update_rpr_camera!(oldvals, camera, cam_controls, cam)
     lookat!(camera, p, l, u)
     RPR.rprCameraSetFarPlane(camera, far)
     RPR.rprCameraSetNearPlane(camera, near)
-    h = norm(res)
-    RPR.rprCameraSetFocalLength(camera, (30*h)/fov)
+    focal_length = res[2] / (2 * tand(fov / 2)) # fov is vertical
+    RPR.rprCameraSetFocalLength(camera, focal_length)
     # RPR_CAMERA_FSTOP
     # RPR_CAMERA_MODE
     return new_vals