Skip to content

Commit c9b3636

Browse files
johnneskyjohnnesky
committed
Increased the maximum channel counts.
1 parent fa4217d commit c9b3636

File tree

2 files changed

+108
-38
lines changed

2 files changed

+108
-38
lines changed

‎editor/ColorConfig.ts‎

Lines changed: 106 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -33,42 +33,62 @@ export class ColorConfig {
3333
--fifth-note: #468;
3434
--white-piano-key: #bbb;
3535
--black-piano-key: #444;
36-
--pitch1-secondary-channel: #0099a1;
37-
--pitch1-primary-channel: #25f3ff;
38-
--pitch1-secondary-note: #00bdc7;
39-
--pitch1-primary-note: #92f9ff;
40-
--pitch2-secondary-channel: #a1a100;
41-
--pitch2-primary-channel: #ffff25;
42-
--pitch2-secondary-note: #c7c700;
43-
--pitch2-primary-note: #ffff92;
44-
--pitch3-secondary-channel: #c75000;
45-
--pitch3-primary-channel: #ff9752;
46-
--pitch3-secondary-note: #ff771c;
47-
--pitch3-primary-note: #ffcdab;
48-
--pitch4-secondary-channel: #00a100;
49-
--pitch4-primary-channel: #50ff50;
50-
--pitch4-secondary-note: #00c700;
51-
--pitch4-primary-note: #a0ffa0;
52-
--pitch5-secondary-channel: #d020d0;
53-
--pitch5-primary-channel: #ff90ff;
54-
--pitch5-secondary-note: #e040e0;
55-
--pitch5-primary-note: #ffc0ff;
56-
--pitch6-secondary-channel: #7777b0;
57-
--pitch6-primary-channel: #a0a0ff;
58-
--pitch6-secondary-note: #8888d0;
59-
--pitch6-primary-note: #d0d0ff;
60-
--noise1-secondary-channel: #6f6f6f;
61-
--noise1-primary-channel: #aaaaaa;
62-
--noise1-secondary-note: #a7a7a7;
63-
--noise1-primary-note: #e0e0e0;
36+
--pitch1-secondary-channel: #0099A1;
37+
--pitch1-primary-channel: #25F3FF;
38+
--pitch1-secondary-note: #00BDC7;
39+
--pitch1-primary-note: #92F9FF;
40+
--pitch2-secondary-channel: #A1A100;
41+
--pitch2-primary-channel: #FFFF25;
42+
--pitch2-secondary-note: #C7C700;
43+
--pitch2-primary-note: #FFFF92;
44+
--pitch3-secondary-channel: #C75000;
45+
--pitch3-primary-channel: #FF9752;
46+
--pitch3-secondary-note: #FF771C;
47+
--pitch3-primary-note: #FFCDAB;
48+
--pitch4-secondary-channel: #00A100;
49+
--pitch4-primary-channel: #50FF50;
50+
--pitch4-secondary-note: #00C700;
51+
--pitch4-primary-note: #A0FFA0;
52+
--pitch5-secondary-channel: #D020D0;
53+
--pitch5-primary-channel: #FF90FF;
54+
--pitch5-secondary-note: #E040E0;
55+
--pitch5-primary-note: #FFC0FF;
56+
--pitch6-secondary-channel: #7777B0;
57+
--pitch6-primary-channel: #A0A0FF;
58+
--pitch6-secondary-note: #8888D0;
59+
--pitch6-primary-note: #D0D0FF;
60+
--pitch7-secondary-channel: #8AA100;
61+
--pitch7-primary-channel: #DEFF25;
62+
--pitch7-secondary-note: #AAC700;
63+
--pitch7-primary-note: #E6FF92;
64+
--pitch8-secondary-channel: #DF0019;
65+
--pitch8-primary-channel: #FF98A4;
66+
--pitch8-secondary-note: #FF4E63;
67+
--pitch8-primary-note: #FFB2BB;
68+
--pitch9-secondary-channel: #00A170;
69+
--pitch9-primary-channel: #50FFC9;
70+
--pitch9-secondary-note: #00C78A;
71+
--pitch9-primary-note: #83FFD9;
72+
--pitch10-secondary-channel:#A11FFF;
73+
--pitch10-primary-channel: #CE8BFF;
74+
--pitch10-secondary-note: #B757FF;
75+
--pitch10-primary-note: #DFACFF;
76+
--noise1-secondary-channel: #6F6F6F;
77+
--noise1-primary-channel: #AAAAAA;
78+
--noise1-secondary-note: #A7A7A7;
79+
--noise1-primary-note: #E0E0E0;
6480
--noise2-secondary-channel: #996633;
65-
--noise2-primary-channel: #ddaa77;
66-
--noise2-secondary-note: #cc9966;
67-
--noise2-primary-note: #f0d0bb;
68-
--noise3-secondary-channel: #4a6d8f;
69-
--noise3-primary-channel: #77aadd;
70-
--noise3-secondary-note: #6f9fcf;
71-
--noise3-primary-note: #bbd7ff;
81+
--noise2-primary-channel: #DDAA77;
82+
--noise2-secondary-note: #CC9966;
83+
--noise2-primary-note: #F0D0BB;
84+
--noise3-secondary-channel: #4A6D8F;
85+
--noise3-primary-channel: #77AADD;
86+
--noise3-secondary-note: #6F9FCF;
87+
--noise3-primary-note: #BBD7FF;
88+
--noise4-secondary-channel: #6B3E8E;
89+
--noise4-primary-channel: #AF82D2;
90+
--noise4-secondary-note: #9E71C1;
91+
--noise4-primary-note: #D4C1EA;
7292
}
7393
`,
7494
"light classic": `
@@ -116,6 +136,22 @@ export class ColorConfig {
116136
--pitch6-primary-channel: #6969FD;
117137
--pitch6-secondary-note: #9393FE;
118138
--pitch6-primary-note: #4A4AD7;
139+
--pitch7-secondary-channel: #CBE24B;
140+
--pitch7-primary-channel: #8EA800;
141+
--pitch7-secondary-note: #B0C82D;
142+
--pitch7-primary-note: #6C8000;
143+
--pitch8-secondary-channel: #FF90A4;
144+
--pitch8-primary-channel: #E12E4D;
145+
--pitch8-secondary-note: #EC6E85;
146+
--pitch8-primary-note: #A6001D;
147+
--pitch9-secondary-channel: #41E3B5;
148+
--pitch9-primary-channel: #00B481;
149+
--pitch9-secondary-note: #28D1A1;
150+
--pitch9-primary-note: #00835E;
151+
--pitch10-secondary-channel:#CA77FF;
152+
--pitch10-primary-channel: #9609FF;
153+
--pitch10-secondary-note: #B54FFF;
154+
--pitch10-primary-note: #8400E3;
119155
--noise1-secondary-channel: #C1C1C1;
120156
--noise1-primary-channel: #898989;
121157
--noise1-secondary-note: #ADADAD;
@@ -128,6 +164,10 @@ export class ColorConfig {
128164
--noise3-primary-channel: #4481BE;
129165
--noise3-secondary-note: #7CA7D3;
130166
--noise3-primary-note: #476685;
167+
--noise4-secondary-channel: #C5A5E0;
168+
--noise4-primary-channel: #8553AE;
169+
--noise4-secondary-note: #AB87C8;
170+
--noise4-primary-note: #684F7D;
131171
}
132172
133173
.beepboxEditor button, .beepboxEditor select {
@@ -181,7 +221,7 @@ export class ColorConfig {
181221
secondaryNote: "var(--pitch4-secondary-note)",
182222
primaryNote: "var(--pitch4-primary-note)",
183223
}, {
184-
name: "pitch5", // purple
224+
name: "pitch5", // magenta
185225
secondaryChannel: "var(--pitch5-secondary-channel)",
186226
primaryChannel: "var(--pitch5-primary-channel)",
187227
secondaryNote: "var(--pitch5-secondary-note)",
@@ -192,6 +232,30 @@ export class ColorConfig {
192232
primaryChannel: "var(--pitch6-primary-channel)",
193233
secondaryNote: "var(--pitch6-secondary-note)",
194234
primaryNote: "var(--pitch6-primary-note)",
235+
}, {
236+
name: "pitch7", // olive
237+
secondaryChannel: "var(--pitch7-secondary-channel)",
238+
primaryChannel: "var(--pitch7-primary-channel)",
239+
secondaryNote: "var(--pitch7-secondary-note)",
240+
primaryNote: "var(--pitch7-primary-note)",
241+
}, {
242+
name: "pitch8", // red
243+
secondaryChannel: "var(--pitch8-secondary-channel)",
244+
primaryChannel: "var(--pitch8-primary-channel)",
245+
secondaryNote: "var(--pitch8-secondary-note)",
246+
primaryNote: "var(--pitch8-primary-note)",
247+
}, {
248+
name: "pitch9", // teal
249+
secondaryChannel: "var(--pitch9-secondary-channel)",
250+
primaryChannel: "var(--pitch9-primary-channel)",
251+
secondaryNote: "var(--pitch9-secondary-note)",
252+
primaryNote: "var(--pitch9-primary-note)",
253+
}, {
254+
name: "pitch10", // purple
255+
secondaryChannel: "var(--pitch10-secondary-channel)",
256+
primaryChannel: "var(--pitch10-primary-channel)",
257+
secondaryNote: "var(--pitch10-secondary-note)",
258+
primaryNote: "var(--pitch10-primary-note)",
195259
},
196260
]);
197261
public static readonly noiseChannels: DictionaryArray<ChannelColors> = toNameMap([
@@ -213,6 +277,12 @@ export class ColorConfig {
213277
primaryChannel: "var(--noise3-primary-channel)",
214278
secondaryNote: "var(--noise3-secondary-note)",
215279
primaryNote: "var(--noise3-primary-note)",
280+
}, {
281+
name: "noise4", // purple
282+
secondaryChannel: "var(--noise4-secondary-channel)",
283+
primaryChannel: "var(--noise4-primary-channel)",
284+
secondaryNote: "var(--noise4-secondary-note)",
285+
primaryNote: "var(--noise4-primary-note)",
216286
},
217287
]);
218288

‎synth/SynthConfig.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -446,9 +446,9 @@ export class Config {
446446
public static readonly pulseWidthRange: number = 8;
447447
public static readonly pulseWidthStepPower: number = 0.5;
448448
public static readonly pitchChannelCountMin: number = 1;
449-
public static readonly pitchChannelCountMax: number = 6;
449+
public static readonly pitchChannelCountMax: number = 10;
450450
public static readonly noiseChannelCountMin: number = 0;
451-
public static readonly noiseChannelCountMax: number = 3;
451+
public static readonly noiseChannelCountMax: number = 4;
452452
public static readonly noiseInterval: number = 6;
453453
public static readonly pitchesPerOctave: number = 12; // TODO: Use this for converting pitch to frequency.
454454
public static readonly drumCount: number = 12;

0 commit comments

Comments
 (0)