Dolda2000 GitWeb
/
kaka
/
cakelight.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New two-color noise mode + initial draft on commands
[kaka/cakelight.git]
/
src
/
kaka
/
cakelight
/
Console.java
diff --git
a/src/kaka/cakelight/Console.java
b/src/kaka/cakelight/Console.java
index
cd48f49
..
3b66959
100644
(file)
--- a/
src/kaka/cakelight/Console.java
+++ b/
src/kaka/cakelight/Console.java
@@
-1,5
+1,10
@@
package kaka.cakelight;
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;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.InputStreamReader;
@@
-47,14
+52,17
@@
public class Console extends Thread {
);
cakelight.setMode(new SingleColorMode(c));
System.out.println("setting color to " + c);
);
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]);
String[] split = input.split("\\s+");
config.gamma = Double.parseDouble(split[1]);
+ Color.calculateGammaCorrection(config.gamma);
System.out.println("setting gamma to " + config.gamma);
System.out.println("setting gamma to " + config.gamma);
- } 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);
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)")) {
+ TwoColorNoiseMode.getCommand().activate(cakelight, config, input.split("\\s+"));
}
} catch (IOException e) {
System.out.println("Error reading from command line");
}
} catch (IOException e) {
System.out.println("Error reading from command line");
@@
-62,4
+70,9
@@
public class Console extends Thread {
}
}
}
}
}
}
+
+ public interface Command {
+ String[] getNames();
+ void activate(CakeLight cakelight, Configuration config, String[] args);
+ }
}
}