Skip to content

Commit a3025b6

Browse files
iamniklasiamniklas
committed
Upgraded to colorspaces 0.0.1-5
1 parent 626795b commit a3025b6

File tree

7 files changed

+104
-100
lines changed

7 files changed

+104
-100
lines changed

‎.idea/workspace.xml

Lines changed: 12 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ dependencies {
1818
implementation 'com.google.code.gson:gson:2.9.0'
1919

2020
implementation 'com.github.iamniklas:interpolation:1.0.0-2'
21-
implementation 'com.github.iamniklas:colorspaces:0.0.1-4'
21+
implementation 'com.github.iamniklas:colorspaces:0.0.1-5'
2222
implementation 'com.github.iamniklas:net-tools:1.2.0'
2323

2424
implementation 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:1.2.5'

‎src/main/java/com/github/iamniklas/liocore/led/colorspace/LIOColor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public LIOColor(int _r, int _g, int _b) {
1414
}
1515

1616
public static LIOColor fromRGB(ColorRGB rgb) {
17-
return new LIOColor(rgb.r, rgb.g, rgb.b);
17+
return new LIOColor(rgb.getR(), rgb.getG(), rgb.getB());
1818
}
1919

2020
public static LIOColor fromRGBA(ColorRGBA rgba) {

‎src/main/java/com/github/iamniklas/liocore/network/javalin/controllers/SmartHomeController.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -42,16 +42,16 @@ public SmartHomeController(Javalin _app, LEDStripManager _ledStripManager, Gson
4242
void updateLEDStrip() {
4343
smartHomeModel.setBrightness(Math.max(0, Math.min(100, smartHomeModel.getBrightness())));
4444
smartHomeModel.setColor(new ColorRGB(
45-
Math.max(0, Math.min(255, smartHomeModel.getColor().r)),
46-
Math.max(0, Math.min(255, smartHomeModel.getColor().g)),
47-
Math.max(0, Math.min(255, smartHomeModel.getColor().b))
45+
Math.max(0, Math.min(255, smartHomeModel.getColor().getR())),
46+
Math.max(0, Math.min(255, smartHomeModel.getColor().getG())),
47+
Math.max(0, Math.min(255, smartHomeModel.getColor().getB()))
4848
));
4949

5050
if (smartHomeModel.getPowerSwitch()) {
5151
LIOColor adjustedColor = new LIOColor(
52-
(int) (smartHomeModel.getColor().r * (smartHomeModel.getBrightness() / 100.0f)),
53-
(int) (smartHomeModel.getColor().g * (smartHomeModel.getBrightness() / 100.0f)),
54-
(int) (smartHomeModel.getColor().b * (smartHomeModel.getBrightness() / 100.0f))
52+
(int) (smartHomeModel.getColor().getR() * (smartHomeModel.getBrightness() / 100.0f)),
53+
(int) (smartHomeModel.getColor().getG() * (smartHomeModel.getBrightness() / 100.0f)),
54+
(int) (smartHomeModel.getColor().getB() * (smartHomeModel.getBrightness() / 100.0f))
5555
);
5656
ledStripManager.setAllPixels(adjustedColor);
5757
} else {
@@ -93,9 +93,9 @@ ColorRGB getRGBFromTemperatureK(float temperatureK) {
9393
return new ColorRGB((int) red, (int) green, (int) blue);
9494
}
9595
float getTemperatureKFromColorRGB(ColorRGB colorRGB) {
96-
float red = colorRGB.r;
97-
float green = colorRGB.g;
98-
float blue = colorRGB.b;
96+
float red = colorRGB.getR();
97+
float green = colorRGB.getG();
98+
float blue = colorRGB.getB();
9999

100100
float X = red * 0.4124564f + green * 0.3575761f + blue * 0.1804375f;
101101
float Y = red * 0.2126729f + green * 0.7151522f + blue * 0.0721750f;

‎src/main/java/com/github/iamniklas/liocore/procedures/variants/RainbowMonoProcedure.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void start() {
2121

2222
@Override
2323
public void update() {
24-
colorHsv.h = colorHsv.h > 360.0f ? 0 : (int) (colorHsv.h + ledUpdateModel.bundle.speed);
24+
colorHsv.setH(colorHsv.getH() > 360.0f ? 0 : (int) (colorHsv.getH() + ledUpdateModel.bundle.speed));
2525
strip.setAllPixels(LIOColor.fromHSV(colorHsv));
2626
}
2727

‎src/main/java/com/github/iamniklas/liocore/procedures/variants/RainbowProcedure.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ public void update() {
5353

5454
for (int i = 0; i < LEDStripManager.ledCount; i++) {
5555
if (ledUpdateModel.bundle.direction == Direction.Center || ledUpdateModel.bundle.direction == Direction.CenterInvert) {
56-
colorHSV.h = (int) (((i * (ledUpdateModel.bundle.repetitions * (360.0f / LEDStripManager.ledCount))) + hueArrayCounter[i]) % 360);
56+
colorHSV.setH((int) (((i * (ledUpdateModel.bundle.repetitions * (360.0f / LEDStripManager.ledCount))) + hueArrayCounter[i]) % 360));
5757
} else {
58-
colorHSV.h = (int) (((i * (ledUpdateModel.bundle.repetitions * (360.0f / LEDStripManager.ledCount))) + hueCounter) % 360);
58+
colorHSV.setH((int) (((i * (ledUpdateModel.bundle.repetitions * (360.0f / LEDStripManager.ledCount))) + hueCounter) % 360));
5959
}
6060
strip.setPixel(i, LIOColor.fromHSV(colorHSV));
6161
}

‎src/test/java/ColorSpaceConversionTests.java

Lines changed: 78 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -9,89 +9,89 @@ public class ColorSpaceConversionTests {
99
@Test
1010
public void testHSVToRGBConversion() {
1111
ColorHSV hsv = new ColorHSV(0, 1.0f, 1.0f);
12-
assertEquals(255, hsv.toRGB().r);
13-
assertEquals(0, hsv.toRGB().g);
14-
assertEquals(0, hsv.toRGB().b);
15-
16-
hsv.h = 60;
17-
assertEquals(255, hsv.toRGB().r);
18-
assertEquals(255, hsv.toRGB().g);
19-
assertEquals(0, hsv.toRGB().b);
20-
21-
hsv.h = 120;
22-
assertEquals(0, hsv.toRGB().r);
23-
assertEquals(255, hsv.toRGB().g);
24-
assertEquals(0, hsv.toRGB().b);
25-
26-
hsv.h = 180;
27-
assertEquals(0, hsv.toRGB().r);
28-
assertEquals(255, hsv.toRGB().g);
29-
assertEquals(255, hsv.toRGB().b);
30-
31-
hsv.h = 240;
32-
assertEquals(0, hsv.toRGB().r);
33-
assertEquals(0, hsv.toRGB().g);
34-
assertEquals(255, hsv.toRGB().b);
35-
36-
hsv.h = 300;
37-
assertEquals(255, hsv.toRGB().r);
38-
assertEquals(0, hsv.toRGB().g);
39-
assertEquals(255, hsv.toRGB().b);
40-
41-
hsv.h = 360;
42-
assertEquals(255, hsv.toRGB().r);
43-
assertEquals(0, hsv.toRGB().g);
44-
assertEquals(0, hsv.toRGB().b);
12+
assertEquals(255, hsv.toRGB().getR());
13+
assertEquals(0, hsv.toRGB().getG());
14+
assertEquals(0, hsv.toRGB().getB());
15+
16+
hsv.setH(60);
17+
assertEquals(255, hsv.toRGB().getR());
18+
assertEquals(255, hsv.toRGB().getG());
19+
assertEquals(0, hsv.toRGB().getB());
20+
21+
hsv.setH(120);
22+
assertEquals(0, hsv.toRGB().getR());
23+
assertEquals(255, hsv.toRGB().getG());
24+
assertEquals(0, hsv.toRGB().getB());
25+
26+
hsv.setH(180);
27+
assertEquals(0, hsv.toRGB().getR());
28+
assertEquals(255, hsv.toRGB().getG());
29+
assertEquals(255, hsv.toRGB().getB());
30+
31+
hsv.setH(240);
32+
assertEquals(0, hsv.toRGB().getR());
33+
assertEquals(0, hsv.toRGB().getG());
34+
assertEquals(255, hsv.toRGB().getB());
35+
36+
hsv.setH(300);
37+
assertEquals(255, hsv.toRGB().getR());
38+
assertEquals(0, hsv.toRGB().getG());
39+
assertEquals(255, hsv.toRGB().getB());
40+
41+
hsv.setH(360);
42+
assertEquals(255, hsv.toRGB().getR());
43+
assertEquals(0, hsv.toRGB().getG());
44+
assertEquals(0, hsv.toRGB().getB());
4545
}
4646

4747
@Test
4848
public void testRGBToHSVConversion() {
4949
ColorRGB rgb = new ColorRGB(255, 0, 0);
50-
assertEquals(0, rgb.toHSV().h);
51-
assertEquals(1.0f, rgb.toHSV().s, 0.1f);
52-
assertEquals(1.0f, rgb.toHSV().v, 0.1f);
53-
54-
rgb.r = 255;
55-
rgb.g = 255;
56-
rgb.b = 0;
57-
assertEquals(60, rgb.toHSV().h);
58-
assertEquals(1.0f, rgb.toHSV().s, 0.1f);
59-
assertEquals(1.0f, rgb.toHSV().v, 0.1f);
60-
61-
rgb.r = 0;
62-
rgb.g = 255;
63-
rgb.b = 0;
64-
assertEquals(120, rgb.toHSV().h);
65-
assertEquals(1.0f, rgb.toHSV().s, 0.1f);
66-
assertEquals(1.0f, rgb.toHSV().v, 0.1f);
67-
68-
rgb.r = 0;
69-
rgb.g = 255;
70-
rgb.b = 255;
71-
assertEquals(180, rgb.toHSV().h);
72-
assertEquals(1.0f, rgb.toHSV().s, 0.1f);
73-
assertEquals(1.0f, rgb.toHSV().v, 0.1f);
74-
75-
rgb.r = 0;
76-
rgb.g = 0;
77-
rgb.b = 255;
78-
assertEquals(240, rgb.toHSV().h);
79-
assertEquals(1.0f, rgb.toHSV().s, 0.1f);
80-
assertEquals(1.0f, rgb.toHSV().v, 0.1f);
81-
82-
rgb.r = 255;
83-
rgb.g = 0;
84-
rgb.b = 255;
85-
assertEquals(300, rgb.toHSV().h);
86-
assertEquals(1.0f, rgb.toHSV().s, 0.1f);
87-
assertEquals(1.0f, rgb.toHSV().v, 0.1f);
88-
89-
rgb.r = 255;
90-
rgb.g = 0;
91-
rgb.b = 0;
92-
assertEquals(0, rgb.toHSV().h);
93-
assertEquals(1.0f, rgb.toHSV().s, 0.1f);
94-
assertEquals(1.0f, rgb.toHSV().v, 0.1f);
50+
assertEquals(0, rgb.toHSV().getH());
51+
assertEquals(1.0f, rgb.toHSV().getS(), 0.1f);
52+
assertEquals(1.0f, rgb.toHSV().getV(), 0.1f);
53+
54+
rgb.setR(255);
55+
rgb.setG(255);
56+
rgb.setB(0);
57+
assertEquals(60, rgb.toHSV().getH());
58+
assertEquals(1.0f, rgb.toHSV().getS(), 0.1f);
59+
assertEquals(1.0f, rgb.toHSV().getV(), 0.1f);
60+
61+
rgb.setR(0);
62+
rgb.setG(255);
63+
rgb.setB(0);
64+
assertEquals(120, rgb.toHSV().getH());
65+
assertEquals(1.0f, rgb.toHSV().getS(), 0.1f);
66+
assertEquals(1.0f, rgb.toHSV().getV(), 0.1f);
67+
68+
rgb.setR(0);
69+
rgb.setG(255);
70+
rgb.setB(255);
71+
assertEquals(180, rgb.toHSV().getH());
72+
assertEquals(1.0f, rgb.toHSV().getS(), 0.1f);
73+
assertEquals(1.0f, rgb.toHSV().getV(), 0.1f);
74+
75+
rgb.setR(0);
76+
rgb.setG(0);
77+
rgb.setB(255);
78+
assertEquals(240, rgb.toHSV().getH());
79+
assertEquals(1.0f, rgb.toHSV().getS(), 0.1f);
80+
assertEquals(1.0f, rgb.toHSV().getV(), 0.1f);
81+
82+
rgb.setR(255);
83+
rgb.setG(0);
84+
rgb.setB(255);
85+
assertEquals(300, rgb.toHSV().getH());
86+
assertEquals(1.0f, rgb.toHSV().getS(), 0.1f);
87+
assertEquals(1.0f, rgb.toHSV().getV(), 0.1f);
88+
89+
rgb.setR(255);
90+
rgb.setG(0);
91+
rgb.setB(0);
92+
assertEquals(0, rgb.toHSV().getH());
93+
assertEquals(1.0f, rgb.toHSV().getS(), 0.1f);
94+
assertEquals(1.0f, rgb.toHSV().getV(), 0.1f);
9595
}
9696

9797
@Test

0 commit comments

Comments
 (0)