Move all modes to package kaka.cakelight.mode

[kaka/cakelight.git] / src / kaka / cakelight / GuiTest.java

diff --git a/src/kaka/cakelight/GuiTest.java b/src/kaka/cakelight/GuiTest.java
index 8feac32..8c1516c 100644 (file)
--- a/src/kaka/cakelight/GuiTest.java
+++ b/src/kaka/cakelight/GuiTest.java
@@ -9,6 +9,7 @@ import javafx.scene.layout.Pane;
 import javafx.scene.paint.Color;
 import javafx.scene.paint.Paint;
 import javafx.stage.Stage;
+import kaka.cakelight.mode.AmbientMode;
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 
@@ -37,7 +38,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,39 +61,47 @@ 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 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);
         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));
+            // 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(ListPosition.BOTTOM, 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(ListPosition.LEFT, 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(ListPosition.RIGHT, y));
+            // 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();
@@ -106,7 +115,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++) {
@@ -116,7 +125,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++) {