Fix Makie issues

examples/rabbit_fox_hawk.jl

@@ -151,7 +151,7 @@ function initialize_model(
     end
     for _ in 1:n_foxes
         pos = random_walkable(model, model.landfinder)
-        add_agent!(pos, Rabbit, model, v0, rand(abmrng(model), Δe_rabbit:2Δe_rabbit))
+        add_agent!(pos, Fox, model, v0, rand(abmrng(model), Δe_rabbit:2Δe_rabbit))
     end
     for _ in 1:n_hawks
         pos = random_walkable(model, model.airfinder)
@@ -371,24 +371,25 @@ model = initialize_model()
 # ```
 
 function animalcolor(a)
-    if kindof(a) == :rabbit
+    if kindof(a) === :Rabbit
         :brown
-    elseif kindof(a) == :fox
+    elseif kindof(a) === :Fox
         :orange
     else
         :blue
     end
 end
-
+    
 # We use `surface!` to plot the terrain as a mesh, and colour it using the `:terrain`
 # colormap. Since the heightmap dimensions don't correspond to the dimensions of the space,
 # we explicitly provide ranges to specify where the heightmap should be plotted.
-function static_preplot!(ax, p)
+const ABMPlot = Agents.get_ABMPlot_type()
+function Agents.static_preplot!(ax::Axis3, p::ABMPlot)
     surface!(
         ax,
         (100/205):(100/205):100,
         (100/205):(100/205):100,
-        p.abmobs[].model.heightmap;
+        p.abmobs[].model[].heightmap;
         colormap = :terrain
     )
 end
@@ -402,7 +403,6 @@ end
 #     framerate = 15,
 #     ac = animalcolor,
 #     as = 1.0,
-#     static_preplot!,
 #     title = "Rabbit Fox Hawk with pathfinding"
 # )
 # ```

ext/AgentsVisualizations/src/abmplot.jl

@@ -132,7 +132,13 @@ end
 function Makie.plot!(p::_ABMPlot)
     model = p.abmobs[].model[]
     ax = p.ax[]
-    p.adjust_aspect[] && (ax.aspect = DataAspect())
+    if p.adjust_aspect[]
+        if ax isa Axis
+            ax.aspect = DataAspect()
+        elseif ax isa Axis3
+            ax.aspect = :data
+        end
+    end
     set_axis_limits!(ax, model)
 
     p.pos, p.color, p.marker, p.markersize = 

ext/AgentsVisualizations/src/spaces/abstract.jl

@@ -3,8 +3,8 @@ Agents.agents_space_dimensionality(model::ABM) =
 
 "Plot agents into a 2D space."
 function Agents.agentsplot!(ax::Axis, p::ABMP)
-    if p._used_poly[]
-        poly!(p, p.marker; p.color, p.agentsplotkwargs...)
+    if user_used_polygons(p.am[], p.marker[])
+        poly!(p, p.marker; p.color, p.marker, p.markersize, p.agentsplotkwargs...)
     else
         scatter!(p, p.pos; p.color, p.marker, p.markersize, p.agentsplotkwargs...)
     end
@@ -13,7 +13,9 @@ end
 
 "Plot agents into a 3D space."
 function Agents.agentsplot!(ax::Axis3, p::_ABMPlot)
-    p.marker[] == :circle && (p.marker[] = Sphere(Point3f(0), 1))
+    if p.am[] === :circle 
+        p.am[], p.marker[] = :Sphere, Sphere(Point3f(0), 1)
+    end
     meshscatter!(p, p.pos; p.color, p.marker, p.markersize, p.agentsplotkwargs...)
     return p
 end