Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
84 commits
Select commit Hold shift + click to select a range
20d7d68
adding audio&creating file
HadassahJoseph Apr 6, 2023
6e9e459
new file added
HadassahJoseph Apr 6, 2023
287cdeb
update the Experiance file
HadassahJoseph Apr 6, 2023
927364e
star
CeciliaLuan Apr 6, 2023
c6c27eb
first steps
aisha-is-coding Apr 8, 2023
c9bb973
stars
CeciliaLuan Apr 9, 2023
bf013a4
Second meeting meeting,notes and updates
HadassahJoseph Apr 9, 2023
5b5097c
stars
CeciliaLuan Apr 10, 2023
42dd55e
Merge branch 'master' of https://github.com/HadassahJoseph/MusicVisuals
CeciliaLuan Apr 10, 2023
ae6fa12
stars
CeciliaLuan Apr 11, 2023
a3c9fb4
stars
CeciliaLuan Apr 11, 2023
ca93322
stars
CeciliaLuan Apr 23, 2023
231f5b5
bla
CeciliaLuan Apr 29, 2023
b8d7c5d
changes to file after merge stil figuring it out
HadassahJoseph Apr 29, 2023
d4eb8cc
commit1
aisha-is-coding Apr 29, 2023
3a4432a
Merge branch 'master' of https://github.com/HadassahJoseph/MusicVisuals
aisha-is-coding Apr 29, 2023
94c6159
bla
Aces002 Apr 29, 2023
737a57d
Bla
CeciliaLuan Apr 29, 2023
c592250
moved to master branch
molly-100 Apr 29, 2023
e13a8f7
milk
Aces002 Apr 29, 2023
d77807b
updated setup and settings
molly-100 Apr 29, 2023
742d633
updated practice
molly-100 Apr 29, 2023
9b82d93
bla
CeciliaLuan Apr 29, 2023
010c54b
added drawNotes() method
molly-100 Apr 29, 2023
e952989
bla
CeciliaLuan Apr 29, 2023
2106367
drawnotes method
molly-100 Apr 29, 2023
ea713c3
Saturday
Aces002 Apr 29, 2023
ad71621
fixed drawing method
molly-100 Apr 29, 2023
ad7402c
fixed colours
molly-100 Apr 29, 2023
1ae6857
changed file name
molly-100 Apr 29, 2023
1a26a38
Saturday
Aces002 Apr 29, 2023
3ca1476
(sending to hadassah)
molly-100 Apr 29, 2023
f387a06
bla
CeciliaLuan Apr 29, 2023
e898a49
Saturday
Aces002 Apr 29, 2023
72b5906
sending to hadassah
molly-100 Apr 29, 2023
4f90dfb
Merge branch 'master' of https://github.com/HadassahJoseph/MusicVisuals
molly-100 Apr 29, 2023
b7bfc72
file changes trying to merger
HadassahJoseph Apr 29, 2023
ec08b5f
got molly file
HadassahJoseph Apr 29, 2023
d82ac60
Saturday
Aces002 Apr 29, 2023
6825d04
Merge branch 'master' of https://github.com/HadassahJoseph/MusicVisuals
Aces002 Apr 29, 2023
4956bdd
updated comments
molly-100 Apr 29, 2023
57d5b3a
Saturday
Aces002 Apr 29, 2023
c96bb9c
updating to get others code
aisha-is-coding Apr 29, 2023
61c78b0
trying to fix files
molly-100 Apr 29, 2023
4c72065
our code is broken
HadassahJoseph Apr 29, 2023
044d05c
commiting my code
HadassahJoseph Apr 29, 2023
069d5c6
Merge branch 'master' of https://github.com/HadassahJoseph/MusicVisuals
molly-100 Apr 29, 2023
09c4b19
your mom
Aces002 Apr 29, 2023
4c5d6fc
Merge branch 'master' of https://github.om/HadassahJoseph/MusicVisuals
Aces002 Apr 29, 2023
a566ed8
check if file is working after merge
molly-100 Apr 29, 2023
364af40
make the notes move up and down vertically
molly-100 Apr 29, 2023
7958f61
fixed movement of notes
molly-100 Apr 30, 2023
19d5868
added array list for colours
molly-100 Apr 30, 2023
dfeb1b2
changing colour of notes
molly-100 Apr 30, 2023
2fe0718
added to drawNotes()
molly-100 Apr 30, 2023
afd5b95
updated update method
molly-100 Apr 30, 2023
7952a45
updated draw
molly-100 Apr 30, 2023
db84c44
working version
molly-100 Apr 30, 2023
8b1b643
update
molly-100 May 1, 2023
3501ad8
update comments
molly-100 May 1, 2023
2e50625
add new note
molly-100 May 1, 2023
097f1f2
add to draw
molly-100 May 1, 2023
c3a7c09
fix note
molly-100 May 1, 2023
f7d5831
added to note
molly-100 May 1, 2023
135a3c3
draw another note
molly-100 May 1, 2023
c43a63b
notes drawing fixed
molly-100 May 1, 2023
2587964
i have delte some files that were previously meregd and made new fol…
HadassahJoseph May 2, 2023
6f492b9
trying to recive and delete files we dont need
HadassahJoseph May 2, 2023
fe342f7
bla
CeciliaLuan May 2, 2023
61bc143
Deleting the experiance file
HadassahJoseph May 2, 2023
3772f41
deleting main
HadassahJoseph May 2, 2023
cf6c8b9
merging og molly' files
HadassahJoseph May 2, 2023
63ca8a5
Merge branch 'master' of into CeciliaLuan-master
HadassahJoseph May 2, 2023
7f6874b
made a branch for cece and molly and have addded their repsective fil…
HadassahJoseph May 2, 2023
adfe80f
saving all my previous work i.e:- added a line to my disco ball
Aces002 May 2, 2023
9008a6b
Merge branch 'master' of
HadassahJoseph May 2, 2023
382af63
made a branch for grace and added her work into it
HadassahJoseph May 2, 2023
e480fbc
mereged graces files to the master
HadassahJoseph May 2, 2023
7a88dfa
trying to commit my changes
HadassahJoseph May 2, 2023
6fd4125
adding molly's file to the master branch
HadassahJoseph May 2, 2023
33b3efc
have added 3 members file to the master branch
HadassahJoseph May 2, 2023
a772a3b
bla
CeciliaLuan May 2, 2023
e1fa68b
bla
CeciliaLuan May 3, 2023
a177eb7
bla
CeciliaLuan May 4, 2023
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 modified .DS_Store
Binary file not shown.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Music Visualiser Project

