diff --git a/src/MeshCat.jl b/src/MeshCat.jl index 127d47e..b8629b9 100644 --- a/src/MeshCat.jl +++ b/src/MeshCat.jl @@ -42,7 +42,6 @@ export AbstractVisualizer, export Object, HyperEllipsoid, - HyperCylinder, PointCloud, Cone, Triad, diff --git a/src/atframe.jl b/src/atframe.jl index 23fc033..53c9657 100644 --- a/src/atframe.jl +++ b/src/atframe.jl @@ -58,20 +58,3 @@ function atframe(f, animation::Animation, frame::Integer) Cassette.overdub(AnimationCtx(metadata=(animation, frame)), f) return animation end - -function atframe(f::Function, anim::Animation, path::Path, frame::Integer) - error(""" - atframe(f::Function, anim::Animation, path::Path, frame::Integer) is no longer supported. - Please see the updated animation example notebook. - """) -end - -function atframe(f::Function, anim::Animation, vis::Visualizer, frame::Integer) - Base.depwarn(""" - atframe(f::Function, anim::Animation, vis::Visualizer, frame::Integer) is deprecated. - Please use atframe(g, anim, frame) instead, where g is similar to f but takes - no arguments and should call methods on vis. - See also the updated animation example notebook. - """, :atframe) - atframe(() -> f(vis), anim, frame) -end diff --git a/src/geometry.jl b/src/geometry.jl index 2954991..5146423 100644 --- a/src/geometry.jl +++ b/src/geometry.jl @@ -7,8 +7,6 @@ end GeometryTypes.origin(geometry::HyperEllipsoid{N, T}) where {N, T} = geometry.center radii(geometry::HyperEllipsoid{N, T}) where {N, T} = geometry.radii -@deprecate HyperCylinder(length::T, radius) where {T} Cylinder{3, T}(Point(0., 0., 0.), Point(0, 0, length), radius) - struct PointCloud{T, Point <: StaticVector{3, T}, C <: Colorant} <: AbstractGeometry{3, T} position::Vector{Point} color::Vector{C} diff --git a/test/visualizer.jl b/test/visualizer.jl index 420f0dd..7727c4a 100644 --- a/test/visualizer.jl +++ b/test/visualizer.jl @@ -230,24 +230,7 @@ end settransform!(arrow_vis_2, Point(0, 1, 0), Point(1, 1, 1)) end - @testset "Animation (old style)" begin - anim = Animation() - atframe(anim, vis[:shapes], 0) do frame_vis - settransform!(frame_vis[:box], Translation(0., 0, 0)) - end - atframe(anim, vis[:shapes], 30) do frame_vis - settransform!(frame_vis[:box], Translation(2., 0, 0) ∘ LinearMap(RotZ(π/2))) - end - atframe(anim, vis, 0) do framevis - setprop!(framevis["/Cameras/default/rotated/"], "zoom", 1) - end - atframe(anim, vis, 30) do framevis - setprop!(framevis["/Cameras/default/rotated/"], "zoom", 0.5) - end - setanimation!(vis, anim) - end - - @testset "Animation (new style)" begin + @testset "Animation" begin anim1 = Animation() atframe(anim1, 0) do settransform!(vis[:shapes][:box], Translation(0., 0, 0))