Interval matrix (modes)
-
+
@@ -190,14 +281,10 @@ const matrix = computed(() => {
v-model="trailLongevity"
/>
-
-
-
-
+
+
+
+
-
diff --git a/src/views/MidiView.vue b/src/views/MidiView.vue
index 593a1578..9e15dabe 100644
--- a/src/views/MidiView.vue
+++ b/src/views/MidiView.vue
@@ -2,14 +2,14 @@
import { onMounted, onUnmounted, reactive, ref } from 'vue'
import { Input, Output, WebMidi, type NoteMessageEvent, type MessageEvent } from 'webmidi'
import MidiPiano from '@/components/MidiPiano.vue'
-import { useStateStore } from '@/stores/state'
import { useMidiStore } from '@/stores/midi'
+import { useScaleStore } from '@/stores/scale'
const props = defineProps<{
midiInputChannels: Set
}>()
-const state = useStateStore()
+const scale = useScaleStore()
const midi = useMidiStore()
const inputs = reactive([])
@@ -204,10 +204,10 @@ onUnmounted(() => {
diff --git a/src/views/PreferencesView.vue b/src/views/PreferencesView.vue
index d8f2ec0f..4210dcf2 100644
--- a/src/views/PreferencesView.vue
+++ b/src/views/PreferencesView.vue
@@ -2,8 +2,10 @@
import { UNIX_NEWLINE, WINDOWS_NEWLINE } from '@/constants'
import { useStateStore } from '@/stores/state'
+import { useScaleStore } from '@/stores/scale'
const state = useStateStore()
+const scale = useScaleStore()
@@ -25,12 +27,23 @@ const state = useStateStore()
+
+
| - | + | {{ i - 1 + state.intervalMatrixIndexing }} | -({{ state.scale.size + state.intervalMatrixIndexing }}) | +({{ scale.scale.size + state.intervalMatrixIndexing }}) | +Bright % |
|---|---|---|---|---|---|
| {{ formatMatrixCell(state.scale.getInterval(i)) }} | -{{ name }} | +||||
| + {{ scale.labels[mmod(i - 1, scale.labels.length)] }} + | ++ {{ name }} + | +{{ brightness[i] }} | +|||
| Var | +{{ v }} | +
@@ -205,6 +292,44 @@ const matrix = computed(() => {
+
@@ -236,9 +361,29 @@ main {
border-collapse: collapse;
text-align: center;
}
+.variety {
+ border-top: 2px solid;
+}
+.brightness {
+ border-left: 2px solid !important;
+}
+.violator {
+ color: red;
+}
+.highlight {
+ text-decoration: underline;
+}
+.violator.highlight {
+ background-color: rgba(255, 255, 100, 0.8);
+}
+.held {
+ background-color: var(--color-accent);
+ color: var(--color-accent-text);
+}
/* Content layout (medium) */
-div.columns-container {
+div.columns-container,
+div.bicolumns-container {
column-count: 2;
column-gap: 1rem;
overflow: hidden;
@@ -263,4 +408,9 @@ div.column {
max-width: 100%;
height: auto;
}
+
+/* Equally tempered chord */
+.chord-data {
+ font-size: 1.2em;
+}
diff --git a/src/views/LatticeView.vue b/src/views/LatticeView.vue
index d15c470c..f3dba428 100644
--- a/src/views/LatticeView.vue
+++ b/src/views/LatticeView.vue
@@ -1,35 +1,363 @@
- Equally tempered chord
+
+
+ + Chord: [{{ equallyTemperedChordData.degrees.join(',') }}] \ + {{ equallyTemperedChordData.divisions }}{{ nedjiProjector }} +
+Error: {{ equallyTemperedChordData.error.toFixed(5) }} c
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Lattice visualization
-Lattice configuration
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ QWERTY layout
+
+
+
+
+
+ Advanced
+
+
+
@@ -47,16 +60,6 @@ const state = useStateStore()
-
-
-
-
Accidentals
@@ -64,7 +67,7 @@ const state = useStateStore()
type="radio"
id="accidentals-double"
value="double"
- v-model="state.accidentalPreference"
+ v-model="scale.accidentalPreference"
/>
@@ -73,7 +76,7 @@ const state = useStateStore()
type="radio"
id="accidentals-single"
value="single"
- v-model="state.accidentalPreference"
+ v-model="scale.accidentalPreference"
/>
@@ -82,7 +85,7 @@ const state = useStateStore()
type="radio"
id="accidentals-ascii"
value="ASCII"
- v-model="state.accidentalPreference"
+ v-model="scale.accidentalPreference"
/>
diff --git a/src/views/ScaleView.vue b/src/views/ScaleView.vue
index b967bc53..89ce7caf 100644
--- a/src/views/ScaleView.vue
+++ b/src/views/ScaleView.vue
@@ -1,9 +1,142 @@
-
+
+
diff --git a/src/views/SynthView.vue b/src/views/SynthView.vue
index 1b77591f..ae78c8f5 100644
--- a/src/views/SynthView.vue
+++ b/src/views/SynthView.vue
@@ -2,13 +2,15 @@
import { computed, onMounted, onUnmounted, ref, watch } from 'vue'
import TimeDomainVisualizer from '@/components/TimeDomainVisualizer.vue'
import Modal from '@/components/ModalDialog.vue'
-import { WAVEFORMS } from '@/synth'
+import { APERIODIC_WAVEFORMS, WAVEFORMS } from '@/synth'
import { useAudioStore } from '@/stores/audio'
import { useStateStore } from '@/stores/state'
+import { useScaleStore } from '@/stores/scale'
const emit = defineEmits(['panic'])
const state = useStateStore()
+const scale = useScaleStore()
const audio = useAudioStore()
@@ -92,6 +94,18 @@ const releaseTime = computed({
}
})
+const unisonSpread = computed({
+ get: () => audio.spread,
+ set(newValue: number) {
+ if (typeof newValue !== 'number') {
+ newValue = parseFloat(newValue)
+ }
+ if (!isNaN(newValue)) {
+ audio.spread = newValue
+ }
+ }
+})
+
const pingPongDelayTime = computed({
get: () => audio.pingPongDelayTime,
set(newValue: number) {
@@ -237,9 +251,56 @@ onUnmounted(() => {
+
-
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
+
-
-
+
+
-
-
+
+
Keyboard equave shift
-
-
-
- Trigger lower or higher notes. (Default shortcut keys: numpad
- / and *)
-
-
-
- Keyboard degree shift
-
-
-
+
- Shift down/up by one scale degree. (Default shortcut keys: numpad
- - and +).
-
-
-
- Isomorphic key mapping
Distance between adjacent keys on the horizontal/vertical axes, in scale degrees. @@ -430,6 +473,53 @@ onUnmounted(() => {
+ +Accidental colors
+These color(s) in your scale will be used to assemble the piano layout.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Keyboard equave shift
+
+
+
+ Trigger lower or higher notes. (Default shortcut keys: numpad
+ / and *)
+
+
+
+ Keyboard degree shift
+
+
+ Shift down/up by one scale degree. (Default shortcut keys: numpad
+ - and +).
+
+
+
+ Keyboard shortcuts
Shift sustain currently held keys after release