Name:
Name: Cecilia Luan

Student Number:

Expand Down
Binary file modified java/.DS_Store
Binary file not shown.
4 changes: 2 additions & 2 deletions java/.project
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@
</natures>
<filteredResources>
<filter>
<id>1616413840733</id>
<id>1680783242009</id>
<name></name>
<type>30</type>
<matcher>
<id>org.eclipse.core.resources.regexFilterMatcher</id>
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
<arguments>node_modules|\.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
</matcher>
</filter>
</filteredResources>
Expand Down
49 changes: 49 additions & 0 deletions java/bin/ie/tudublin/Log.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
6/04/23 :-
Went on call with cece and ad file for mp3 player ,
expeirnce file and started our projected

how to you play a file from another file

we each have 35 seconds in the ()
THIS IS

this is HADASSAH
Love always feels better when it's true
Love tastes way too bitter when it's you
I'm all out of love, you gave it away
I'm hoping that experience can get you to change
I'm hoping that experience can get you to change
I'm hoping that (ooh, oh)
I'm all out of love, you gave it away
I'm hoping that experience can get you to change
I'm hoping that experience can get you to change
I'm hoping that

THIS IS cece
Love's no pressure
When it's with someone who tends to
All of your emotions, know you'll
Find someone who's there for you
Find someone who's there for you
Love always feels better when it's true
Love tastes way too bitter when it's you
end 1:35

end at 2:10


idea
peace sign
reacord player
grovey pattern
gathered particles beating out
write experiance at the end
cece qriting words goinfg aroud her cirlce

begin stars shooting dwon enters ino syclidlic area then says :- welcome to experianc
ends with stars shooting out to fast white shoot and the words expeoirance has concluded written


cece wants to add a stem to her flower that looks similar to a sound wave
aisha wnats to
hadassah wants to try particle thing , change the colour to silver flashing lights
Binary file not shown.
190 changes: 190 additions & 0 deletions java/src/assaigment/DiscoBall.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,190 @@



package assaigment;

import ddf.minim.AudioBuffer;
import ddf.minim.AudioInput;
import ddf.minim.AudioPlayer;
import ddf.minim.AudioSource;
import ddf.minim.Minim;
import ddf.minim.analysis.FFT;
import jogamp.opengl.glu.nurbs.Curve;
import processing.core.PApplet;

