Chris dev

README.md

@@ -1,8 +1,8 @@
 # Music Visualiser Project
 
-Name:
+Names: Aimee Mcgrane, Neil Fitzgerald, Jade Thornton, Jason O Sullivan, Chris Noblett 
 
-Student Number: 
+Student Numbers: C22393606, C22405604, C22394466, C22400796, C22454222
 
 ## Instructions
 - Fork this repository and use it a starter project for your assignment
@@ -13,12 +13,52 @@ Student Number:
 
 # Description of the assignment
 
+## Aimee
+
+## Neil
+
+## Jade
+
+## Jason
+
+## Chris
+
 # Instructions
 
+## Main Menu
+
+Once you have ran the program, a separate menu window opens with the following options:
+- Play Tune
+- Aimee
+- Neil
+- Jade
+- Jason
+- Chris
+
+## Chris's Visual Option
+Chris's visual has further visual change options based on keypress.
+Press a corresponding number on your keyboard to change the visual.
+
+| Keycode | Visual |
+|---------|-----------|
+| '1' | |
+| '2' | |
+| '3' | |
+
 # How it works
 
 # What I am most proud of in the assignment
 
+## Aimee
+
+## Neil
+
+## Jade
+
+## Jason
+
+## Chris
+
 # Markdown Tutorial
 
 This is *emphasis*
@@ -33,7 +73,7 @@ This is a numbered list
 1. Item
 1. Item
 
