X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FGuiTest.java;h=5aaba2fd686f31891223235d75243732da78fbef;hb=f722ee0d05ade1f90b7bc5e51d68b3aed4d65652;hp=8feac326b017d0f29f4d9971842e822e9d6418d2;hpb=100b82fe1c5ada6ef2ce768bf7b9f6f469650e11;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/GuiTest.java b/src/kaka/cakelight/GuiTest.java
index 8feac32..5aaba2f 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();
             }
@@ -60,7 +60,12 @@ public class GuiTest extends Application {
         VideoMode mode = new VideoMode();
         cakelight.setMode(mode);
         cakelight.startLoop();
-        mode.onFrame(frame -> drawFrame(canvas.getGraphicsContext2D(), frame));
+        mode.onVideoFrame(frame -> drawFrame(canvas.getGraphicsContext2D(), 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, Frame frame) {
@@ -70,24 +75,23 @@ public class GuiTest extends Application {
         drawRows(gc, frame);
 //        drawVideo(gc, frame);
         drawBorderAndGrid(gc);
-        drawLEDs(gc, frame);
     }
 
-    private void drawLEDs(GraphicsContext gc, Frame frame) {
+    private void drawLEDs(GraphicsContext gc, LedFrame frame) {
         int ledLength = GUTTER;
         float colSize = 16f * BLOCK / config.leds.cols;
         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(ListPosition.TOP, x));
+            gc.setFill(getLedColor(frame, x + config.leds.rows));
             gc.fillRect(GUTTER + x * colSize, GUTTER - ledLength, colSize, ledLength);
-            gc.setFill(frame.getLedColor(ListPosition.BOTTOM, x));
+            gc.setFill(getLedColor(frame, config.leds.rows * 2 + config.leds.cols * 2 - 1 - x));
             gc.fillRect(GUTTER + x * colSize, GUTTER + 9 * BLOCK, colSize, ledLength);
         }
         for (int y = 0; y < config.leds.rows; y++) {
-            gc.setFill(frame.getLedColor(ListPosition.LEFT, y));
+            gc.setFill(getLedColor(frame, config.leds.rows - 1 - y));
             gc.fillRect(GUTTER - ledLength, GUTTER + y * rowSize, ledLength, rowSize);
-            gc.setFill(frame.getLedColor(ListPosition.RIGHT, y));
+            gc.setFill(getLedColor(frame, y + config.leds.rows + config.leds.cols));
             gc.fillRect(GUTTER + 16 * BLOCK, GUTTER + y * rowSize, ledLength, rowSize);
         }
     }