public class DiscoBall extends PApplet {

Minim minim;
AudioPlayer ap;
AudioInput ai;
AudioBuffer ab;
FFT fft;


int mode = 0;
float theta = 0;
float rotationSpeed = (float) 0.01;

public void settings() {

size(800, 800, P3D);
noSmooth();

}


public void setup() {

minim = new Minim(this);
ap = minim.loadFile("Victoria_Mon_t_ft_Khalid_-_Experience.mp3", 1024);
ap.play();
ap.loop();
ab = ap.mix;
fft = new FFT(ab.size(), ((AudioSource) ap).sampleRate());

// Create gradient background
for (int y = 0; y < height; y++) {

// Calculate the color at each row
int c = lerpColor(color(139, 0, 139), color(255, 140, 0), map2(y, 0, height, 0, 1));

// Set the color for the row
stroke(c);

// Draw a line for the row
line(0, y, width, y);

}
}

public void draw() {


pushMatrix(); // Save the current transformation matrix

// displays hearts on the screen
for (int i = 0; i < 5; i++) {

Heart heart = new Heart();
heart.display();

}

popMatrix(); // Restore the previous transformation matrix

translate(width/2, height/2, 0); // Move the sphere to the center of the screen
float angle = (float) (frameCount * 0.01); // Use a fixed rotation speed based on frame count
rotateY(angle); // Rotate the sphere based on the angle

fft = new FFT(ap.bufferSize(), ap.sampleRate()); // Initialize FFT with the audio buffer size and sample rate
fft.forward(ab); // Perform FFT on the audio buffer
float[] spectrum = fft.getSpectrumImaginary(); // Get frequency spectrum data


float sum = 0;

for (int i = 0; i < spectrum.length; i++) {

sum += spectrum[i]; // Calculate the sum of all frequency values

}
float average = sum / spectrum.length; // Calculate the average frequency value

rotationSpeed = map2(average, 0, 255, 0.001, 0.1); // Map the average frequency value to a rotation speed range
rotateY(rotationSpeed * frameCount); // Rotate the sphere based on the current frame count and rotation speed

// set the thickness of the lines in the disco ball
stroke(204,204,255);
strokeWeight((float) 3.5); // sets the thickness of lines in the disco Ball
line(0, -250, 0, 0);



fill(160,160,160);// set th colour of the sphere
sphere(250); // Draw the sphere

discoBallRope();


}

private float map2(float value, double f, double g, double d, double e) {

return (float) (d + (e - d) * ((value - f) / (g - f)));

}


void discoBallRope() {

stroke(192,192,192);
strokeWeight(10); // Set the thickness of the line
line(0, 0, 0, 0, -height/2, 0); // Draw the line from the top of the sphere to the top of the screen

}

class Heart {

float heartSize;
float heartX;
float heartBottomY;
float r;

Heart() {

heartSize = random(10, 100);
heartX = random(width);
heartBottomY = random(height+heartSize);
r = random(255);

}




void display() {


float level = ap.mix.level();

if (level > 0.1) {

// Set heart position and color
heartX = random(width);
heartBottomY = random(height+heartSize);
r = random(255);

}

fill(r, 0, 0);
stroke(r, 0, 0);

//left half of heart
beginShape();
curveVertex(heartX, heartBottomY+heartSize); //anchor point
curveVertex(heartX, heartBottomY); //bottom tip
curveVertex(heartX - heartSize/2, (float) (heartBottomY-heartSize/1.5)); //left edge
curveVertex(heartX - heartSize/3, heartBottomY-heartSize); //top of left edge
curveVertex(heartX, (float) (heartBottomY-heartSize*.75)); //top middle dip
curveVertex(heartX, heartBottomY); //guiding point
endShape();

//right half of heart
beginShape();
curveVertex(heartX, heartBottomY);
curveVertex(heartX, (float) (heartBottomY-heartSize*.75));
curveVertex(heartX + heartSize/3, heartBottomY-heartSize);
curveVertex(heartX + heartSize/2, (float) (heartBottomY-heartSize/1.5));
curveVertex(heartX, heartBottomY);
curveVertex(heartX, heartBottomY + heartSize);
endShape();

}





}

}
38 changes: 38 additions & 0 deletions java/src/assaigment/Main.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
package assaigment;


import ie.tudublin.Experiance;

public class Main
{

public void startUI()
{
String[] a = {"MAIN"};
processing.core.PApplet.runSketch( a, new stars());
}
public void discoBallUI()
{
String[] a = {"MAIN"};
processing.core.PApplet.runSketch( a, new DiscoBall());
}

public void music_noteUI()
{
String[] a = {"MAIN"};
processing.core.PApplet.runSketch( a, new music_note());

}

public void experianceUI()
{
String[] a = {"MAIN"};
processing.core.PApplet.runSketch( a, new Experiance());
}

public static void main(String[] args)
{
Main main = new Main();
main.startUI();
}
}
Loading