diff --git a/nise-replay-viewer/src/hooks/canvasControls.ts b/nise-replay-viewer/src/hooks/canvasControls.ts index 8966401..a37d353 100644 --- a/nise-replay-viewer/src/hooks/canvasControls.ts +++ b/nise-replay-viewer/src/hooks/canvasControls.ts @@ -42,9 +42,6 @@ export class CanvasControlHooks { @Hook(Events.mouseWheel) static mouseWheel(event: any) { - if (!p.keyIsDown(17)) { - return; - } const zoom = event.deltaY > 0 ? 100 : -100; const oldScale = canvasMultiplier; const multiplierChange = zoom * 0.0008 * oldScale; diff --git a/nise-replay-viewer/src/hooks/osuControls.ts b/nise-replay-viewer/src/hooks/osuControls.ts index 5081975..a7c3793 100644 --- a/nise-replay-viewer/src/hooks/osuControls.ts +++ b/nise-replay-viewer/src/hooks/osuControls.ts @@ -1,46 +1,13 @@ import { Hook } from "@/decorators/hook"; import { Events } from "@/hooks"; import { OsuRenderer } from "@/osu/OsuRenderer"; -import { p, state } from "@/utils"; +import { p } from "@/utils"; export class OsuControlHooks { + @Hook(Events.keyPressed) static keyPressed() { if (p.keyCode == 32) OsuRenderer.setPlaying(!OsuRenderer.playing); } - @Hook(Events.mouseWheel) - static mouseWheel(event: WheelEvent) { - if (event.ctrlKey) return; - const currentState = state.getState(); - - if ( - currentState.achivementsDialog || - currentState.dataAnalysisDialog || - currentState.metadataEditorDialog || - currentState.openDialog || - currentState.saveDialog - ) - return; - - if (event.deltaY > 0) { - OsuRenderer.setTime(OsuRenderer.time + 35); - } else { - OsuRenderer.setTime(OsuRenderer.time - 35); - } - } - - @Hook(Events.mousePressed) - static mousePressed(event: WheelEvent) { - const currentState = state.getState(); - - if ( - currentState.achivementsDialog || - currentState.dataAnalysisDialog || - currentState.metadataEditorDialog || - currentState.openDialog || - currentState.saveDialog - ) - return; - } } diff --git a/nise-replay-viewer/src/interface/composites/helper.tsx b/nise-replay-viewer/src/interface/composites/helper.tsx index 3b886bd..b41eadc 100644 --- a/nise-replay-viewer/src/interface/composites/helper.tsx +++ b/nise-replay-viewer/src/interface/composites/helper.tsx @@ -10,26 +10,20 @@ export function Helper() { if (!replay) return <>>; return ( -