Skip to content

Commit

Permalink
checkpoint
Browse files Browse the repository at this point in the history
  • Loading branch information
danielgamage committed Dec 4, 2020
1 parent 925fe5e commit 0c8d251
Show file tree
Hide file tree
Showing 3 changed files with 31 additions and 28 deletions.
2 changes: 1 addition & 1 deletion src/components/app/TrackSettings.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -324,7 +324,7 @@ class TrackSettings extends Component {
enterAnimation={customEnterAnimation}
leaveAnimation={customLeaveAnimation}
>
<Text type="h3" key="title" style={{ color: vars.grey_4 }}>
<Text type="h3" key="title">
{el.title}
</Text>

Expand Down
2 changes: 1 addition & 1 deletion src/components/visualizers/RadialKeys.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ const StyledRadialKeys = styled.div`
}
}
circle.tick {
fill: var(--bg-deep);
fill: var(--bg-recessed);
stroke-dasharray: 2 3;
}
path.spiral {
Expand Down
55 changes: 29 additions & 26 deletions src/utils/keyboard.js
Original file line number Diff line number Diff line change
@@ -1,42 +1,45 @@
import keySteps from "data/keySteps";
import { keys } from "utils";
import { stopNote, startNote } from "utils/notes";
import keySteps from "data/keySteps"
import { keys } from "utils"
import { stopNote, startNote } from "utils/notes"

//
// Keyboard
//

let octave = 3;
let octave = 3

const onKeyDown = event => {
if (keySteps.some(keyStep => keyStep.code === event.keyCode)) {
const steps = keySteps.filter(keyStep => event.keyCode === keyStep.code)[0]
.step;
const note = keys[steps + 2 + octave * 12];
startNote(note);
const onKeyDown = (event) => {
if (keySteps.some((keyStep) => keyStep.code === event.keyCode)) {
const steps = keySteps.filter(
(keyStep) => event.keyCode === keyStep.code
)[0].step
const note = keys[steps + 2 + octave * 12]
startNote(note)
}
};
}

const onKeyUp = event => {
/** @todo use key or code, but not keycode */
const onKeyUp = (event) => {
if (event.keyCode === 90) {
// z
octave = Math.max(--octave, 0);
octave = Math.max(--octave, 0)
} else if (event.keyCode === 88) {
// x
octave = Math.min(++octave, 5);
} else if (keySteps.some(keyStep => keyStep.code === event.keyCode)) {
const steps = keySteps.filter(keyStep => event.keyCode === keyStep.code)[0]
.step;
const note = keys[steps + 2 + octave * 12];
stopNote(note);
octave = Math.min(++octave, 5)
} else if (keySteps.some((keyStep) => keyStep.code === event.keyCode)) {
const steps = keySteps.filter(
(keyStep) => event.keyCode === keyStep.code
)[0].step
const note = keys[steps + 2 + octave * 12]
stopNote(note)
}
};
}

export const bindKeyboardEvents = () => {
window.addEventListener("keydown", onKeyDown);
window.addEventListener("keyup", onKeyUp);
};
window.addEventListener("keydown", onKeyDown)
window.addEventListener("keyup", onKeyUp)
}
export const unbindKeyboardEvents = () => {
window.removeEventListener("keydown", onKeyDown);
window.removeEventListener("keyup", onKeyUp);
};
window.removeEventListener("keydown", onKeyDown)
window.removeEventListener("keyup", onKeyUp)
}

0 comments on commit 0c8d251

Please sign in to comment.