diff --git a/.gitignore b/.gitignore index 427305a..0cb2de2 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ # Useful .gitignore templates: https://github.com/github/gitignore node_modules dist -.cache \ No newline at end of file +.cache +/.idea/workspace.xml diff --git a/.idea/.gitignore b/.idea/.gitignore deleted file mode 100644 index 13566b8..0000000 --- a/.idea/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/earcoach.iml b/.idea/earcoach.iml index 8d6822b..2844a13 100644 --- a/.idea/earcoach.iml +++ b/.idea/earcoach.iml @@ -4,10 +4,8 @@ - + - - \ No newline at end of file diff --git a/.idea/jsLibraryMappings.xml b/.idea/jsLibraryMappings.xml index c414bcb..feddf2c 100644 --- a/.idea/jsLibraryMappings.xml +++ b/.idea/jsLibraryMappings.xml @@ -1,6 +1,8 @@ - + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index 813fd62..ce27a4c 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/harmoniccontext/index.html b/harmoniccontext/index.html index 72e9826..b935c78 100644 --- a/harmoniccontext/index.html +++ b/harmoniccontext/index.html @@ -1,6 +1,9 @@ + + + Contexto Armónico - - Contexto Armónico
@@ -40,37 +64,29 @@
by iakanoe
-
-
-
-

Contexto Armónico

- Puntaje: 0 de 0 -
+
+
+

Contexto Armónico

+ Puntaje: 0 de 0
-
-
-
-
Tonalidad:
-

F

-
+
+
+
Tonalidad:
+

F

-
+
-
Veces escuchado: 0
+
Veces escuchado: 0
-
-
-
- - - - - - - -
-
+
+ + + + + + +
diff --git a/harmoniccontext/index.js b/harmoniccontext/index.js index a9a5843..9258bbb 100644 --- a/harmoniccontext/index.js +++ b/harmoniccontext/index.js @@ -23,21 +23,21 @@ const Bs = C const keyNames = ["C", "Db", "D", "Eb", "E", "F", "F#", "G", "Ab", "A", "Bb", "B"] -var preset = _tone_0000_Aspirin_sf2_file -var AudioContextFunc = window.AudioContext || window.webkitAudioContext; -var audioContext = new AudioContextFunc(); -var player = new WebAudioFontPlayer(); +const preset = _tone_0000_Aspirin_sf2_file +const AudioContextFunc = window.AudioContext || window.webkitAudioContext; +const audioContext = new AudioContextFunc(); +const player = new WebAudioFontPlayer(); player.loader.decodeAfterLoading(audioContext, "_tone_0000_Aspirin_sf2_file") -var key = B // random between 0 and 11 -var grade = 3 // random between 0 and 6 -var exampleOctave = 3 // random between 3 and 4 -var octave = exampleOctave -var score = 0 -var played = 0 -var timesPlayed = 0 +let key = B; // random between 0 and 11 +let grade = 3 // random between 0 and 6 +let exampleOctave = 3 // random between 3 and 4 +let octave = exampleOctave +let score = 0 +let played = 0 +let timesPlayed = 0 -var interactionEnabled = false +let interactionEnabled = false window.onload = () => start() @@ -61,7 +61,7 @@ function resetChallenge() { key = random(C, B) grade = random(0, 6) exampleOctave = random(3, 4) - octave = random(Math.min(exampleOctave - 1, 3), exampleOctave + 1) + octave = random(Math.max(exampleOctave - 1, 3), Math.min(exampleOctave + 1, 5)) timesPlayed = 0 resetButtons() diff --git a/index.html b/index.html index 73b5ea2..3c885e4 100644 --- a/index.html +++ b/index.html @@ -1,13 +1,14 @@ + + + INA2 Coach - - INA2 Coach