Get the Makie integration working (#3)

- Act on the axis, not the scene
- Capture the camera via `cameracontrols`
- Update using `update_cam!`
- Operate on axis not figure in the example
- Remove outdated comments

Author: asinghvi17

ext/FlyThroughPathsMakieExt.jl

@@ -3,20 +3,19 @@ module FlyThroughPathsMakieExt
 using FlyThroughPaths
 using Makie
 
-function FlyThroughPaths.capture_view(cam::Camera)
-    view = ViewState(eyeposition = cam.eyeposition[], lookat = cam.lookat[])
-    # TODO: extract fov and upvector from cam
+function FlyThroughPaths.capture_view(cam::Camera3D)
+    view = ViewState(eyeposition = cam.eyeposition[], lookat = cam.lookat[], fov = cam.fov[], upvector = cam.upvector[])
     return view
 end
-FlyThroughPaths.capture_view(scene::Scene) = capture_view(scene.camera)
-FlyThroughPaths.capture_view(fig::Figure) = capture_view(fig.scene)
+FlyThroughPaths.capture_view(scene::Scene) = capture_view(cameracontrols(scene))
+FlyThroughPaths.capture_view(axis::Makie.AbstractAxis) = capture_view(axis.scene) # by convention, all axes have a `ax.scene` that holds the scene with content
 
-function FlyThroughPaths.set_view!(cam::Camera, view::ViewState)
-    cam.eyeposition[] = view.eyeposition
-    cam.lookat[] = view.lookat
-    return cam
+function FlyThroughPaths.set_view!(scene::Scene, view::ViewState)
+    Makie.update_cam!(scene, view.eyeposition, view.lookat, view.upvector)
+    cameracontrols(scene).fov[] = view.fov[]
+    return scene
 end
-FlyThroughPaths.set_view!(scene::Scene, view::ViewState) = set_view!(scene.camera, view)
-FlyThroughPaths.set_view!(fig::Figure, view::ViewState) = set_view!(fig.scene, view)
+
+FlyThroughPaths.set_view!(axis::Makie.AbstractAxis, view::ViewState) = set_view!(axis.scene, view)
 
 end

test/glmakie.jl

@@ -12,7 +12,7 @@ cube = [(x.^2 + y.^2 + z.^2) for x = r, y = r, z = r]
 fig, ax, plt = contour(cube, alpha=0.5)
 display(fig)
 
-view0 = capture_view(fig)
+view0 = capture_view(ax)
 # FIXME: workaround for not knowing how to get the upvector and fov from the camera
 view0 = ViewState(eyeposition=view0.eyeposition, lookat=view0.lookat, upvector=[0, 0, 1], fov=45)
 path = Path(view0)
@@ -24,5 +24,5 @@ path = path * ConstrainedMove(5, ViewState(eyeposition=view0.eyeposition), :rota
 tlist = range(0, stop=15, length=31)
 
 record(fig, "fly_animation.mp4", tlist; framerate=round(Int, length(tlist)/last(tlist))) do t
-    set_view!(fig, path(t))
+    set_view!(ax, path(t))
 end