Skip to content

Commit afc9ba5

Browse files
committed
adjusted colors
1 parent 393341a commit afc9ba5

File tree

3 files changed

+25
-8
lines changed

3 files changed

+25
-8
lines changed

app.py

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
COLOR_CODES = [
4040
glm.ivec3(0), # default color
4141
glm.ivec3(255, 0, 0), # red
42-
glm.ivec3(255, 255, 0), # yellow
42+
glm.ivec3(205, 127, 0), # yellow
4343
glm.ivec3(0, 127, 0), # green
4444
glm.ivec3(0, 127, 127), # cyan
45-
glm.ivec3(0, 0, 255), # blue
45+
glm.ivec3(0, 0, 128), # blue
4646
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
4949
glm.ivec3(255,127,0), # orange
5050
glm.ivec3(0,255,0), # lime
5151
glm.ivec3(255,127,127), # pink
@@ -602,7 +602,7 @@ def __init__(self):
602602
for i in range(len(outnames)):
603603
name = outnames[i]
604604
name_lower = name.lower()
605-
# print(name_lower)
605+
print(name_lower)
606606
if "linnstrument" in name_lower:
607607
print("LinnStrument (Out): " + name)
608608
self.linn_out = rtmidi2.MidiOut()
@@ -1041,6 +1041,7 @@ def render(self):
10411041
# col = self.get_color(x, y)
10421042
lit_col = glm.ivec3(255,0,0)
10431043
unlit_col = copy.copy(self.get_color(x, y))
1044+
black = (unlit_col == glm.ivec3(0))
10441045
inner_col = copy.copy(unlit_col)
10451046
for i in range(len(unlit_col)):
10461047
unlit_col[i] = min(255, unlit_col[i] * 1.5)
@@ -1050,9 +1051,11 @@ def render(self):
10501051
rect = [x*sz + b, self.menu_sz + y*sz + b, sz - b, sz - b]
10511052
inner_rect = [rect[0]+4, rect[1]+4, rect[2]-8, rect[3]-8]
10521053
pygame.draw.rect(self.screen.surface, unlit_col, rect, border_radius=8)
1053-
10541054
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)
10561059
if cell:
10571060
circ = glm.ivec2(int(x*sz + b/2 + sz/2), int(self.menu_sz + y*sz + b/2 + sz/2))
10581061
pygame.gfxdraw.aacircle(self.screen.surface, circ.x+1, circ.y-1, rad, glm.ivec3(255,0,0))

settings_temp.ini

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[general]
2+
lights = 3,7,5,7,5,8,7,8,2,8,7,8
3+
one_channel = False
4+
velocity_curve = 0.5
5+
min_velocity = 0
6+
max_velocity = 127
7+
no_overlap = True
8+
hardware_split = False
9+
show_lowest_note = False
10+
midi_out = loopmidi
11+
split_out = loopmidi2
12+
split = False
13+
fps = 300
14+
sustain = 1.0
15+

util.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import os,sys,glm,copy,binascii,struct,math,traceback
2-
import rtmidi2
32
from util import *
43
from dataclasses import dataclass
54
import glm

0 commit comments

Comments
 (0)