rename

batKem · Jun 8, 2018 · 33c3867 · 33c3867
1 parent 2eebf5c
commit 33c3867
Show file tree

Hide file tree

Showing 39 changed files with 5 additions and 5 deletions.
diff --git a/Game/Chart.pde → TangibleGame/Chart.pde b/Game/Chart.pde → TangibleGame/Chart.pde
diff --git a/Game/HScrollbar.pde → TangibleGame/HScrollbar.pde b/Game/HScrollbar.pde → TangibleGame/HScrollbar.pde
diff --git a/Game/Mover.pde → TangibleGame/Mover.pde b/Game/Mover.pde → TangibleGame/Mover.pde
@@ -114,7 +114,7 @@ class Mover{
         }
 
       }
-      cylinders.removeAll(toDeleteCyl);
+      //cylinders.removeAll(toDeleteCyl);
       score[0] = max(0, score[0]);
   	}
 

diff --git a/Game/QuadGraph.pde → TangibleGame/QuadGraph.pde b/Game/QuadGraph.pde → TangibleGame/QuadGraph.pde
diff --git a/Game/Game.pde → TangibleGame/TangibleGame.pde b/Game/Game.pde → TangibleGame/TangibleGame.pde
@@ -281,8 +281,8 @@ void run(PGraphics s){
       s.background(150);
 
       s.stroke(0);
-      s.text("v="+ball.norm(ball.velocity),10,10);
-      s.text("s="+score[0],10,20);
+      s.text("velocity="+ball.norm(ball.velocity),10,10);
+      s.text("score="+score[0],10,20);
       s.endDraw();
 
   }

