Skip to content

Commit

Permalink
Added Whole Tone Scale
Browse files Browse the repository at this point in the history
Added Whole Tone scale under scales
  • Loading branch information
deltadada committed Dec 2, 2015
1 parent d31f09f commit 6783a82
Showing 1 changed file with 6 additions and 15 deletions.
21 changes: 6 additions & 15 deletions ScaleDictionary.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,6 @@ var dictKeys = {
"Gsharp" : kGsharp,
"Asharp" : kAsharp};



// old
//var INTS_FLATS = ['R', '♭9', '9', '♭3', '3', '11', '♭5', '5', '♭13', '13', '♭7', '7'];
//var INTS_SHARP4 = ['R', '♭9', '9', '♭3', '3', '11', '♯11', '5', '♭13', '13', '♭7', '7'];
//var INTS_DOM = ['R', '♭9', '9', '♯9', '3', '11', '♭5', '5', '+5', '13', '♭7', '7'];

//var INTS_SHARP4AUG = ['R', '♭9', '9', '♭3', '3', '11', '♯11', '5', '+5', '13', '♭7', '7'];
//var INTS_DIM = ['R', '♭9', '9', '♭3', '3', '11', '♭5', '5', '+5', '♭♭7', '♭7', '7'];
//var INTS_SUPERLOCRIAN = ['R', '♭9', '9', '♭3', '♭4', '11', '♭5', '5', '♭13', '13', '♭7', '7'];



var dictInt = {
'ROOT': {
'SEMI' : 0,
Expand Down Expand Up @@ -135,7 +122,7 @@ var dictInt = {

'AUGFIVE' : {
'SEMI' : 8,
'INT' : '+5',
'INT' : '♯5',
'CLR' : 'i_fifth'
},

Expand All @@ -153,7 +140,7 @@ var dictInt = {

'AUGTHIRTEEN' : {
'SEMI' : 10,
'INT' : '+13',
'INT' : '♯13',
'CLR' : 'i_sixth'
},

Expand Down Expand Up @@ -200,6 +187,7 @@ var dictInt = {
var INTS_FLATS = [dictInt.ROOT.INT, dictInt.FLATNINE.INT, dictInt.NINE.INT, dictInt.FLATTHREE.INT, dictInt.THIRD.INT, dictInt.ELEVEN.INT, dictInt.FLATFIVE.INT, dictInt.FIFTH.INT, dictInt.FLATTHIRTEEN.INT, dictInt.THIRTEEN.INT, dictInt.FLATSEVEN.INT, dictInt.SEVENTH.INT];
var INTS_SHARP4 = [dictInt.ROOT.INT, dictInt.FLATNINE.INT, dictInt.NINE.INT, dictInt.FLATTHREE.INT, dictInt.THIRD.INT, dictInt.ELEVEN.INT, dictInt.SHARPELEVEN.INT, dictInt.FIFTH.INT, dictInt.FLATTHIRTEEN.INT, dictInt.THIRTEEN.INT, dictInt.FLATSEVEN.INT, dictInt.SEVENTH.INT];
var INTS_DOM = [dictInt.ROOT.INT, dictInt.FLATNINE.INT, dictInt.NINE.INT, dictInt.SHARPNINE.INT, dictInt.THIRD.INT, dictInt.ELEVEN.INT, dictInt.FLATFIVE.INT, dictInt.FIFTH.INT, dictInt.AUGFIVE.INT, dictInt.THIRTEEN.INT, dictInt.FLATSEVEN.INT, dictInt.SEVENTH.INT];
var INTS_SHARP456 = [dictInt.ROOT.INT, dictInt.FLATNINE.INT, dictInt.NINE.INT, dictInt.SHARPNINE.INT, dictInt.THIRD.INT, dictInt.ELEVEN.INT, dictInt.SHARPELEVEN.INT, dictInt.FIFTH.INT, dictInt.AUGFIVE.INT, dictInt.THIRTEEN.INT, dictInt.AUGTHIRTEEN.INT, dictInt.SEVENTH.INT];

var INTS_SHARP4AUG = [dictInt.ROOT.INT, dictInt.FLATNINE.INT, dictInt.NINE.INT, dictInt.FLATTHREE.INT, dictInt.THIRD.INT, dictInt.ELEVEN.INT, dictInt.SHARPELEVEN.INT, dictInt.FIFTH.INT, dictInt.AUGFIVE.INT, dictInt.THIRTEEN.INT, dictInt.FLATSEVEN.INT, dictInt.SEVENTH.INT];
var INTS_DIM = [dictInt.ROOT.INT, dictInt.FLATNINE.INT, dictInt.NINE.INT, dictInt.FLATTHREE.INT, dictInt.THIRD.INT, dictInt.ELEVEN.INT, dictInt.FLATFIVE.INT, dictInt.FIFTH.INT, dictInt.AUGFIVE.INT, dictInt.DBLFLATSEVEN.INT, dictInt.FLATSEVEN.INT, dictInt.SEVENTH.INT];
Expand Down Expand Up @@ -239,6 +227,7 @@ var INTCLR_PENTMIN = ["i_root", "white","white","i_third","white","black","white
var INTCLR_PENTMAJ = ["i_root", "white","black","white","i_third","white","white","i_fifth","white","black","white","white"];
var INTCLR_PENTDOM = ["i_root", "white","black","white","i_third","white","white","i_fifth","white","white","black","white"];
var INTCLR_PENTMINMEL = ["i_root", "white","black","i_third","white","white","white","i_fifth","white","black","white","white"];
var INTCLR_WHOLETONE = ["i_root", "white","black","white","i_third","white","black","white","i_fifth","white","i_seventh","white"];

var SC_MAJOR = { "ngtype": SCALE, "varname" : "MAJOR", "name" : "Ionian", "intnames": INTS_FLATS, "color" : INTCLR_IONIAN };
var SC_LYDIAN = { "ngtype": SCALE, "varname" : "LYDIAN", "name" : "Lydian", "intnames": INTS_SHARP4, "color" : INTCLR_LYDIAN };
Expand All @@ -261,6 +250,7 @@ var SC_PENTMIN = { "ngtype": SCALE, "varname" : "PENTMIN", "name" : "Minor Pent
var SC_PENTMAJ = { "ngtype": SCALE, "varname" : "PENTMAJ", "name" : "Major Pentatonic", "intnames": INTS_FLATS, "color" : INTCLR_PENTMAJ };
var SC_PENTDOM = { "ngtype": SCALE, "varname" : "PENTDOM", "name" : "Dominant Pentatonic", "intnames": INTS_FLATS, "color" : INTCLR_PENTDOM };
var SC_PENTMELMIN = { "ngtype": SCALE, "varname" : "PENTMELMIN", "name" : "Pentatonic Melodic Minor", "intnames": INTS_FLATS, "color" : INTCLR_PENTMINMEL };
var SC_WHOLETONE = { "ngtype": SCALE, "varname" : "WHOLETONE", "name" : "Whole Tone", "intnames": INTS_SHARP456, "color" : INTCLR_WHOLETONE };


var dictScales = {
Expand All @@ -283,6 +273,7 @@ var dictScales = {
"SC_LYDIANAUG": SC_LYDIANAUG,
"SC_MINNAT": SC_MINNAT,
"SC_PENTMELMIN": SC_PENTMELMIN,
"SC_WHOLETONE": SC_WHOLETONE,
//"SC_MINJAZZ": SC_MINJAZZ
};

Expand Down

0 comments on commit 6783a82

Please sign in to comment.