X-Git-Url: http://git.dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FConsole.java;h=0b956aecd1ff641d8ce06fb88068978bad0d71f7;hb=baaaa10bd2e30428f8ca0f04855a24138e70d097;hp=43ebd13e9516ec86960f24ecb76d8cbab566f328;hpb=8a0c98f8672e0b52a70f183c22421cf3d1033d9a;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index 43ebd13..0b956ae 100644
--- a/src/kaka/cakelight/Console.java
+++ b/src/kaka/cakelight/Console.java
@@ -1,5 +1,10 @@
 package kaka.cakelight;
 
+import kaka.cakelight.mode.AmbientMode;
+import kaka.cakelight.mode.SingleColorMode;
+import kaka.cakelight.mode.TwoColorNoiseMode;
+import kaka.cakelight.mode.VideoMode;
+
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -17,6 +22,14 @@ public class Console extends Thread {
         this.cakelight = cakelight;
 	this.config = config;
 	reader = new BufferedReader(new InputStreamReader(System.in));
+
+    public CakeLight getCakelight() {
+	return cakelight;
+    }
+
+    public Configuration getConfig() {
+	return config;
+    }
     }
 
     @Override
@@ -47,11 +60,18 @@ public class Console extends Thread {
 		    );
 		    cakelight.setMode(new SingleColorMode(c));
 		    System.out.println("setting color to " + c);
-		} else if (input.matches("g|gamma\\s+[0-9.]+")) {
+		} else if (input.matches("(g|gamma)\\s+[0-9.]+")) {
 		    String[] split = input.split("\\s+");
 		    config.gamma = Double.parseDouble(split[1]);
+		    Color.calculateGammaCorrection(config.gamma);
 		    System.out.println("setting gamma to " + config.gamma);
-		    break;
+		} else if (input.matches("(s|saturation)\\s+[0-9.]+")) {
+		    String[] split = input.split("\\s+");
+		    config.video.saturation = Double.parseDouble(split[1]);
+		    System.out.println("setting saturation to " + config.video.saturation);
+		} else if (input.matches("(n|noise)(\\s+[a-z0-9]+){2}")) {
+		    TwoColorNoiseMode.getCommand().activate(this, input.split("\\s+"));
+		    System.out.println("setting two-color noise mode");
 		}
             } catch (IOException e) {
                 System.out.println("Error reading from command line");
@@ -59,4 +79,36 @@ public class Console extends Thread {
             }
         }
     }
+
+    public interface Command {
+        String[] getNames();
+        void activate(Console console, String[] args);
+
+	default Color parseColor(String s) {
+	    switch (s.toLowerCase()) {
+		case "r": return Color.rgb(255, 0, 0);
+		case "g": return Color.rgb(0, 255, 0);
+		case "b": return Color.rgb(0, 0, 255);
+		default: // assume hexadecimal
+		    if (s.startsWith("#")) {
+		        s = s.substring(1);
+		    }
+		    if (s.length() == 3) {
+			return Color.rgb(
+				Integer.parseInt(s.substring(0, 1), 16) * 16 + Integer.parseInt(s.substring(0, 1), 16),
+				Integer.parseInt(s.substring(1, 2), 16) * 16 + Integer.parseInt(s.substring(1, 2), 16),
+				Integer.parseInt(s.substring(2, 3), 16) * 16 + Integer.parseInt(s.substring(2, 3), 16)
+			);
+		    } else if (s.length() == 6) {
+			return Color.rgb(
+				Integer.parseInt(s.substring(0, 2), 16),
+				Integer.parseInt(s.substring(2, 4), 16),
+				Integer.parseInt(s.substring(4, 6), 16)
+			);
+		    }
+	    }
+	    System.out.println("Failed to parse color '" + s + "'. Using black instead.");
+	    return Color.BLACK;
+	}
+    }
 }