-This is a [hyperlink](http://bryanduggan.org)
+This is a [hyperlink]
 
 # Headings
 ## Headings
@@ -43,41 +83,19 @@ This is a [hyperlink](http://bryanduggan.org)
 This is code:
 
 ```Java
-public void render()
-{
-	ui.noFill();
-	ui.stroke(255);
-	ui.rect(x, y, width, height);
-	ui.textAlign(PApplet.CENTER, PApplet.CENTER);
-	ui.text(text, x + width * 0.5f, y + height * 0.5f);
-}
-```
-
-So is this without specifying the language:
-
-```
-public void render()
-{
-	ui.noFill();
-	ui.stroke(255);
-	ui.rect(x, y, width, height);
-	ui.textAlign(PApplet.CENTER, PApplet.CENTER);
-	ui.text(text, x + width * 0.5f, y + height * 0.5f);
-}
 ```
 
 This is an image using a relative URL:
 
-![An image](images/p8.png)
+![An image]
 
 This is an image using an absolute URL:
 
-![A different image](https://bryanduggandotorg.files.wordpress.com/2019/02/infinite-forms-00045.png?w=595&h=&zoom=2)
+![A different image]
 
 This is a youtube video:
 
-[![YouTube](http://img.youtube.com/vi/J2kHSSFA4NU/0.jpg)](https://www.youtube.com/watch?v=J2kHSSFA4NU)
-
+![YouTube]
 This is a table:
 
 | Heading 1 | Heading 2 |

java/.project

@@ -16,12 +16,12 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1616413840733</id>
+			<id>1711630517027</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>

java/src/C22454222/AudioBandsVisual.java

@@ -0,0 +1,49 @@
+package C22454222; // Package declaration
+import ie.tudublin.*; // Importing necessary classes from the ie.tudublin package
+import ddf.minim.AudioBuffer; // Importing AudioBuffer class from the ddf.minim package
+
+// This is an example of a visual that uses the audio bands
+public class AudioBandsVisual extends Visual // Class declaration, extending Visual class
+{
+    MainVisual mv; // Reference to MainVisual class
+    AudioBuffer ab; // Reference to AudioBuffer class
+    float[] lerpedBuffer; // Array to store lerped audio buffer values
+    float smoothedAmplitude = 0; // Variable to store smoothed amplitude value
+
+    // Constructor for AudioBandsVisual class
+    public AudioBandsVisual(MainVisual mv)
+    {
+        this.mv = mv; // Initializing MainVisual reference
+        ab = mv.getAudioBuffer(); // Getting audio buffer from MainVisual
+        lerpedBuffer = new float[ab.size()]; // Initializing lerpedBuffer with size of audio buffer
+    }
+
+    // Method to render the visual
+    public void render()
+    {
+        mv.beat.detect(mv.as.mix); // Detecting beat using MainVisual's AudioSum
+        mv.beat.detectMode(0); // Setting beat detection mode
+        mv.background(0); // Setting background color to black
+        float average = 0; // Variable to store average value
+        float sum = 0; // Variable to store sum of audio buffer values
+
+        // Calculating sum of absolute values of audio buffer
+        for(int i = 0 ; i < ab.size() ; i ++)
+        {
+            sum += abs(ab.get(i)); // Adding absolute value of each audio buffer element to sum
+            lerpedBuffer[i] = lerp(lerpedBuffer[i], ab.get(i), 0.1f); // Applying linear interpolation to smooth audio buffer
+        }
+
+        average = sum / (float) ab.size(); // Calculating average value
+        smoothedAmplitude = lerp(smoothedAmplitude, average, 0.1f); // Applying linear interpolation to smooth amplitude
+
+        // Draw the visual using lerpedBuffer
+        for(int i = 0; i < ab.size(); i ++)
+        {
+            float c = map(i, 0, ab.size(), 0, 255); // Mapping index to color value
+            mv.stroke(c, 255, 255); // Setting stroke color based on mapped value
+            float f = lerpedBuffer[i] * mv.height / 2 * 4.0f; // Scaling lerped buffer value
+            mv.line(i, mv.height / 2 + f, i, mv.height / 2 - f); // Drawing line based on scaled value
+        }
+    }
+}

java/src/C22454222/ChrisVisual.java

@@ -0,0 +1,120 @@
+package C22454222;
+import ddf.minim.AudioInput;
+import ddf.minim.Minim;
+import processing.core.PApplet; 
+import ie.tudublin.*;
+import ddf.minim.AudioBuffer;
+
+public class ChrisVisual extends Visual 
+{
+    MainVisual mv;
+    Minim minim;
+    AudioInput ai;
+    AudioBuffer ab;
+
+    float[] lerpedBuffer;
+    float y = 0;
+    float smoothedY = 0;
+    float smoothedAmplitude = 0;
+
+    public ChrisVisual(MainVisual mv) 
+    {
+        this.mv = mv;
+        this.ab = mv.getAudioBuffer();
+        this.ai = mv.getAudioInput();
+    }
+
+    float[] currentColours = new float[]{random(0,255),random(0,255),random(0,255)};
+    float[] previousColours = new float[]{0,0,0};
+    int kickCounter = 0;
+
+    public float[] replacingColours(float[] currentColours)
+    {
+        float[] colours = new float[]{random(0,255),random(0,255),random(0,255)};
+        for(int i = 0; i < 3; i++)
+        {
+            currentColours[i] = colours[i];
+        }
+        return currentColours;
+    }
+
+    public void render()
+    {
+        float radius = 20;
+        mv.background(0,0,0);
+        mv.beat.detect(mv.as.mix);
+        mv.beat.detectMode(0);
+        mv.fCounter++;
+        mv.translate(mv.width/2, mv.height/2);
+
+        float smooth = mv.getSmoothedAmplitude();
+
+        if (mv.beat.isKick())
+        {
+            kickCounter++;
+        }
+
+        mv.fill(currentColours[0],currentColours[1],currentColours[2], 50);
+
+        radius = 40*kickCounter;
+        mv.ellipse(0,0,radius,radius);
+
+        mv.fill(previousColours[0],previousColours[1],previousColours[2], 25);
+
+        mv.stroke(map(mv.getAmplitude(), 0, 1, 0,255),255,255);   
+
+            radius = 15*kickCounter;
+            mv.triangle(-200, -100, -140+(float)0.6*radius, radius, (-260-(float)0.6*radius), radius); 
+            mv.triangle(200, -100, 260+(float)0.6*radius, radius, (140-(float)0.6*radius), radius);
+            mv.triangle(-400, -100, -340+(float)0.6*radius, radius, (-460-(float)0.6*radius), radius); 
+            mv.triangle(400, -100, 460+(float)0.6*radius, radius, (340-(float)0.6*radius), radius);
+            mv.triangle(-600, -100, -540+(float)0.6*radius, radius, (-660-(float)0.6*radius), radius); 
+            mv.triangle(600, -100, 660+(float)0.6*radius, radius, (540-(float)0.6*radius), radius);
+
+            mv.triangle(-200, 100, -140+(float)0.6*radius, -radius, (-260-(float)0.6*radius), -radius); 
+            mv.triangle(200, 100, 260+(float)0.6*radius, -radius, (140-(float)0.6*radius), -radius);
+            mv.triangle(-400, 100, -340+(float)0.6*radius, -radius, (-460-(float)0.6*radius), -radius); 
+            mv.triangle(400, 100, 460+(float)0.6*radius, -radius, (340-(float)0.6*radius), -radius);
+            mv.triangle(-600, 100, -540+(float)0.6*radius, -radius, (-660-(float)0.6*radius), -radius); 
+            mv.triangle(600, 100, 660+(float)0.6*radius, -radius, (540-(float)0.6*radius), -radius);
+
+            if (radius > (float)mv.width / 2)
+            {
+                for (int i = 0; i < 3; i++)
+                {
+                    previousColours[i] = currentColours[i];
+                }
+                replacingColours(currentColours);
+                kickCounter = 0;
+                radius = 20;
+            }
+
+            for (float i = 0; i < mv.width; i += 0.3)
+            {
+                float x1 = (PApplet.cos(i) * smooth * i);
+                float y1 = (PApplet.sin(i) * smooth * i);
+                mv.point(x1, y1);
+            }
+
+
+            for (float i = 0; i < mv.width; i += 0.3)
+            {
+                float centerX2 = -400; 
+                float centerY2 = 0; 
+                float x2 = centerX2 + (PApplet.cos(i) * smooth * i);
+                float y2 = centerY2 + (PApplet.sin(i) * smooth * i);
+                mv.point(x2, y2);
+            }
+
+            for (float i = 0; i < mv.width; i += 0.3)
+            {
+                float centerX3 = +400; 
+                float centerY3 = 0; 
+                float x3 = centerX3 + (PApplet.cos(i) * smooth * i);
+                float y3 = centerY3 + (PApplet.sin(i) * smooth * i);
+                mv.point(x3, y3);
+            }
+    }
+}
+
+