From f94850c120519e61048b36eaa6266608d2ccc4b7 Mon Sep 17 00:00:00 2001 From: Louka Date: Sat, 30 Apr 2022 01:50:39 -0400 Subject: [PATCH] better tracker rotation slider --- src/components/tracker/TrackerCard.tsx | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/components/tracker/TrackerCard.tsx b/src/components/tracker/TrackerCard.tsx index 3437eda59..6d4a1ec08 100644 --- a/src/components/tracker/TrackerCard.tsx +++ b/src/components/tracker/TrackerCard.tsx @@ -13,6 +13,7 @@ export function TrackerCard({ tracker, device }: { tracker: TrackerDataT, devic const previousRot = useRef<{ x: number, y: number, z: number, w: number }>(tracker.rotation!) const [velocity, setVelocity] = useState(0); + const [rots, setRotation] = useState([]); const statusClass = useMemo(() => { const statusMap: { [key: number]: string } = { @@ -29,8 +30,14 @@ export function TrackerCard({ tracker, device }: { tracker: TrackerDataT, devic useEffect(() => { if (tracker.rotation) { const rot = QuaternionFromQuatT(tracker.rotation).mul(QuaternionFromQuatT(previousRot.current).inverse()); - const dif = Math.min(1, (rot.x**2 + rot.y**2 + rot.z**2) * 2.5) - setVelocity(dif); + const dif = Math.min(1, (rot.x ** 2 + rot.y ** 2 + rot.z ** 2) * 2.5) + // Use sum of rotation of last 3 frames (0.3sec) for smoother movement and better detection of slow movement. + if (rots.length === 3) { + rots.shift(); + } + rots.push(dif); + setRotation(rots); + setVelocity(rots.reduce((a, b) => a + b)); previousRot.current = tracker.rotation; } }, [tracker.rotation])