cleaned up code

Harshikerfuffle · Dec 11, 2020 · 44f9342 · 44f9342
1 parent 3e3fca7
commit 44f9342
Show file tree

Hide file tree

Showing 19 changed files with 22 additions and 773 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/Albers_Pattern/Algoraveset3/code/sketch.properties b/Albers_Pattern/Algoraveset3/code/sketch.properties
diff --git a/Albers_Pattern/Algoraveset4/Algoraveset4.pde b/Albers_Pattern/Algoraveset4/Algoraveset4.pde
diff --git a/Albers_Pattern/Algoraveset4/code/sketch.properties b/Albers_Pattern/Algoraveset4/code/sketch.properties
diff --git a/Albers_Pattern/Algoraveset4/sketch.properties b/Albers_Pattern/Algoraveset4/sketch.properties
diff --git a/Albers_Pattern/Algoraveset3/Algoraveset3.pde → Algoraveset/Algoraveset.pde b/Albers_Pattern/Algoraveset3/Algoraveset3.pde → Algoraveset/Algoraveset.pde
@@ -60,7 +60,6 @@ void setup() {
   //in2.start(); 
   //in2.play(); 
   //in = minim.getLineIn(); 
-
 
   song = minim.loadFile("/Users/sisi/Desktop/LiveCoding/Debut/Nina.mp3");
   song.play();
@@ -79,24 +78,19 @@ void draw() {
   //background(changing_colour, 150, 50); // Initial background color, when we will open the serial window
   background(50, 50, 200); // Initial background color, when we will open the serial window
 
-
   beat.detect(song.mix);
 
-
   //cam.beginHUD();
-
   //for (int i=0; i<width; i++){
   // stroke(255); 
   // line(i, height/2+song.mix.get(i)*300, i, height/2-song.mix.get(i)*300); 
   //}
   //cam.endHUD();
 
-
 //Calling pattern
 //----------------------------------------------------------------------------------------
   //stroke(255);
   //Albers(); 
-
 
   //--------------------------------------------------------------------------------------
   blendMode(NORMAL);
@@ -157,23 +151,15 @@ void draw() {
     background(255);
     //Albers(); 
   }
-
-
 //---------------------------------------------------------------------------------------
   //if (mousePressed && (mouseButton == LEFT)) {
   //  myPort.write('1');
   //}
   //if (mousePressed && (mouseButton == RIGHT)) {
   //  myPort.write('0');
   //}
-
-//-------------------------------------------------------------------------------------
-
-
-//--------------------------------------------------------------------------------------
 }
 
-
 //----------------------------------------------------------------------------
 
 void Albers(){

diff --git a/...rs_Pattern/Algoraveset3/sketch.properties → Algoraveset/code/sketch.properties b/...rs_Pattern/Algoraveset3/sketch.properties → Algoraveset/code/sketch.properties
diff --git a/Debut/.DS_Store b/Debut/.DS_Store
diff --git a/Debut/LiveCode_Base_1/Basefile_setup.pde → Debut/Basefile_1/Basefile_1.pde b/Debut/LiveCode_Base_1/Basefile_setup.pde → Debut/Basefile_1/Basefile_1.pde
diff --git a/Debut/LiveCode_Base_2/Live_Code_Base.pde → Debut/Basefile_2/Basefile_2.pde b/Debut/LiveCode_Base_2/Live_Code_Base.pde → Debut/Basefile_2/Basefile_2.pde
diff --git a/Debut/LiveCode_Base_1/sketch.properties b/Debut/LiveCode_Base_1/sketch.properties
diff --git a/Triangle/Triangle_Strip_Processing/Triangle_Strip_Processing.pde b/Triangle/Triangle_Strip_Processing/Triangle_Strip_Processing.pde
@@ -6,9 +6,10 @@
 // https://www.youtube.com/watch?v=fO1uW-xhwtA&t=303s
 // MUSIC: NUCLEYA: download link: https://nucleya.bandcamp.com/album/bass-rani
 
-// sisixiyu x harshikajain
+// harshikajain x sisixiyu 
 
 //----------------------------------------------------------------------------
+
 import vsync.*;
 import peasy.*;
 import processing.serial.*;

diff --git a/Triangle/Triangles_Processing/Triangles_Processing.pde b/Triangle/Triangles_Processing/Triangles_Processing.pde
@@ -1,9 +1,12 @@
 // FOR PROCESSING CONSOLE 
-//code has been referenced from different locations
-//triangles code: https://www.openprocessing.org/sketch/584467
+// code has been referenced from different locations
+// triangles code: https://www.openprocessing.org/sketch/584467
 // tutorial on arduino and processing communication: https://maker.pro/arduino/tutorial/how-to-make-arduino-and-processing-ide-communicate
+
 // harshikajain  x  sisiyu
 
+//----------------------------------------------------------------------------
+
 import processing.serial.*; //import library to communicate with arduino
 Serial myPort; //initialise variable myPort for serial communication
 float background_colour; //variable for changing background colour
@@ -18,6 +21,7 @@ boolean flag=true;
 int distance=100;
 
 import processing.sound.*;
+
 //----------------------------------------------------------------------------
 void setup() {
   size (600, 600); //size of the serial window