Skip to content

Commit 44dec51

Browse files
committed
Audio mixing, other improvements
1 parent c66357c commit 44dec51

File tree

9 files changed

+202
-122
lines changed

9 files changed

+202
-122
lines changed

Assets/_Project/Prefabs/UI/ControlsSettingsCanvas.prefab renamed to Assets/_Project/Prefabs/UI/ControlsCanvas.prefab

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

Assets/_Project/Prefabs/UI/ControlsSettingsCanvas.prefab.meta renamed to Assets/_Project/Prefabs/UI/ControlsCanvas.prefab.meta

File renamed without changes.

Assets/_Project/Scenes/tally-viz-master.unity

Lines changed: 3 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 143 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,20 @@ AudioMixerEffectController:
1414
m_SendTarget: {fileID: 0}
1515
m_EnableWetMix: 0
1616
m_Bypass: 0
17+
--- !u!244 &-7837911593490402817
18+
AudioMixerEffectController:
19+
m_ObjectHideFlags: 3
20+
m_CorrespondingSourceObject: {fileID: 0}
21+
m_PrefabInstance: {fileID: 0}
22+
m_PrefabAsset: {fileID: 0}
23+
m_Name:
24+
m_EffectID: 2de8654e7e2ff4811aa0825db002b538
25+
m_EffectName: Attenuation
26+
m_MixLevel: b17ac54bdcc7448c887cd0af6397fecc
27+
m_Parameters: []
28+
m_SendTarget: {fileID: 0}
29+
m_EnableWetMix: 0
30+
m_Bypass: 0
1731
--- !u!243 &-7598688487510627827
1832
AudioMixerGroupController:
1933
m_ObjectHideFlags: 0
@@ -29,7 +43,7 @@ AudioMixerGroupController:
2943
m_Send: 00000000000000000000000000000000
3044
m_Effects:
3145
- {fileID: 8639341617619253815}
32-
m_UserColorIndex: 0
46+
m_UserColorIndex: 6
3347
m_Mute: 0
3448
m_Solo: 0
3549
m_BypassEffects: 0
@@ -62,7 +76,37 @@ AudioMixerGroupController:
6276
m_Send: 00000000000000000000000000000000
6377
m_Effects:
6478
- {fileID: -7448824298319453207}
65-
m_UserColorIndex: 0
79+
m_UserColorIndex: 6
80+
m_Mute: 0
81+
m_Solo: 0
82+
m_BypassEffects: 0
83+
--- !u!243 &-6051560314497122044
84+
AudioMixerGroupController:
85+
m_ObjectHideFlags: 0
86+
m_CorrespondingSourceObject: {fileID: 0}
87+
m_PrefabInstance: {fileID: 0}
88+
m_PrefabAsset: {fileID: 0}
89+
m_Name: SFX
90+
m_AudioMixer: {fileID: 24100000}
91+
m_GroupID: 7ce64ec5e6e394cb4bee808acafd37dd
92+
m_Children:
93+
- {fileID: 8187814880377375571}
94+
- {fileID: -4912910237645911021}
95+
- {fileID: -5695708705811190125}
96+
- {fileID: 6962130813605118434}
97+
- {fileID: 2529076650129297788}
98+
- {fileID: -6989095628799083019}
99+
- {fileID: -2742647976355322318}
100+
- {fileID: -2545794918289666734}
101+
- {fileID: -4014782903101200297}
102+
- {fileID: -1381339214060930010}
103+
- {fileID: -7598688487510627827}
104+
m_Volume: 682e317b57e57480dbc3c1ee94fe32ab
105+
m_Pitch: 056c02ca385b54ba28970c38d572cba9
106+
m_Send: 00000000000000000000000000000000
107+
m_Effects:
108+
- {fileID: -7837911593490402817}
109+
m_UserColorIndex: 7
66110
m_Mute: 0
67111
m_Solo: 0
68112
m_BypassEffects: 0
@@ -81,7 +125,7 @@ AudioMixerGroupController:
81125
m_Send: 00000000000000000000000000000000
82126
m_Effects:
83127
- {fileID: 4390469270128537582}
84-
m_UserColorIndex: 0
128+
m_UserColorIndex: 6
85129
m_Mute: 0
86130
m_Solo: 0
87131
m_BypassEffects: 0
@@ -114,7 +158,8 @@ AudioMixerGroupController:
114158
m_Send: 00000000000000000000000000000000
115159
m_Effects:
116160
- {fileID: -8675805556108063184}
117-
m_UserColorIndex: 0
161+
- {fileID: -318263554846277231}
162+
m_UserColorIndex: 6
118163
m_Mute: 0
119164
m_Solo: 0
120165
m_BypassEffects: 0
@@ -133,7 +178,7 @@ AudioMixerGroupController:
133178
m_Send: 00000000000000000000000000000000
134179
m_Effects:
135180
- {fileID: -648552780216185558}
136-
m_UserColorIndex: 0
181+
m_UserColorIndex: 1
137182
m_Mute: 0
138183
m_Solo: 0
139184
m_BypassEffects: 0
@@ -152,7 +197,7 @@ AudioMixerGroupController:
152197
m_Send: 00000000000000000000000000000000
153198
m_Effects:
154199
- {fileID: 5179332031856841000}
155-
m_UserColorIndex: 0
200+
m_UserColorIndex: 6
156201
m_Mute: 0
157202
m_Solo: 0
158203
m_BypassEffects: 0
@@ -171,7 +216,7 @@ AudioMixerGroupController:
171216
m_Send: 00000000000000000000000000000000
172217
m_Effects:
173218
- {fileID: -2364135825800152956}
174-
m_UserColorIndex: 0
219+
m_UserColorIndex: 6
175220
m_Mute: 0
176221
m_Solo: 0
177222
m_BypassEffects: 0
@@ -190,7 +235,7 @@ AudioMixerGroupController:
190235
m_Send: 00000000000000000000000000000000
191236
m_Effects:
192237
- {fileID: 982041520639902755}
193-
m_UserColorIndex: 0
238+
m_UserColorIndex: 6
194239
m_Mute: 0
195240
m_Solo: 0
196241
m_BypassEffects: 0
@@ -223,7 +268,7 @@ AudioMixerGroupController:
223268
m_Send: 00000000000000000000000000000000
224269
m_Effects:
225270
- {fileID: 4963363047245072837}
226-
m_UserColorIndex: 0
271+
m_UserColorIndex: 6
227272
m_Mute: 0
228273
m_Solo: 0
229274
m_BypassEffects: 0
@@ -241,13 +286,31 @@ AudioMixerEffectController:
241286
m_SendTarget: {fileID: 0}
242287
m_EnableWetMix: 0
243288
m_Bypass: 0
289+
--- !u!244 &-318263554846277231
290+
AudioMixerEffectController:
291+
m_ObjectHideFlags: 3
292+
m_CorrespondingSourceObject: {fileID: 0}
293+
m_PrefabInstance: {fileID: 0}
294+
m_PrefabAsset: {fileID: 0}
295+
m_Name:
296+
m_EffectID: 866aa3b30ba20410b91bee6e16b6434f
297+
m_EffectName: Lowpass
298+
m_MixLevel: 4f7704b67c1294ea480b7c18a14c26c9
299+
m_Parameters:
300+
- m_ParameterName: Cutoff freq
301+
m_GUID: 07e2e166acfb2463e8d0ca6f0591c2f8
302+
- m_ParameterName: Resonance
303+
m_GUID: c72a0a58c67524bba807f3b644b729af
304+
m_SendTarget: {fileID: 0}
305+
m_EnableWetMix: 0
306+
m_Bypass: 0
244307
--- !u!241 &24100000
245308
AudioMixerController:
246309
m_ObjectHideFlags: 0
247310
m_CorrespondingSourceObject: {fileID: 0}
248311
m_PrefabInstance: {fileID: 0}
249312
m_PrefabAsset: {fileID: 0}
250-
m_Name: EffectMixer
313+
m_Name: AudioMixer
251314
m_OutputGroup: {fileID: 0}
252315
m_MasterGroup: {fileID: 24300002}
253316
m_Snapshots:
@@ -274,6 +337,7 @@ AudioMixerController:
274337
- d967fa6ba0e694eedb6d6d790e6a9e31
275338
- abfcc4ea23956407985ce2238751af1e
276339
- 398de17cb8d9f4a528d86705a4438cc2
340+
- 7ce64ec5e6e394cb4bee808acafd37dd
277341
name: View
278342
m_CurrentViewIndex: 0
279343
m_TargetSnapshot: {fileID: 24500006}
@@ -287,18 +351,8 @@ AudioMixerGroupController:
287351
m_AudioMixer: {fileID: 24100000}
288352
m_GroupID: 767e3c4105aca449caf2d93389009d48
289353
m_Children:
290-
- {fileID: 8187814880377375571}
291-
- {fileID: -4912910237645911021}
292-
- {fileID: -5695708705811190125}
293-
- {fileID: 6962130813605118434}
294-
- {fileID: 2529076650129297788}
295-
- {fileID: -6989095628799083019}
296-
- {fileID: -2742647976355322318}
297-
- {fileID: -2545794918289666734}
298-
- {fileID: -4014782903101200297}
299-
- {fileID: -1381339214060930010}
300-
- {fileID: -7598688487510627827}
301354
- {fileID: -4200076129652781651}
355+
- {fileID: -6051560314497122044}
302356
m_Volume: fd1a11a62fb384bc1a92967208f55de1
303357
m_Pitch: 1976bf602d8694fa0b233cbd7079b0c9
304358
m_Send: 00000000000000000000000000000000
@@ -332,9 +386,24 @@ AudioMixerSnapshotController:
332386
m_AudioMixer: {fileID: 24100000}
333387
m_SnapshotID: 02472fd7167a243a09e9fdd707ba8782
334388
m_FloatValues:
335-
fd1a11a62fb384bc1a92967208f55de1: -10.34521
336-
25524a87b4afc4a9a81766335c25ccbd: -6.5566154
337-
d2219069438bd437999b99f9058737c2: -6.133707
389+
bf4936423a3084e54aad428af863e20d: -5.3230715
390+
bb62bf92f6e0d4cccb38b834b1ce6f2e: -4.560346
391+
19d16ce418d9840e0ade28d1711a9ee0: -2.8722954
392+
6bf46a45bd6d143bfb322c209af88d1d: 940
393+
d7d66f75b09654a1b8238b4d795c1d7b: -4.560346
394+
07e2e166acfb2463e8d0ca6f0591c2f8: 940
395+
fd1a11a62fb384bc1a92967208f55de1: -0.93152964
396+
0cdaf7f6befea4f05aec4fe0cf00b8d2: -4.560346
397+
5c976b672c1e741db9049dce0c071984: 1
398+
25524a87b4afc4a9a81766335c25ccbd: -19.928473
399+
3b230808e51ab4668878e13b8202bbe1: 457
400+
d2219069438bd437999b99f9058737c2: -19.928473
401+
a8e5f25a9f82248cab5db06cf3834d2f: -5.3230715
402+
f048c98a891ce4070a9828b49234d61d: -4.9356437
403+
723413aae3b284de59544bf0746442b5: -4.5603485
404+
682e317b57e57480dbc3c1ee94fe32ab: -2.8722944
405+
47d48e3d5ecf946f3812e6518855f56c: -4.9356413
406+
ab835b6d969ed4499b404d369a8f20fa: -4.9356413
338407
m_TransitionOverrides: {}
339408
--- !u!244 &982041520639902755
340409
AudioMixerEffectController:
@@ -350,6 +419,34 @@ AudioMixerEffectController:
350419
m_SendTarget: {fileID: 0}
351420
m_EnableWetMix: 0
352421
m_Bypass: 0
422+
--- !u!244 &1316168067198612083
423+
AudioMixerEffectController:
424+
m_ObjectHideFlags: 3
425+
m_CorrespondingSourceObject: {fileID: 0}
426+
m_PrefabInstance: {fileID: 0}
427+
m_PrefabAsset: {fileID: 0}
428+
m_Name:
429+
m_EffectID: c225622c65cda4833b5b373a86dc66de
430+
m_EffectName: Send
431+
m_MixLevel: a3a2bd347ac434f029cb49f206e19984
432+
m_Parameters: []
433+
m_SendTarget: {fileID: 0}
434+
m_EnableWetMix: 0
435+
m_Bypass: 0
436+
--- !u!244 &1744747913738967770
437+
AudioMixerEffectController:
438+
m_ObjectHideFlags: 3
439+
m_CorrespondingSourceObject: {fileID: 0}
440+
m_PrefabInstance: {fileID: 0}
441+
m_PrefabAsset: {fileID: 0}
442+
m_Name:
443+
m_EffectID: 3eff253fe295f40c4a5ae25f62627540
444+
m_EffectName: Receive
445+
m_MixLevel: 286ac1709257a45e382e11f6951e16a6
446+
m_Parameters: []
447+
m_SendTarget: {fileID: 0}
448+
m_EnableWetMix: 0
449+
m_Bypass: 0
353450
--- !u!243 &2529076650129297788
354451
AudioMixerGroupController:
355452
m_ObjectHideFlags: 0
@@ -365,7 +462,7 @@ AudioMixerGroupController:
365462
m_Send: 00000000000000000000000000000000
366463
m_Effects:
367464
- {fileID: 3158985512635068969}
368-
m_UserColorIndex: 0
465+
m_UserColorIndex: 6
369466
m_Mute: 0
370467
m_Solo: 0
371468
m_BypassEffects: 0
@@ -383,6 +480,24 @@ AudioMixerEffectController:
383480
m_SendTarget: {fileID: 0}
384481
m_EnableWetMix: 0
385482
m_Bypass: 0
483+
--- !u!244 &3534271247581873836
484+
AudioMixerEffectController:
485+
m_ObjectHideFlags: 3
486+
m_CorrespondingSourceObject: {fileID: 0}
487+
m_PrefabInstance: {fileID: 0}
488+
m_PrefabAsset: {fileID: 0}
489+
m_Name:
490+
m_EffectID: 6bf6eeb5423714902aed4a21a752bead
491+
m_EffectName: Lowpass
492+
m_MixLevel: d1cfec26a8e0a46d281fad532d9c8aff
493+
m_Parameters:
494+
- m_ParameterName: Cutoff freq
495+
m_GUID: 6bf46a45bd6d143bfb322c209af88d1d
496+
- m_ParameterName: Resonance
497+
m_GUID: 78d8e7c94386b46c69629a89ef4b97d2
498+
m_SendTarget: {fileID: 0}
499+
m_EnableWetMix: 0
500+
m_Bypass: 0
386501
--- !u!244 &4390469270128537582
387502
AudioMixerEffectController:
388503
m_ObjectHideFlags: 3
@@ -454,7 +569,7 @@ AudioMixerGroupController:
454569
m_Send: 00000000000000000000000000000000
455570
m_Effects:
456571
- {fileID: -5079957799538099996}
457-
m_UserColorIndex: 0
572+
m_UserColorIndex: 6
458573
m_Mute: 0
459574
m_Solo: 0
460575
m_BypassEffects: 0
@@ -473,7 +588,8 @@ AudioMixerGroupController:
473588
m_Send: 00000000000000000000000000000000
474589
m_Effects:
475590
- {fileID: 5539668348779742183}
476-
m_UserColorIndex: 0
591+
- {fileID: 3534271247581873836}
592+
m_UserColorIndex: 6
477593
m_Mute: 0
478594
m_Solo: 0
479595
m_BypassEffects: 0
File renamed without changes.

0 commit comments

Comments
 (0)