X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=src%2Fkaka%2Fcakelight%2FConsole.java;h=422b7a38147e14ce26ffcdc1231dcf71fe95c4be;hb=fa013e4bfdfe17f97ddeab2596ae8daa03337e4a;hp=0d45b7fde307d25e9d155d384b87631abfc4bd18;hpb=53b74d649c2ec536f9fc800013d85ac892aa008c;p=kaka%2Fcakelight.git

diff --git a/src/kaka/cakelight/Console.java b/src/kaka/cakelight/Console.java
index 0d45b7f..422b7a3 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,16 +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.]+")) {
+		} 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);
-		    break;
+		} 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");
@@ -64,4 +79,9 @@ public class Console extends Thread {
             }
         }
     }
+
+    public interface Command {
+        String[] getNames();
+        void activate(Console console, String[] args);
+    }
 }