diff --git a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java index a949622480873dcea5e15793d279d61a25bcf05f..c1e382b433bd056bb94d9a084a779abee1aa7970 100644 --- a/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java +++ b/PlayWall/src/main/java/de/tobias/playpad/viewcontroller/option/feedback/SingleFeedbackViewController.java @@ -43,9 +43,9 @@ public class SingleFeedbackViewController extends NVC implements IColorButton { private PopOver colorChooser; - private FeedbackColor[] colors; - private Feedback feedback; - private Action action; + private final FeedbackColor[] colors; + private final Feedback feedback; + private final Action action; public SingleFeedbackViewController(Feedback feedback, FeedbackType type, FeedbackValue[] values, Action action) { load("view/option/feedback", "SingleFeedback", Localization.getBundle()); diff --git a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java index bd6f1c60c5d2bf91a7d71ee5fcf51429fdf258f8..fb21759f334a9116a7bc2bdd4c0b57bc4580ac13 100644 --- a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java +++ b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2.java @@ -30,7 +30,7 @@ public class LaunchPadMK2 implements MidiFeedbackTranscript, FeedbackColorSugges static { try { - URL resource = LaunchPadMK2.class.getClassLoader().getResource("launchpad_mk2.map"); + URL resource = LaunchPadMK2.class.getClassLoader().getResource("launchpad_mk2_colorful.map"); mapProperties = MapParser.load(resource); } catch (Exception e) { Logger.error(e); diff --git a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java index e6ca89373768ef0d4c91b1c85eb559a194245f03..a0d0525ecb18de0062fe7119f6d2514e10db9e2f 100644 --- a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java +++ b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/java/de/tobias/playpad/launchpadplugin/midi/mk2/LaunchPadMK2Color.java @@ -13,79 +13,79 @@ public enum LaunchPadMK2Color implements FeedbackColor, LightMode.ILightMode { C0_3(3, Color.rgb(255, 255, 255), LightMode.HIGH), // RED - C1_2(5, Color.rgb(255, 0, 0), LightMode.HIGH), - C1_3(6, Color.rgb(255, 0, 0), LightMode.NORMAL), - C1_4(7, Color.rgb(255, 0, 0), LightMode.LOW), + C1_1(5, Color.rgb(255, 0, 0), LightMode.HIGH), + C1_2(6, Color.rgb(255, 0, 0), LightMode.NORMAL), + C1_3(7, Color.rgb(255, 0, 0), LightMode.LOW), // Orange - C2_2(9, Color.rgb(255, 127, 0), LightMode.HIGH), - C2_3(10, Color.rgb(255, 127, 0), LightMode.NORMAL), - C2_4(11, Color.rgb(255, 127, 0), LightMode.LOW), + C2_1(9, Color.rgb(255, 127, 0), LightMode.HIGH), + C2_2(10, Color.rgb(255, 127, 0), LightMode.NORMAL), + C2_3(11, Color.rgb(255, 127, 0), LightMode.LOW), // LIME - C3_2(13, Color.rgb(235, 255, 39), LightMode.HIGH), - C3_3(14, Color.rgb(235, 255, 39), LightMode.NORMAL), - C3_4(15, Color.rgb(235, 255, 39), LightMode.LOW), + C3_1(13, Color.rgb(235, 255, 39), LightMode.HIGH), + C3_2(14, Color.rgb(235, 255, 39), LightMode.NORMAL), + C3_3(15, Color.rgb(235, 255, 39), LightMode.LOW), // LIGHT GREEN - C4_2(17, Color.rgb(123, 255, 66), LightMode.HIGH), - C4_3(18, Color.rgb(123, 255, 66), LightMode.NORMAL), - C4_4(19, Color.rgb(123, 255, 66), LightMode.LOW), + C4_1(17, Color.rgb(123, 255, 66), LightMode.HIGH), + C4_2(18, Color.rgb(123, 255, 66), LightMode.NORMAL), + C4_3(19, Color.rgb(123, 255, 66), LightMode.LOW), // GREEN - C5_2(21, Color.rgb(0, 255, 0), LightMode.HIGH), - C5_3(22, Color.rgb(0, 255, 0), LightMode.NORMAL), - C5_4(23, Color.rgb(0, 255, 0), LightMode.LOW), + C5_1(21, Color.rgb(0, 255, 0), LightMode.HIGH), + C5_2(22, Color.rgb(0, 255, 0), LightMode.NORMAL), + C5_3(23, Color.rgb(0, 255, 0), LightMode.LOW), // GREEN - C6_2(25, Color.rgb(62, 255, 112), LightMode.HIGH), - C6_3(26, Color.rgb(62, 255, 112), LightMode.NORMAL), - C6_4(27, Color.rgb(62, 255, 112), LightMode.LOW), + C6_1(25, Color.rgb(62, 255, 112), LightMode.HIGH), + C6_2(26, Color.rgb(62, 255, 112), LightMode.NORMAL), + C6_3(27, Color.rgb(62, 255, 112), LightMode.LOW), // TURKEY - C7_2(29, Color.rgb(62, 255, 112), LightMode.HIGH), - C7_3(30, Color.rgb(62, 255, 112), LightMode.NORMAL), - C7_4(31, Color.rgb(62, 255, 112), LightMode.LOW), + C7_1(29, Color.rgb(62, 255, 112), LightMode.HIGH), + C7_2(30, Color.rgb(62, 255, 112), LightMode.NORMAL), + C7_3(31, Color.rgb(62, 255, 112), LightMode.LOW), // TURKEY - C8_2(33, Color.rgb(101, 255, 196), LightMode.HIGH), - C8_3(34, Color.rgb(101, 255, 196), LightMode.NORMAL), - C8_4(35, Color.rgb(101, 255, 196), LightMode.LOW), + C8_1(33, Color.rgb(101, 255, 196), LightMode.HIGH), + C8_2(34, Color.rgb(101, 255, 196), LightMode.NORMAL), + C8_3(35, Color.rgb(101, 255, 196), LightMode.LOW), // LIGHT BLUE - C9_2(37, Color.rgb(91, 255, 253), LightMode.HIGH), - C9_3(38, Color.rgb(91, 255, 253), LightMode.NORMAL), - C9_4(39, Color.rgb(91, 255, 253), LightMode.LOW), + C9_1(37, Color.rgb(91, 255, 253), LightMode.HIGH), + C9_2(38, Color.rgb(91, 255, 253), LightMode.NORMAL), + C9_3(39, Color.rgb(91, 255, 253), LightMode.LOW), // BLUE - C10_2(41, Color.rgb(69, 169, 255), LightMode.HIGH), - C10_3(42, Color.rgb(69, 169, 255), LightMode.NORMAL), - C10_4(43, Color.rgb(69, 169, 255), LightMode.LOW), + C10_1(41, Color.rgb(69, 169, 255), LightMode.HIGH), + C10_2(42, Color.rgb(69, 169, 255), LightMode.NORMAL), + C10_3(43, Color.rgb(69, 169, 255), LightMode.LOW), // DARK BLUE - C11_2(45, Color.rgb(30, 67, 255), LightMode.HIGH), - C11_3(46, Color.rgb(30, 67, 255), LightMode.NORMAL), - C11_4(47, Color.rgb(30, 67, 255), LightMode.LOW), + C11_1(45, Color.rgb(30, 67, 255), LightMode.HIGH), + C11_2(46, Color.rgb(30, 67, 255), LightMode.NORMAL), + C11_3(47, Color.rgb(30, 67, 255), LightMode.LOW), // PURPLE - C12_2(49, Color.rgb(125, 73, 255), LightMode.HIGH), - C12_3(50, Color.rgb(125, 73, 255), LightMode.NORMAL), - C12_4(51, Color.rgb(125, 73, 255), LightMode.LOW), + C12_1(49, Color.rgb(125, 73, 255), LightMode.HIGH), + C12_2(50, Color.rgb(125, 73, 255), LightMode.NORMAL), + C12_3(51, Color.rgb(125, 73, 255), LightMode.LOW), // VIOLET - C13_2(53, Color.rgb(254, 85, 255), LightMode.HIGH), - C13_3(54, Color.rgb(254, 85, 255), LightMode.NORMAL), - C13_4(55, Color.rgb(254, 85, 255), LightMode.LOW), + C13_1(53, Color.rgb(254, 85, 255), LightMode.HIGH), + C13_2(54, Color.rgb(254, 85, 255), LightMode.NORMAL), + C13_3(55, Color.rgb(254, 85, 255), LightMode.LOW), // VIOLET - C14_2(57, Color.rgb(255, 75, 191), LightMode.HIGH), - C14_3(58, Color.rgb(255, 75, 191), LightMode.NORMAL), - C14_4(59, Color.rgb(255, 75, 191), LightMode.LOW), + C14_1(57, Color.rgb(255, 75, 191), LightMode.HIGH), + C14_2(58, Color.rgb(255, 75, 191), LightMode.NORMAL), + C14_3(59, Color.rgb(255, 75, 191), LightMode.LOW), // BROWN - C15_2(61, Color.rgb(255, 100, 69), LightMode.HIGH), - C15_3(62, Color.rgb(255, 100, 69), LightMode.NORMAL), - C15_4(63, Color.rgb(255, 100, 69), LightMode.LOW); + C15_1(61, Color.rgb(255, 100, 69), LightMode.HIGH), + C15_2(62, Color.rgb(255, 100, 69), LightMode.NORMAL), + C15_3(63, Color.rgb(255, 100, 69), LightMode.LOW); private final int midi; private final Color color; @@ -114,15 +114,15 @@ public enum LaunchPadMK2Color implements FeedbackColor, LightMode.ILightMode { @Override public FeedbackColor translate(LightMode lightMode) { - for (LaunchPadMK2Color instance : values()) { - if (instance.getColor().equals(this.getColor()) && instance.lightMode == lightMode) { - return instance; - } - } - return null; + return this; +// for (LaunchPadMK2Color instance : values()) { +// if (instance.getColor().equals(this.getColor()) && instance.lightMode == lightMode) { +// return instance; +// } +// } +// return null; } - public static FeedbackColor valueOf(int id) { for (LaunchPadMK2Color color : values()) { if (color.getValue() == id) { diff --git a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_colorful.map similarity index 52% rename from PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map rename to PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_colorful.map index 72565457824aa9a5741c5a28924031efef3ea9db..c820388891b8de0bef4e36999d43fa11d35c4d42 100644 --- a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2.map +++ b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_colorful.map @@ -1,52 +1,52 @@ % RED -0xef9a9aff=C1_2 +0xef9a9aff=C1_3 0xef5350ff=C1_2 -0xe53935ff=C1_2 +0xe53935ff=C1_1 % DARK_RED -0xd92349ff=C1_2 +0xd92349ff=C1_3 0xc92349ff=C1_2 -0xa90329ff=C1_2 +0xa90329ff=C1_1 % PINK -0xf48fb1ff=C14_2 +0xf48fb1ff=C14_3 0xec407aff=C14_2 -0xd81b60ff=C14_2 +0xd81b60ff=C14_1 % PURPLE -0xce93d8ff=C12_2 +0xce93d8ff=C12_3 0xab47bcff=C12_2 -0x8e24aaff=C12_2 +0x8e24aaff=C12_1 % LIGHT_BLUE -0x80deeaff=C10_2 +0x80deeaff=C10_3 0x26c6daff=C10_2 -0x00acc1ff=C10_2 +0x00acc1ff=C10_1 % BLUE -0x90caf9ff=C11_2 +0x90caf9ff=C11_3 0x42a5f5ff=C11_2 -0x1e88e5ff=C11_2 +0x1e88e5ff=C11_1 % LIGHT_GREEN -0xc5e1a5ff=C5_2 +0xc5e1a5ff=C5_3 0x9ccc65ff=C5_2 -0x7cb342ff=C5_2 +0x7cb342ff=C5_1 % LIME -0xe6ee9cff=C4_2 +0xe6ee9cff=C4_3 0xd4e157ff=C4_2 -0xc0ca33ff=C4_2 +0xc0ca33ff=C4_1 % YELLOW -0xfff59dff=C3_2 +0xfff59dff=C3_3 0xffee58ff=C3_2 -0xfdd835ff=C3_2 +0xfdd835ff=C3_1 % ORANGE -0xffcc80ff=C2_2 +0xffcc80ff=C2_3 0xffa726ff=C2_2 -0xfb8c00ff=C2_2 +0xfb8c00ff=C2_1 % GRAY 0xeeeeeeff=C0_3 diff --git a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_high.map b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_high.map new file mode 100644 index 0000000000000000000000000000000000000000..c820388891b8de0bef4e36999d43fa11d35c4d42 --- /dev/null +++ b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_high.map @@ -0,0 +1,57 @@ +% RED +0xef9a9aff=C1_3 +0xef5350ff=C1_2 +0xe53935ff=C1_1 + +% DARK_RED +0xd92349ff=C1_3 +0xc92349ff=C1_2 +0xa90329ff=C1_1 + +% PINK +0xf48fb1ff=C14_3 +0xec407aff=C14_2 +0xd81b60ff=C14_1 + +% PURPLE +0xce93d8ff=C12_3 +0xab47bcff=C12_2 +0x8e24aaff=C12_1 + +% LIGHT_BLUE +0x80deeaff=C10_3 +0x26c6daff=C10_2 +0x00acc1ff=C10_1 + +% BLUE +0x90caf9ff=C11_3 +0x42a5f5ff=C11_2 +0x1e88e5ff=C11_1 + +% LIGHT_GREEN +0xc5e1a5ff=C5_3 +0x9ccc65ff=C5_2 +0x7cb342ff=C5_1 + +% LIME +0xe6ee9cff=C4_3 +0xd4e157ff=C4_2 +0xc0ca33ff=C4_1 + +% YELLOW +0xfff59dff=C3_3 +0xffee58ff=C3_2 +0xfdd835ff=C3_1 + +% ORANGE +0xffcc80ff=C2_3 +0xffa726ff=C2_2 +0xfb8c00ff=C2_1 + +% GRAY +0xeeeeeeff=C0_3 +0xccccccff=C0_3 +0xaaaaaaff=C0_3 +0x888888ff=C0_2 +0x666666ff=C0_2 +0x444444ff=C0_2 \ No newline at end of file diff --git a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_low.map b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_low.map new file mode 100644 index 0000000000000000000000000000000000000000..c820388891b8de0bef4e36999d43fa11d35c4d42 --- /dev/null +++ b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_low.map @@ -0,0 +1,57 @@ +% RED +0xef9a9aff=C1_3 +0xef5350ff=C1_2 +0xe53935ff=C1_1 + +% DARK_RED +0xd92349ff=C1_3 +0xc92349ff=C1_2 +0xa90329ff=C1_1 + +% PINK +0xf48fb1ff=C14_3 +0xec407aff=C14_2 +0xd81b60ff=C14_1 + +% PURPLE +0xce93d8ff=C12_3 +0xab47bcff=C12_2 +0x8e24aaff=C12_1 + +% LIGHT_BLUE +0x80deeaff=C10_3 +0x26c6daff=C10_2 +0x00acc1ff=C10_1 + +% BLUE +0x90caf9ff=C11_3 +0x42a5f5ff=C11_2 +0x1e88e5ff=C11_1 + +% LIGHT_GREEN +0xc5e1a5ff=C5_3 +0x9ccc65ff=C5_2 +0x7cb342ff=C5_1 + +% LIME +0xe6ee9cff=C4_3 +0xd4e157ff=C4_2 +0xc0ca33ff=C4_1 + +% YELLOW +0xfff59dff=C3_3 +0xffee58ff=C3_2 +0xfdd835ff=C3_1 + +% ORANGE +0xffcc80ff=C2_3 +0xffa726ff=C2_2 +0xfb8c00ff=C2_1 + +% GRAY +0xeeeeeeff=C0_3 +0xccccccff=C0_3 +0xaaaaaaff=C0_3 +0x888888ff=C0_2 +0x666666ff=C0_2 +0x444444ff=C0_2 \ No newline at end of file diff --git a/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_normal.map b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_normal.map new file mode 100644 index 0000000000000000000000000000000000000000..c820388891b8de0bef4e36999d43fa11d35c4d42 --- /dev/null +++ b/PlayWallPlugins/PlayWallPluginLaunchpad/src/main/resources/launchpad_mk2_normal.map @@ -0,0 +1,57 @@ +% RED +0xef9a9aff=C1_3 +0xef5350ff=C1_2 +0xe53935ff=C1_1 + +% DARK_RED +0xd92349ff=C1_3 +0xc92349ff=C1_2 +0xa90329ff=C1_1 + +% PINK +0xf48fb1ff=C14_3 +0xec407aff=C14_2 +0xd81b60ff=C14_1 + +% PURPLE +0xce93d8ff=C12_3 +0xab47bcff=C12_2 +0x8e24aaff=C12_1 + +% LIGHT_BLUE +0x80deeaff=C10_3 +0x26c6daff=C10_2 +0x00acc1ff=C10_1 + +% BLUE +0x90caf9ff=C11_3 +0x42a5f5ff=C11_2 +0x1e88e5ff=C11_1 + +% LIGHT_GREEN +0xc5e1a5ff=C5_3 +0x9ccc65ff=C5_2 +0x7cb342ff=C5_1 + +% LIME +0xe6ee9cff=C4_3 +0xd4e157ff=C4_2 +0xc0ca33ff=C4_1 + +% YELLOW +0xfff59dff=C3_3 +0xffee58ff=C3_2 +0xfdd835ff=C3_1 + +% ORANGE +0xffcc80ff=C2_3 +0xffa726ff=C2_2 +0xfb8c00ff=C2_1 + +% GRAY +0xeeeeeeff=C0_3 +0xccccccff=C0_3 +0xaaaaaaff=C0_3 +0x888888ff=C0_2 +0x666666ff=C0_2 +0x444444ff=C0_2 \ No newline at end of file