wiwi/CircleOfFifths
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update circleOfFifths.js

Browse Source
This commit is contained in:
Wiwi Kuan
2019-04-07 17:56:27 +08:00
committed by GitHub
parent cd9bb0838a
commit 7b4cdf9d74
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
circleOfFifths.js
View File

@@ -40,7 +40,7 @@ let detailTextSize = 22;
let coreRatio = 0.57; let coreRatio = 0.57;
let coreType = "Detail"; let coreType = "Detail";
let dbText = "This is the default debug text." let dbText = "Circle of Fifths by NiceChord (Wiwi Kuan)"
let mouseDir; let mouseDir;
@@ -56,6 +56,7 @@ let imgFlat;
let modeLabel = ["Major/Minor", "Ionian", "Dorian", "Phrygian", "Lydian", "Mixolydian", "Aeolian", "Locrian"]; let modeLabel = ["Major/Minor", "Ionian", "Dorian", "Phrygian", "Lydian", "Mixolydian", "Aeolian", "Locrian"];
let paintingArray = new Array();
function preload() { function preload() {
imgStaff = loadImage("./staff.png"); imgStaff = loadImage("./staff.png");
@@ -89,8 +90,7 @@ function setup() {
lockButton.position(19, 19); lockButton.position(19, 19);
lockButton.mousePressed(toggleLocked); lockButton.mousePressed(toggleLocked);
//modeSlider = createSlider(0, 7, 0, 1);
//modeSlider.position(width - 160, 19);
} }
function toggleLocked() { function toggleLocked() {
@@ -101,7 +101,6 @@ function toggleLocked() {
lockButton.html("[已鎖定]"); lockButton.html("[已鎖定]");
locked = true; locked = true;
} }
} }
function highlighted() { function highlighted() {
@@ -116,6 +115,7 @@ function highlighted() {
function drawOuter(ang) { function drawOuter(ang) {
stroke(outCSP); stroke(outCSP);
strokeWeight(width / 600);
for (i = 0; i < 12; i++) { for (i = 0; i < 12; i++) {
fill((i % 2 == 0) ? outC1 : outC2); fill((i % 2 == 0) ? outC1 : outC2);
@@ -333,6 +333,7 @@ function drawCoreBlack(ang) {
function debugText() { function debugText() {
fill(0); fill(0);
noStroke();
textAlign(CENTER); textAlign(CENTER);
text(dbText, 0, height * 0.45); text(dbText, 0, height * 0.45);
} }
@@ -341,9 +342,8 @@ function mouseAngle(ang) {
let v = createVector(mouseX - width / 2, mouseY - height / 2); let v = createVector(mouseX - width / 2, mouseY - height / 2);
let h = v.heading(); // -PI ~ PI let h = v.heading(); // -PI ~ PI
let i = map(h, -PI, PI, 6, 18); let i = map(h, -PI, PI, 6, 18);
// let j = (i - ang);
mouseDir = (i > 12) ? i - 12 : i; mouseDir = (i > 12) ? i - 12 : i;
dbText = `${(mouseX-width/2)/width}, ${(mouseY-height/2)/height}`; // dbText = `${(mouseX-width/2)/width}, ${(mouseY-height/2)/height}`;
} }
@@ -362,6 +362,8 @@ function rotateGlobal() {
angle += vel; angle += vel;
} }
function draw() { function draw() {
background(95); background(95);
translate(width / 2, height / 2); translate(width / 2, height / 2);
@@ -375,6 +377,6 @@ function draw() {
drawMinor(angle); drawMinor(angle);
drawMinorText(angle); drawMinorText(angle);
drawCore(angle); drawCore(angle);
draw debugText();
// debugText();
} }