39
39
COLOR_CODES = [
40
40
glm .ivec3 (0 ), # default color
41
41
glm .ivec3 (255 , 0 , 0 ), # red
42
- glm .ivec3 (255 , 255 , 0 ), # yellow
42
+ glm .ivec3 (205 , 127 , 0 ), # yellow
43
43
glm .ivec3 (0 , 127 , 0 ), # green
44
44
glm .ivec3 (0 , 127 , 127 ), # cyan
45
- glm .ivec3 (0 , 0 , 255 ), # blue
45
+ glm .ivec3 (0 , 0 , 128 ), # blue
46
46
glm .ivec3 (255 , 0 , 255 ), # magenta
47
- glm .ivec3 (32 ), # off
48
- glm .ivec3 (200 , 200 , 200 ), # gray
47
+ glm .ivec3 (0 ), # off
48
+ glm .ivec3 (80 , 80 , 80 ), # gray
49
49
glm .ivec3 (255 ,127 ,0 ), # orange
50
50
glm .ivec3 (0 ,255 ,0 ), # lime
51
51
glm .ivec3 (255 ,127 ,127 ), # pink
@@ -602,7 +602,7 @@ def __init__(self):
602
602
for i in range (len (outnames )):
603
603
name = outnames [i ]
604
604
name_lower = name .lower ()
605
- # print(name_lower)
605
+ print (name_lower )
606
606
if "linnstrument" in name_lower :
607
607
print ("LinnStrument (Out): " + name )
608
608
self .linn_out = rtmidi2 .MidiOut ()
@@ -1041,6 +1041,7 @@ def render(self):
1041
1041
# col = self.get_color(x, y)
1042
1042
lit_col = glm .ivec3 (255 ,0 ,0 )
1043
1043
unlit_col = copy .copy (self .get_color (x , y ))
1044
+ black = (unlit_col == glm .ivec3 (0 ))
1044
1045
inner_col = copy .copy (unlit_col )
1045
1046
for i in range (len (unlit_col )):
1046
1047
unlit_col [i ] = min (255 , unlit_col [i ] * 1.5 )
@@ -1050,9 +1051,11 @@ def render(self):
1050
1051
rect = [x * sz + b , self .menu_sz + y * sz + b , sz - b , sz - b ]
1051
1052
inner_rect = [rect [0 ]+ 4 , rect [1 ]+ 4 , rect [2 ]- 8 , rect [3 ]- 8 ]
1052
1053
pygame .draw .rect (self .screen .surface , unlit_col , rect , border_radius = 8 )
1053
-
1054
1054
pygame .draw .rect (self .screen .surface , inner_col , inner_rect , border_radius = 8 )
1055
- pygame .draw .rect (self .screen .surface , BORDER_COLOR , rect , width = 2 , border_radius = 8 )
1055
+ if not black :
1056
+ pygame .draw .rect (self .screen .surface , BORDER_COLOR , rect , width = 2 , border_radius = 8 )
1057
+ else :
1058
+ pygame .draw .rect (self .screen .surface , glm .vec3 (24 ), rect , width = 2 , border_radius = 8 )
1056
1059
if cell :
1057
1060
circ = glm .ivec2 (int (x * sz + b / 2 + sz / 2 ), int (self .menu_sz + y * sz + b / 2 + sz / 2 ))
1058
1061
pygame .gfxdraw .aacircle (self .screen .surface , circ .x + 1 , circ .y - 1 , rad , glm .ivec3 (255 ,0 ,0 ))
0 commit comments