diff --git a/Game/Test Images-20180417.zip → TangibleGame/Test Images-20180417.zip b/Game/Test Images-20180417.zip → TangibleGame/Test Images-20180417.zip
diff --git a/Game/TwoDThreeD.pde → TangibleGame/TwoDThreeD.pde b/Game/TwoDThreeD.pde → TangibleGame/TwoDThreeD.pde
diff --git a/Game/app.pde → TangibleGame/app.pde b/Game/app.pde → TangibleGame/app.pde
@@ -51,11 +51,11 @@ void settings() {
 		QuadGraph qGraph = new QuadGraph();
 		TwoDThreeD twoDThreeD = new TwoDThreeD(img.width, img.height, 1/60);
 
-	    img = thresholdHSB(img, 94, 142, 90, 255, 0, 255); //H/B/S thresholding
+	    img = thresholdHSB(img, 78, 142, 80, 255,25, 250); //H/B/S thresholding
 	    img = findConnectedComponents(img, false);
 	    img = convolute(img); //Blurring
 	    img = scharr(img); //Edge Detection
-	    img = threshold(img, 120); //Supression low bright pixels
+	    img = threshold(img, 90); //Supression low bright pixels
 	    lines = hough(img, 4); //Hough transform
 
 	    corners = qGraph.findBestQuad(lines, img.width, img.height, 280000, 30000, false);

diff --git a/Game/board1Blurred.bmp → TangibleGame/board1Blurred.bmp b/Game/board1Blurred.bmp → TangibleGame/board1Blurred.bmp
diff --git a/Game/board1Scharr.bmp → TangibleGame/board1Scharr.bmp b/Game/board1Scharr.bmp → TangibleGame/board1Scharr.bmp
diff --git a/Game/board1Thresholded.bmp → TangibleGame/board1Thresholded.bmp b/Game/board1Thresholded.bmp → TangibleGame/board1Thresholded.bmp
diff --git a/Game/board2.jpg → TangibleGame/board2.jpg b/Game/board2.jpg → TangibleGame/board2.jpg
diff --git a/Game/board3.jpg → TangibleGame/board3.jpg b/Game/board3.jpg → TangibleGame/board3.jpg
diff --git a/Game/board4.jpg → TangibleGame/board4.jpg b/Game/board4.jpg → TangibleGame/board4.jpg
diff --git a/Game/colour.txt → TangibleGame/colour.txt b/Game/colour.txt → TangibleGame/colour.txt
diff --git a/Game/colour/HScrollbar.pde → TangibleGame/colour/HScrollbar.pde b/Game/colour/HScrollbar.pde → TangibleGame/colour/HScrollbar.pde
diff --git a/Game/colour/board1.jpg → TangibleGame/colour/board1.jpg b/Game/colour/board1.jpg → TangibleGame/colour/board1.jpg
diff --git a/Game/colour/board1Thresholded.bmp → TangibleGame/colour/board1Thresholded.bmp b/Game/colour/board1Thresholded.bmp → TangibleGame/colour/board1Thresholded.bmp
diff --git a/Game/colour/board2.jpg → TangibleGame/colour/board2.jpg b/Game/colour/board2.jpg → TangibleGame/colour/board2.jpg
diff --git a/Game/colour/board3.jpg → TangibleGame/colour/board3.jpg b/Game/colour/board3.jpg → TangibleGame/colour/board3.jpg
diff --git a/Game/colour/board4.jpg → TangibleGame/colour/board4.jpg b/Game/colour/board4.jpg → TangibleGame/colour/board4.jpg
diff --git a/Game/colour/colour.pde → TangibleGame/colour/colour.pde b/Game/colour/colour.pde → TangibleGame/colour/colour.pde
diff --git a/...colour/colour6408840223639038626.autosave → ...colour/colour6408840223639038626.autosave b/...colour/colour6408840223639038626.autosave → ...colour/colour6408840223639038626.autosave
diff --git a/...colour/colour7359010822307444219.autosave → ...colour/colour7359010822307444219.autosave b/...colour/colour7359010822307444219.autosave → ...colour/colour7359010822307444219.autosave
diff --git a/Game/colour/data/board1.jpg → TangibleGame/colour/data/board1.jpg b/Game/colour/data/board1.jpg → TangibleGame/colour/data/board1.jpg
diff --git a/Game/cylinder.mtl → TangibleGame/cylinder.mtl b/Game/cylinder.mtl → TangibleGame/cylinder.mtl
diff --git a/Game/cylinder.obj → TangibleGame/cylinder.obj b/Game/cylinder.obj → TangibleGame/cylinder.obj
diff --git a/Game/data/testvideo.avi → TangibleGame/data/testvideo.avi b/Game/data/testvideo.avi → TangibleGame/data/testvideo.avi
diff --git a/Game/lineDetection/QuadGraph.pde → TangibleGame/lineDetection/QuadGraph.pde b/Game/lineDetection/QuadGraph.pde → TangibleGame/lineDetection/QuadGraph.pde
diff --git a/Game/lineDetection/data/hough_test.bmp → ...bleGame/lineDetection/data/hough_test.bmp b/Game/lineDetection/data/hough_test.bmp → ...bleGame/lineDetection/data/hough_test.bmp
diff --git a/Game/lineDetection/hough_test.bmp → TangibleGame/lineDetection/hough_test.bmp b/Game/lineDetection/hough_test.bmp → TangibleGame/lineDetection/hough_test.bmp
diff --git a/Game/lineDetection/lineDetection.pde → TangibleGame/lineDetection/lineDetection.pde b/Game/lineDetection/lineDetection.pde → TangibleGame/lineDetection/lineDetection.pde
diff --git a/Game/nao.jpg → TangibleGame/nao.jpg b/Game/nao.jpg → TangibleGame/nao.jpg
diff --git a/Game/scrollbar/HScrollbar.pde → TangibleGame/scrollbar/HScrollbar.pde b/Game/scrollbar/HScrollbar.pde → TangibleGame/scrollbar/HScrollbar.pde
diff --git a/Game/scrollbar/scrollbar.pde → TangibleGame/scrollbar/scrollbar.pde b/Game/scrollbar/scrollbar.pde → TangibleGame/scrollbar/scrollbar.pde
diff --git a/Game/webcam/webcam.pde → TangibleGame/webcam/webcam.pde b/Game/webcam/webcam.pde → TangibleGame/webcam/webcam.pde
diff --git a/Game/week12/TwoDThreeD.pde → TangibleGame/week12/TwoDThreeD.pde b/Game/week12/TwoDThreeD.pde → TangibleGame/week12/TwoDThreeD.pde
diff --git a/Game/week12/milestone2.pde → TangibleGame/week12/milestone2.pde b/Game/week12/milestone2.pde → TangibleGame/week12/milestone2.pde
diff --git a/Game/week12/week12.pde → TangibleGame/week12/week12.pde b/Game/week12/week12.pde → TangibleGame/week12/week12.pde
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,7 +114,7 @@ class Mover{ @@
             }
           }
-          cylinders.removeAll(toDeleteCyl);
+          //cylinders.removeAll(toDeleteCyl);
           score[0] = max(0, score[0]);
       	}
@@ Expand Down @@