X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FGuiTest.java;h=0d199c238a1c624760c9da6fba4c06fd4e731dbd;hb=adc29b9a70fa1d03ac67b0b3f397fed7a75f4d7b;hp=a3cabf49eca8b97baf00e1a73d26b63e4b68cd19;hpb=03b67a7377d6d23d517d33e47f338bb7859596ed;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/GuiTest.java b/src/kaka/cakelight/GuiTest.java
index a3cabf4..0d199c2 100644
--- a/src/kaka/cakelight/GuiTest.java
+++ b/src/kaka/cakelight/GuiTest.java
@@ -37,7 +37,7 @@ public class GuiTest extends Application {
 
         Scene scene = new Scene(root);
         scene.setOnKeyPressed(keyEvent -> {
-            if (keyEvent.getCode() == KeyCode.ESCAPE) {
+            if (keyEvent.getCode() == KeyCode.ESCAPE || keyEvent.getCode() == KeyCode.Q) {
                 stage.close();
                 cakelight.cleanup();
             }
@@ -56,19 +56,19 @@ public class GuiTest extends Application {
 
     private void setupCakeLight() {
         log("Running with config:\n" + config);
-        cakelight = new CakeLight(config, new LedController() {
-            @Override
-            public void accept(LedFrame ledFrame) {
-                if (!paused) drawLEDs(canvas.getGraphicsContext2D(), ledFrame);
-            }
-        });
+        cakelight = new CakeLight(config);
         VideoMode mode = new VideoMode();
         cakelight.setMode(mode);
         cakelight.startLoop();
         mode.onVideoFrame(frame -> drawFrame(canvas.getGraphicsContext2D(), frame));
     }
 
-    private void drawFrame(GraphicsContext gc, Frame frame) {
+    private javafx.scene.paint.Color getLedColor(LedFrame frame, int led) {
+        kaka.cakelight.Color c = frame.getLedColor(led);
+        return javafx.scene.paint.Color.rgb(c.r(), c.g(), c.b());
+    }
+
+    private void drawFrame(GraphicsContext gc, VideoFrame frame) {
         if (paused) return;
         System.out.println("Drawing a frame");
         drawCols(gc, frame);
@@ -83,20 +83,24 @@ public class GuiTest extends Application {
         float rowSize = 9f * BLOCK / config.leds.rows;
 //        DropShadow shadow = new DropShadow(BlurType.ONE_PASS_BOX, Color.RED, colSize * 2, colSize, 0, 0);
         for (int x = 0; x < config.leds.cols; x++) {
-            gc.setFill(frame.getLedColor(x + config.leds.rows));
+            // Top
+            gc.setFill(getLedColor(frame, config.leds.cols * 2 + config.leds.rows - x - 1));
             gc.fillRect(GUTTER + x * colSize, GUTTER - ledLength, colSize, ledLength);
-            gc.setFill(frame.getLedColor(config.leds.rows * 2 + config.leds.cols * 2 - 1 - x));
+            // Bottom
+            gc.setFill(getLedColor(frame, x));
             gc.fillRect(GUTTER + x * colSize, GUTTER + 9 * BLOCK, colSize, ledLength);
         }
         for (int y = 0; y < config.leds.rows; y++) {
-            gc.setFill(frame.getLedColor(config.leds.rows - 1 - y));
+            // Left
+            gc.setFill(getLedColor(frame, config.leds.cols * 2 + config.leds.rows + y));
             gc.fillRect(GUTTER - ledLength, GUTTER + y * rowSize, ledLength, rowSize);
-            gc.setFill(frame.getLedColor(y + config.leds.rows + config.leds.cols));
+            // Right
+            gc.setFill(getLedColor(frame, config.leds.rows + config.leds.cols - y - 1));
             gc.fillRect(GUTTER + 16 * BLOCK, GUTTER + y * rowSize, ledLength, rowSize);
         }
     }
 
-    private void drawVideo(GraphicsContext gc, Frame frame) {
+    private void drawVideo(GraphicsContext gc, VideoFrame frame) {
         byte[] rgb = new byte[3];
         Mat img = frame.getConvertedImage();
         float colSize = 16 * BLOCK / (float)img.cols();
@@ -110,7 +114,7 @@ public class GuiTest extends Application {
         }
     }
 
-    private void drawCols(GraphicsContext gc, Frame frame) {
+    private void drawCols(GraphicsContext gc, VideoFrame frame) {
         byte[] rgb = new byte[3];
         for (int x = 0; x < config.leds.cols; x++) {
             for (int y = 0; y < 9; y++) {
@@ -120,7 +124,7 @@ public class GuiTest extends Application {
         }
     }
 
-    private void drawRows(GraphicsContext gc, Frame frame) {
+    private void drawRows(GraphicsContext gc, VideoFrame frame) {
         byte[] rgb = new byte[3];
         for (int y = 0; y < config.leds.rows; y++) {
             for (int x = 0; x < 16; x++) {