Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pronouncing the first count of the bar #19

Merged
merged 3 commits into from
Apr 29, 2024
Merged

Pronouncing the first count of the bar #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93d9be7
Merge pull request #10 from AdminOfThis/main
AdminOfThis Apr 29, 2024
7f5e796
Added some improvements to end of song
AdminOfThis Apr 29, 2024
a6e259e
Pronouncing the beginning of the bar by letting the bar jump higher
AdminOfThis Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added assets/Roboto-Regular.ttf
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@
<body>
<main>
</main>
<div id="canvas-parent", class="canvas-parent"></div>
<div id="ui-parent", class="ui-parent">
</div>
<br></br>
<div id="canvas-parent"></div>
<footer class="footer">
<a href="./disclaimer.html">Disclaimer
</a>
Expand Down
122 changes: 78 additions & 44 deletions sketch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

//ControlP5 cp5;
// ##################### UI ###################
let font;

let inputSections = [];
let btnPlus, btnParse, btnPlayPause;

Expand All @@ -19,12 +21,29 @@ var blocks = [];
let totalLength;
let bounce;

let circleRadius = 25;

let pixelPerSecond = 150;
const rect_Width = 5;

let startTime;

function preload() {
font = loadFont('assets/Roboto-Regular.ttf');
}

function setup() {

textFont(font);

let canvasHeight = max(200, windowHeight / 2);
let canvasWidth = canvasHeight / 9.0 * 16.0;

var cnv = createCanvas(canvasWidth, canvasHeight);
cnv.parent("canvas-parent");
cnv.class("canvas");
background(255);

blocks = parseInput(example_code);

btnPlayPause = createButton("PLAY");
Expand All @@ -44,11 +63,7 @@ function setup() {
btnParse.mousePressed(buttonParse.bind(this.blocks));
btnParse.hide();

var cnv = createCanvas(max(400, windowWidth), max(400, windowHeight / 2));
cnv.parent("canvas-parent");
cnv.style("display", "block");
background(255);

windowResized();
reset();
}

Expand Down Expand Up @@ -117,9 +132,9 @@ function draw() {

// Gestrichelte Linie
//for(let i=0;i<10;i++) {
fill(65);
fill(map(bounce, 0, height / 8, 0, 25));
let nowLineWidth = rect_Width / 2;
rect(width / 3 - nowLineWidth/2, 0, nowLineWidth, height);
rect(width / 3 - nowLineWidth / 2, 0, nowLineWidth, height);
//}

let currentBlock;
Expand All @@ -133,34 +148,17 @@ function draw() {

// TEMPO
if (currentBlock != undefined) {
//let ju = abs(sin(timeSinceStart/(currentBlock.length())*PI*currentBlock.measure_min )*height/4);
let ju = abs(
sin(
((timeSinceStart - currentLength) / currentBlock.length()) *
PI *
currentBlock.measure_min
) * bounce
);
if (play && (
timeSinceStart >
totalLength -
blocks[blocks.length - 1].length() /
blocks[blocks.length - 1].measure_min
)) {
bounce *= 0.99;
} else {
bounce = height / 4;
}
fill(255, 0, 0);
circle(width / 3, height / 2.25 - ju, 25);

textAlign(LEFT, TOP);
fill(map(bounce, 0, height / 8, 0, 255), 0, 0);
text(currentBlock.bpm + " BPM", 10, 10);
fill(255);
fill(map(bounce, 0, height / 8, 0, 255));
text(currentBlock.measure, 10, 50);
textAlign(LEFT, TOP);
text(msToTime(timeSinceStart), width - 125, 10);

let br = 0;
// Calculate current bar, subdivide, etc

let currentTakt = 0;
let currentSubdivide = 0;
let t = 0;
Expand Down Expand Up @@ -190,34 +188,58 @@ function draw() {
break;
}
}

let ju = abs(sin(((timeSinceStart - currentLength) / currentBlock.length()) * PI * currentBlock.measure_min) * bounce);

let circleY = height / 2 - ju - (circleRadius / 2.0);
let circleX = width / 3;
fill(255, 0, 0);

if (play && (timeSinceStart > totalLength - blocks[blocks.length - 1].length() / blocks[blocks.length - 1].measure_min)) {
// Piece is over, having fun
bounce *= 0.99;
circleY = min(height - (circleRadius / 2), circleY + (timeSinceStart - totalLength) / 20);
circleX += (timeSinceStart - totalLength) * (timeSinceStart - totalLength) / 100000;
} else {
if (currentSubdivide == currentBlock.measure_min) {
// pronounce the bar opening
bounce = height / 3;
} else {
bounce = height / 5;
}
}
circle(circleX, circleY, circleRadius);

// DISPLAY BARS, SUBDIVIDE, ETC
textSize(48);
textAlign(CENTER, TOP);
text(
currentTakt + " | " + currentSubdivide + "/" + currentBlock.measure_min,
width / 2,
10
);
if (currentSubdivide > 0) {
fill(255);
text(currentTakt + " | " + currentSubdivide + "/" + currentBlock.measure_min, width / 2, 10);
} else {
fill(map(bounce, 0, height / 8, 0, 255));
text("END", width / 2, 10);
}
}

// TAKT LINES
let taktCount = 0;
for (let i = 0; i < blocks.length; i++) {
let block = blocks[i];
let blockX =
width / 3 +
(index * pixelPerSecond - (timeSinceStart / 1000) * pixelPerSecond);
let blockX = width / 3 + (index * pixelPerSecond - (timeSinceStart / 1000) * pixelPerSecond);
textAlign(LEFT, BOTTOM);
if (i > 0 && blocks[i].bpm != blocks[i - 1].bpm) {
fill(min(map(blockX, 100, width / 3, 0, 255), 255));
text(block.bpm, blockX, height - 38);
textSize(32);
text(block.bpm, blockX, height / 8 * 7.5);
}
if (i > 0 && blocks[i].measure !== blocks[i - 1].measure) {
fill(min(map(blockX, 100, width / 3, 0, 255), 255), 0, 0);
textSize(32);
text(block.measure, blockX, height - 10);
}
for (let j = 0; j < block.count; j++) {
let taktBegin =
(index + (j * block.length()) / 1000) * pixelPerSecond -
(timeSinceStart / 1000) * pixelPerSecond;
let taktBegin = (index + (j * block.length()) / 1000) * pixelPerSecond - (timeSinceStart / 1000) * pixelPerSecond;
//console.log("TAKT: " + taktBegin);
let x = width / 3 + taktBegin;
fill(255);
Expand All @@ -227,7 +249,17 @@ function draw() {

fill(min(map(x, 100, width / 3, 0, 255), 255));
//TAKTZAHL
textSize(32);
let bbox = font.textBounds((taktCount + 1) + "", x, height / 1.35 + 10, 32);
//fill(127);
let textMargin = 5;
let boxWidth = 2;
rect(bbox.x - textMargin - boxWidth, bbox.y - textMargin - boxWidth, bbox.w + (2 * (textMargin + boxWidth)), bbox.h + (2 * (textMargin + boxWidth)));
fill(0);
rect(bbox.x - textMargin, bbox.y - textMargin, bbox.w + (2 * textMargin), bbox.h + (2 * textMargin));
fill(min(map(x, 100, width / 3, 0, 255), 255));
text(taktCount + 1, x, height / 1.35 + 10);

basecolor = 255;
} else {
basecolor = 127;
Expand Down Expand Up @@ -255,7 +287,7 @@ function draw() {
index += block.lengthTotal() / 1000;
//console.log(index);
}
if (timeSinceStart > totalLength + 5000) {
if (timeSinceStart > totalLength + 30000) {
//console.log("RESET")
reset();
}
Expand Down Expand Up @@ -301,9 +333,11 @@ function keyPressed() {
}

function windowResized() {
console.log("resize");
resizeCanvas(max(400, windowWidth), max(400, windowHeight / 2));
let canvasHeight = max(200, windowHeight / 2);
let canvasWidth = canvasHeight / 9.0 * 16.0;
resizeCanvas(canvasWidth, canvasHeight);
pixelsPerSecond = width / 10;
circleRadius = width / 25;
}

function buttonPlayPause() {
Expand Down
17 changes: 17 additions & 0 deletions style.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ html, body {
}

body {

background-color: dimgray ;

margin: 5;
padding: 5;
/*display: flex;*/
Expand Down Expand Up @@ -42,8 +45,22 @@ body {
margin: 5;
}

.canvas {
margin: 20px;
display: block;
align-items: center;
margin-left: auto;
margin-right: auto;
border-color: red;
border-style: solid;
}

.canvas-parent {
margin: 50px;
display: block;
align-items: center;
margin-left: auto;
margin-right: auto;
}

.footer {
Expand Down
6 changes: 6 additions & 0 deletions uiSection.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ class UISection {
this.numMeasureMin.size(20, this.numBars.height);
this.numMeasureMin.position(0, 0, "static");

let divider = createDiv("/");
divider.parent("section"+ index);
divider.size(5, this.numBars.height);
divider.position(0, 0, "static");


this.numMeasureMaj = createInput("4");
this.numMeasureMaj.parent("section"+ index);
this.numMeasureMaj.size(20, this.numBars.height);
Expand Down