Skip to content

Commit e8cd09a

Browse files
authored
Merge pull request #210 from ferrolho/hf/compat-Rotations
Renames `UnitQuaternion` to `QuatRotation`
2 parents da427dd + 28945fa commit e8cd09a

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/MeshCat.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ using GeometryBasics: GeometryBasics,
2828
widths
2929

3030
using CoordinateTransformations
31-
using Rotations: rotation_between, Rotation, RotMatrix, UnitQuaternion
31+
using Rotations: params, rotation_between, Rotation, RotMatrix, QuatRotation
3232
using Colors: Color, Colorant, RGB, RGBA, alpha, hex, red, green, blue
3333
using StaticArrays: StaticVector, SVector, SDiagonal, SMatrix
3434
using Parameters: @with_kw

src/arrow_visualizer.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function settransform!(vis::ArrowVisualizer, base::Point{3}, vec::Vec{3};
4747
rotation = if vec_length > eps(T)
4848
rotation_between(SVector(0., 0., 1.), vec)
4949
else
50-
one(UnitQuaternion{Float64})
50+
one(QuatRotation{Float64})
5151
end |> LinearMap
5252

5353
vis_tform = Translation(base) rotation

src/atframe.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,12 @@ function getclip!(animation::Animation, path::Path)
3030
end
3131

3232
js_quaternion(m::AbstractMatrix) = js_quaternion(RotMatrix(SMatrix{3, 3, eltype(m)}(m)))
33-
js_quaternion(q::UnitQuaternion) = [q.x, q.y, q.z, q.w]
34-
js_quaternion(::UniformScaling) = js_quaternion(UnitQuaternion(1., 0., 0., 0.))
35-
js_quaternion(r::Rotation) = js_quaternion(UnitQuaternion(r))
33+
function js_quaternion(q::QuatRotation)
34+
w, x, y, z = params(q)
35+
return [x, y, z, w]
36+
end
37+
js_quaternion(::UniformScaling) = js_quaternion(QuatRotation(1., 0., 0., 0.))
38+
js_quaternion(r::Rotation) = js_quaternion(QuatRotation(r))
3639
js_quaternion(tform::Transformation) = js_quaternion(transform_deriv(tform, SVector(0., 0, 0)))
3740

3841
function js_scaling(tform::AbstractAffineMap)

0 commit comments

Comments
 (0)