From 33c3867316c41015fec325ff53e63452f5675965 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 8 Jun 2018 23:23:00 +0200 Subject: [PATCH] rename --- {Game => TangibleGame}/Chart.pde | 0 {Game => TangibleGame}/HScrollbar.pde | 0 {Game => TangibleGame}/Mover.pde | 2 +- {Game => TangibleGame}/QuadGraph.pde | 0 Game/Game.pde => TangibleGame/TangibleGame.pde | 4 ++-- {Game => TangibleGame}/Test Images-20180417.zip | Bin {Game => TangibleGame}/TwoDThreeD.pde | 0 {Game => TangibleGame}/app.pde | 4 ++-- {Game => TangibleGame}/board1Blurred.bmp | Bin {Game => TangibleGame}/board1Scharr.bmp | Bin {Game => TangibleGame}/board1Thresholded.bmp | Bin {Game => TangibleGame}/board2.jpg | Bin {Game => TangibleGame}/board3.jpg | Bin {Game => TangibleGame}/board4.jpg | Bin {Game => TangibleGame}/colour.txt | 0 {Game => TangibleGame}/colour/HScrollbar.pde | 0 {Game => TangibleGame}/colour/board1.jpg | Bin {Game => TangibleGame}/colour/board1Thresholded.bmp | Bin {Game => TangibleGame}/colour/board2.jpg | Bin {Game => TangibleGame}/colour/board3.jpg | Bin {Game => TangibleGame}/colour/board4.jpg | Bin {Game => TangibleGame}/colour/colour.pde | 0 .../colour/colour6408840223639038626.autosave | 0 .../colour/colour7359010822307444219.autosave | 0 {Game => TangibleGame}/colour/data/board1.jpg | Bin {Game => TangibleGame}/cylinder.mtl | 0 {Game => TangibleGame}/cylinder.obj | 0 {Game => TangibleGame}/data/testvideo.avi | Bin {Game => TangibleGame}/lineDetection/QuadGraph.pde | 0 .../lineDetection/data/hough_test.bmp | Bin {Game => TangibleGame}/lineDetection/hough_test.bmp | Bin .../lineDetection/lineDetection.pde | 0 {Game => TangibleGame}/nao.jpg | Bin {Game => TangibleGame}/scrollbar/HScrollbar.pde | 0 {Game => TangibleGame}/scrollbar/scrollbar.pde | 0 {Game => TangibleGame}/webcam/webcam.pde | 0 {Game => TangibleGame}/week12/TwoDThreeD.pde | 0 {Game => TangibleGame}/week12/milestone2.pde | 0 {Game => TangibleGame}/week12/week12.pde | 0 39 files changed, 5 insertions(+), 5 deletions(-) rename {Game => TangibleGame}/Chart.pde (100%) rename {Game => TangibleGame}/HScrollbar.pde (100%) rename {Game => TangibleGame}/Mover.pde (98%) rename {Game => TangibleGame}/QuadGraph.pde (100%) rename Game/Game.pde => TangibleGame/TangibleGame.pde (98%) rename {Game => TangibleGame}/Test Images-20180417.zip (100%) rename {Game => TangibleGame}/TwoDThreeD.pde (100%) rename {Game => TangibleGame}/app.pde (99%) rename {Game => TangibleGame}/board1Blurred.bmp (100%) rename {Game => TangibleGame}/board1Scharr.bmp (100%) rename {Game => TangibleGame}/board1Thresholded.bmp (100%) rename {Game => TangibleGame}/board2.jpg (100%) rename {Game => TangibleGame}/board3.jpg (100%) rename {Game => TangibleGame}/board4.jpg (100%) rename {Game => TangibleGame}/colour.txt (100%) rename {Game => TangibleGame}/colour/HScrollbar.pde (100%) rename {Game => TangibleGame}/colour/board1.jpg (100%) rename {Game => TangibleGame}/colour/board1Thresholded.bmp (100%) rename {Game => TangibleGame}/colour/board2.jpg (100%) rename {Game => TangibleGame}/colour/board3.jpg (100%) rename {Game => TangibleGame}/colour/board4.jpg (100%) rename {Game => TangibleGame}/colour/colour.pde (100%) rename {Game => TangibleGame}/colour/colour6408840223639038626.autosave (100%) rename {Game => TangibleGame}/colour/colour7359010822307444219.autosave (100%) rename {Game => TangibleGame}/colour/data/board1.jpg (100%) rename {Game => TangibleGame}/cylinder.mtl (100%) rename {Game => TangibleGame}/cylinder.obj (100%) rename {Game => TangibleGame}/data/testvideo.avi (100%) rename {Game => TangibleGame}/lineDetection/QuadGraph.pde (100%) rename {Game => TangibleGame}/lineDetection/data/hough_test.bmp (100%) rename {Game => TangibleGame}/lineDetection/hough_test.bmp (100%) rename {Game => TangibleGame}/lineDetection/lineDetection.pde (100%) rename {Game => TangibleGame}/nao.jpg (100%) rename {Game => TangibleGame}/scrollbar/HScrollbar.pde (100%) rename {Game => TangibleGame}/scrollbar/scrollbar.pde (100%) rename {Game => TangibleGame}/webcam/webcam.pde (100%) rename {Game => TangibleGame}/week12/TwoDThreeD.pde (100%) rename {Game => TangibleGame}/week12/milestone2.pde (100%) rename {Game => TangibleGame}/week12/week12.pde (100%) diff --git a/Game/Chart.pde b/TangibleGame/Chart.pde similarity index 100% rename from Game/Chart.pde rename to TangibleGame/Chart.pde diff --git a/Game/HScrollbar.pde b/TangibleGame/HScrollbar.pde similarity index 100% rename from Game/HScrollbar.pde rename to TangibleGame/HScrollbar.pde diff --git a/Game/Mover.pde b/TangibleGame/Mover.pde similarity index 98% rename from Game/Mover.pde rename to TangibleGame/Mover.pde index 32aa505..b3e6437 100644 --- a/Game/Mover.pde +++ b/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 b/TangibleGame/QuadGraph.pde similarity index 100% rename from Game/QuadGraph.pde rename to TangibleGame/QuadGraph.pde diff --git a/Game/Game.pde b/TangibleGame/TangibleGame.pde similarity index 98% rename from Game/Game.pde rename to TangibleGame/TangibleGame.pde index 0e9c4de..e251eb4 100644 --- a/Game/Game.pde +++ b/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 b/TangibleGame/Test Images-20180417.zip similarity index 100% rename from Game/Test Images-20180417.zip rename to TangibleGame/Test Images-20180417.zip diff --git a/Game/TwoDThreeD.pde b/TangibleGame/TwoDThreeD.pde similarity index 100% rename from Game/TwoDThreeD.pde rename to TangibleGame/TwoDThreeD.pde diff --git a/Game/app.pde b/TangibleGame/app.pde similarity index 99% rename from Game/app.pde rename to TangibleGame/app.pde index df4f36d..28e5e2b 100644 --- a/Game/app.pde +++ b/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 b/TangibleGame/board1Blurred.bmp similarity index 100% rename from Game/board1Blurred.bmp rename to TangibleGame/board1Blurred.bmp diff --git a/Game/board1Scharr.bmp b/TangibleGame/board1Scharr.bmp similarity index 100% rename from Game/board1Scharr.bmp rename to TangibleGame/board1Scharr.bmp diff --git a/Game/board1Thresholded.bmp b/TangibleGame/board1Thresholded.bmp similarity index 100% rename from Game/board1Thresholded.bmp rename to TangibleGame/board1Thresholded.bmp diff --git a/Game/board2.jpg b/TangibleGame/board2.jpg similarity index 100% rename from Game/board2.jpg rename to TangibleGame/board2.jpg diff --git a/Game/board3.jpg b/TangibleGame/board3.jpg similarity index 100% rename from Game/board3.jpg rename to TangibleGame/board3.jpg diff --git a/Game/board4.jpg b/TangibleGame/board4.jpg similarity index 100% rename from Game/board4.jpg rename to TangibleGame/board4.jpg diff --git a/Game/colour.txt b/TangibleGame/colour.txt similarity index 100% rename from Game/colour.txt rename to TangibleGame/colour.txt diff --git a/Game/colour/HScrollbar.pde b/TangibleGame/colour/HScrollbar.pde similarity index 100% rename from Game/colour/HScrollbar.pde rename to TangibleGame/colour/HScrollbar.pde diff --git a/Game/colour/board1.jpg b/TangibleGame/colour/board1.jpg similarity index 100% rename from Game/colour/board1.jpg rename to TangibleGame/colour/board1.jpg diff --git a/Game/colour/board1Thresholded.bmp b/TangibleGame/colour/board1Thresholded.bmp similarity index 100% rename from Game/colour/board1Thresholded.bmp rename to TangibleGame/colour/board1Thresholded.bmp diff --git a/Game/colour/board2.jpg b/TangibleGame/colour/board2.jpg similarity index 100% rename from Game/colour/board2.jpg rename to TangibleGame/colour/board2.jpg diff --git a/Game/colour/board3.jpg b/TangibleGame/colour/board3.jpg similarity index 100% rename from Game/colour/board3.jpg rename to TangibleGame/colour/board3.jpg diff --git a/Game/colour/board4.jpg b/TangibleGame/colour/board4.jpg similarity index 100% rename from Game/colour/board4.jpg rename to TangibleGame/colour/board4.jpg diff --git a/Game/colour/colour.pde b/TangibleGame/colour/colour.pde similarity index 100% rename from Game/colour/colour.pde rename to TangibleGame/colour/colour.pde diff --git a/Game/colour/colour6408840223639038626.autosave b/TangibleGame/colour/colour6408840223639038626.autosave similarity index 100% rename from Game/colour/colour6408840223639038626.autosave rename to TangibleGame/colour/colour6408840223639038626.autosave diff --git a/Game/colour/colour7359010822307444219.autosave b/TangibleGame/colour/colour7359010822307444219.autosave similarity index 100% rename from Game/colour/colour7359010822307444219.autosave rename to TangibleGame/colour/colour7359010822307444219.autosave diff --git a/Game/colour/data/board1.jpg b/TangibleGame/colour/data/board1.jpg similarity index 100% rename from Game/colour/data/board1.jpg rename to TangibleGame/colour/data/board1.jpg diff --git a/Game/cylinder.mtl b/TangibleGame/cylinder.mtl similarity index 100% rename from Game/cylinder.mtl rename to TangibleGame/cylinder.mtl diff --git a/Game/cylinder.obj b/TangibleGame/cylinder.obj similarity index 100% rename from Game/cylinder.obj rename to TangibleGame/cylinder.obj diff --git a/Game/data/testvideo.avi b/TangibleGame/data/testvideo.avi similarity index 100% rename from Game/data/testvideo.avi rename to TangibleGame/data/testvideo.avi diff --git a/Game/lineDetection/QuadGraph.pde b/TangibleGame/lineDetection/QuadGraph.pde similarity index 100% rename from Game/lineDetection/QuadGraph.pde rename to TangibleGame/lineDetection/QuadGraph.pde diff --git a/Game/lineDetection/data/hough_test.bmp b/TangibleGame/lineDetection/data/hough_test.bmp similarity index 100% rename from Game/lineDetection/data/hough_test.bmp rename to TangibleGame/lineDetection/data/hough_test.bmp diff --git a/Game/lineDetection/hough_test.bmp b/TangibleGame/lineDetection/hough_test.bmp similarity index 100% rename from Game/lineDetection/hough_test.bmp rename to TangibleGame/lineDetection/hough_test.bmp diff --git a/Game/lineDetection/lineDetection.pde b/TangibleGame/lineDetection/lineDetection.pde similarity index 100% rename from Game/lineDetection/lineDetection.pde rename to TangibleGame/lineDetection/lineDetection.pde diff --git a/Game/nao.jpg b/TangibleGame/nao.jpg similarity index 100% rename from Game/nao.jpg rename to TangibleGame/nao.jpg diff --git a/Game/scrollbar/HScrollbar.pde b/TangibleGame/scrollbar/HScrollbar.pde similarity index 100% rename from Game/scrollbar/HScrollbar.pde rename to TangibleGame/scrollbar/HScrollbar.pde diff --git a/Game/scrollbar/scrollbar.pde b/TangibleGame/scrollbar/scrollbar.pde similarity index 100% rename from Game/scrollbar/scrollbar.pde rename to TangibleGame/scrollbar/scrollbar.pde diff --git a/Game/webcam/webcam.pde b/TangibleGame/webcam/webcam.pde similarity index 100% rename from Game/webcam/webcam.pde rename to TangibleGame/webcam/webcam.pde diff --git a/Game/week12/TwoDThreeD.pde b/TangibleGame/week12/TwoDThreeD.pde similarity index 100% rename from Game/week12/TwoDThreeD.pde rename to TangibleGame/week12/TwoDThreeD.pde diff --git a/Game/week12/milestone2.pde b/TangibleGame/week12/milestone2.pde similarity index 100% rename from Game/week12/milestone2.pde rename to TangibleGame/week12/milestone2.pde diff --git a/Game/week12/week12.pde b/TangibleGame/week12/week12.pde similarity index 100% rename from Game/week12/week12.pde rename to TangibleGame/week12/week12.pde