From 88bee339d29b2e318fb2ddc3baeaa4ff8c0764a7 Mon Sep 17 00:00:00 2001 From: lonkaars Date: Tue, 27 Jul 2021 19:27:47 +0200 Subject: menu bar controls done soom:tm: --- components/controls.tsx | 71 ++++++++++++++++++++++++++++++------------------- 1 file changed, 43 insertions(+), 28 deletions(-) (limited to 'components') diff --git a/components/controls.tsx b/components/controls.tsx index f94d25c..8e55d22 100644 --- a/components/controls.tsx +++ b/components/controls.tsx @@ -1,6 +1,11 @@ -import { CSSProperties, useEffect } from 'react'; +import Button from '@material-ui/core/Button'; +import { CSSProperties, useEffect, useRef } from 'react'; import { animated, SpringRef, useSpring } from 'react-spring'; -// import { useDrag } from 'react-use-gesture'; +import { useDrag } from 'react-use-gesture'; + +import MenuRoundedIcon from '@material-ui/icons/MenuRounded'; +import NavigateBeforeRoundedIcon from '@material-ui/icons/NavigateBeforeRounded'; +import NavigateNextRoundedIcon from '@material-ui/icons/NavigateNextRounded'; interface controlsPropsType { next: () => void; @@ -22,41 +27,47 @@ interface menuBarSpringProps { vertical: number; } var menuBarPosApi: SpringRef; +var mouseX = 0; +var mouseY = 0; +var windowWidth = typeof window !== 'undefined' ? window.innerWidth : 0; +var windowHeight = typeof window !== 'undefined' ? window.innerHeight : 0; +var mouseDown = false; +var positionHistory: [number, number][] = []; +var slopeAverage: [number, number][] = []; +var options = { + margin: 48, // screen margin + friction: 0.2, // friction + edgeForce: 0.4, // force outside margin (inwards to edges) + centerForce: 0.4, // force inside margin (outwards to edges) + maxForce: 10, // limit force to not go over this value + doneTolerance: 0.5, // if movement per frame goes below this value the animation is considered done + releaseSlopeAverageCount: 3, +}; + export function MenuBarControls({ next, previous, menu }: controlsPropsType) { + var menuBarRef = useRef(null); var [menuBarSpring, api] = useSpring(() => ({ - x: 0, + x: windowWidth / 2, y: 0, vertical: 0, config: { mass: 1.6, tension: 300, friction: 20 }, })); - menuBarPosApi = api; + useDrag(({ xy: [x, y], last }) => { + mouseX = x; + mouseY = y; + mouseDown = true; + if (last) mouseDown = false; + }, { domTarget: menuBarRef, eventOptions: { passive: false }, threshold: 10 }); - var options = { - margin: 48, // screen margin - friction: 0.2, // friction - edgeForce: 0.4, // force outside margin (inwards to edges) - centerForce: 0.4, // force inside margin (outwards to edges) - maxForce: 10, // limit force to not go over this value - doneTolerance: 0.5, // if movement per frame goes below this value the animation is considered done - releaseSlopeAverageCount: 3, - }; - - var positionHistory: [number, number][] = []; - var slopeAverage: [number, number][] = []; + menuBarPosApi = api; useEffect(() => { var physicsObject = { velocity: [0, 0], - position: [0, 0], + position: [windowWidth / 2, windowHeight], }; - var mouseX = 0; - var mouseY = 0; - var windowWidth = 0; - var windowHeight = 0; - var mouseDown = false; - function draw() { positionHistory.push([mouseX, mouseY]); if (positionHistory.length >= options.releaseSlopeAverageCount + 1) positionHistory.shift(); @@ -169,21 +180,20 @@ export function MenuBarControls({ next, previous, menu }: controlsPropsType) { requestAnimationFrame(draw); } draw(); + }, []); + useEffect(() => { function onresize() { windowWidth = window.innerWidth; windowHeight = window.innerHeight; } onresize(); window.addEventListener('resize', onresize); - window.addEventListener('mousemove', e => { - mouseX = e.clientX; - mouseY = e.clientY; - mouseDown = (e.buttons & (1 << 0)) > 0; - }); }, []); + return
+
; } -- cgit v1.2.3