Skip to content

Commit

Permalink
Finalized
Browse files Browse the repository at this point in the history 
- Added all the last bits!
  • Loading branch information
@Mangoshi
Mangoshi committed May 5, 2023
1 parent 6b31e2b commit 7ed6b8f
Show file tree
Hide file tree
Showing 27 changed files with 1,487 additions and 818 deletions.
Binary file added Docs/SDM_N00191671_Y4_MangoSynth_Dissertation-FINAL.pdf
View file
Binary file not shown.
Binary file added Release/ms24_electron-1.0.0 Setup.exe
View file
Binary file not shown.
42 changes: 0 additions & 42 deletions index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,48 +196,6 @@
</div>
</div>
<div class="w-[250px] flex justify-end">
<!--
<div class="flex flex-col p-1 border border-gray-600 rounded-lg">
<div class="border border-gray-600 border-b-0 rounded-lg rounded-br-none rounded-bl-none p-1 flex mr-1 h-min">
<p id="master_gain_label_h" class="text-sm self-center w-[30px]">Vol</p>
<webaudio-knob
id="master_gain_h"
class="control masterControl ml-1"
colors="#FFFFFF;#2C292D;#D9D9D9"
diameter="30"
min="0"
max="2"
value="1"
step=".01"
></webaudio-knob>
<webaudio-param
id="master_gain_readout_h"
link="master_gain_h"
fontSize="10"
class="border border-gray-600 self-center ml-2"
></webaudio-param>
</div>
<div class="border border-gray-600 border-t-0 rounded-lg rounded-tr-none rounded-tl-none p-1 flex mr-1 h-min">
<p id="master_bpm_label_h" class="text-sm self-center w-[30px]">BPM</p>
<webaudio-knob
id="master_bpm_h"
class="control masterControl ml-1"
colors="#FFFFFF;#2C292D;#D9D9D9"
diameter="30"
min="1"
max="600"
value="120"
step="1"
></webaudio-knob>
<webaudio-param
id="master_bpm_readout_h"
link="master_bpm_h"
fontSize="10"
class="border border-gray-600 self-center ml-2"
></webaudio-param>
</div>
</div>
-->
<div class="flex p-1 border border-gray-600 rounded-lg">
<div class="border border-gray-600 rounded-lg p-1 flex flex-col mr-1 w-[50px]">
<p id="master_bpm_label" class="text-center text-sm">BPM</p>
Expand Down
102 changes: 102 additions & 0 deletions public/presets/Alien Drone.ms24preset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
{
"METADATA": {
"name": "Alien Drone",
"type": "Lead",
"author": "MangoSynth",
"rating": "3"
},
"MASTER": {
"gain": 1,
"octaveOffset": 0,
"bpm": 120
},
"OSC_A": {
"enabled": 1,
"octave": 0,
"detune": 0,
"volume": -5,
"shape": 2,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 1,
"count": 1,
"spread": 0,
"harmonicity": 10,
"modulationIndex": 24,
"modulationShape": 0
},
"OSC_B": {
"enabled": 1,
"octave": 1,
"detune": 0,
"volume": -5,
"shape": 1,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 1,
"count": 1,
"spread": 0,
"harmonicity": 0,
"modulationIndex": 0,
"modulationShape": 0
},
"OSC_C": {
"enabled": 1,
"octave": 0,
"detune": 0,
"volume": 0,
"shape": 1,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 1,
"count": 3,
"spread": 10,
"harmonicity": 15,
"modulationShape": 0
},
"FILTER": {
"enabled": 1,
"frequency": 5000,
"Q": 0,
"gain": 0,
"rolloff": 0,
"type": 1,
"osc_a": 1,
"osc_b": 1,
"osc_c": 0,
"cutoff": 5000
},
"LFO": {
"enabled": 0,
"target": "FilterFrequency",
"type": 0,
"grid": 5,
"min": 0,
"max": 5000,
"osc_a": 1,
"osc_b": 1,
"osc_c": 1
},
"FX": {
"enabled": 1,
"type": "Distortion",
"param1": 0,
"param2": 0,
"param3": 0.5,
"param4": 0,
"mix": 0.5,
"osc_a": 1,
"osc_b": 1,
"osc_c": 1
},
"ARP": {
"A_enabled": 0,
"B_enabled": 0,
"C_enabled": 0,
"pattern": "up",
"playbackRate": 2
}
}
17 changes: 13 additions & 4 deletions public/presets/buddhabass.ms24preset → public/presets/BuddyBass.ms24preset
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
{
"METADATA":{
"name":"BuddhaBass",
"name":"BuddyBass",
"type":"Bass",
"author":"Buddha",
"rating":5
"author":"MangoSynth",
"rating":3
},
"MASTER":{
"gain":1
"gain": 1,
"octaveOffset": 0,
"bpm": 120
},
"OSC_A":{
"enabled":1,
Expand Down Expand Up @@ -89,5 +91,12 @@
"osc_a":1,
"osc_b":1,
"osc_c":1
},
"ARP":{
"A_enabled": 0,
"B_enabled": 0,
"C_enabled": 0,
"pattern": "up",
"playbackRate": 2
}
}
101 changes: 101 additions & 0 deletions public/presets/Cheery Arp.ms24preset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"METADATA": {
"name": "Cheery Arp",
"type": "Arp",
"author": "MangoSynth",
"rating": "3"
},
"MASTER": {
"gain": 2,
"octaveOffset": 0,
"bpm": 120
},
"OSC_A": {
"enabled": 1,
"octave": 0,
"detune": 0,
"volume": 0,
"shape": 1,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 2.75,
"count": 1,
"spread": 0,
"harmonicity": 0,
"modulationIndex": 0,
"modulationShape": 0
},
"OSC_B": {
"enabled": 1,
"octave": 1,
"detune": 0,
"volume": -9,
"shape": 1,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 1,
"count": 1,
"spread": 0,
"harmonicity": 0,
"modulationIndex": 0,
"modulationShape": 0
},
"OSC_C": {
"enabled": 1,
"octave": 0,
"detune": 0,
"volume": -7,
"shape": 1,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 0.25,
"count": 1,
"spread": 0,
"harmonicity": 0,
"modulationShape": 0
},
"FILTER": {
"enabled": 0,
"frequency": 5000,
"Q": 0,
"gain": 0,
"rolloff": 0,
"type": 0,
"osc_a": 1,
"osc_b": 1,
"osc_c": 1
},
"LFO": {
"enabled": 0,
"target": "FilterFrequency",
"type": 0,
"grid": 5,
"min": 0,
"max": 1000,
"osc_a": 1,
"osc_b": 1,
"osc_c": 1
},
"FX": {
"enabled": 1,
"type": "FreqShift",
"param1": 1,
"param2": 0,
"param3": 0.5,
"param4": 0,
"mix": 0.5,
"osc_a": 1,
"osc_b": 1,
"osc_c": 1
},
"ARP": {
"A_enabled": 1,
"B_enabled": 0,
"C_enabled": 1,
"pattern": 2,
"playbackRate": 3
}
}
101 changes: 101 additions & 0 deletions public/presets/Dark FM.ms24preset
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
{
"METADATA": {
"name": "Dark FM",
"type": "Bass",
"author": "MangoSynth",
"rating": 5
},
"MASTER": {
"gain": 1,
"octaveOffset": 0,
"bpm": 120
},
"OSC_A": {
"enabled": 1,
"octave": -2,
"detune": 0,
"volume": 0,
"shape": 1,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 1,
"count": 4,
"spread": 26,
"harmonicity": 0.5,
"modulationIndex": 40,
"modulationShape": 0
},
"OSC_B": {
"enabled": 0,
"octave": 1,
"detune": 0,
"volume": 0,
"shape": 2,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 1,
"count": 1,
"spread": 0,
"harmonicity": 0,
"modulationIndex": 0,
"modulationShape": 0
},
"OSC_C": {
"enabled": 1,
"octave": 0,
"detune": 7,
"volume": -7,
"shape": 2,
"attack": 0.005,
"decay": 0.1,
"sustain": 0.3,
"release": 1,
"count": 4,
"spread": 6,
"harmonicity": 0,
"modulationShape": 0
},
"FILTER": {
"enabled": 1,
"frequency": 1000,
"Q": 1,
"gain": 0,
"rolloff": 0,
"type": 0,
"osc_a": 1,
"osc_b": 1,
"osc_c": 0
},
"LFO": {
"enabled": 0,
"target": "FilterFrequency",
"type": 0,
"grid": 5,
"min": 0,
"max": 1000,
"osc_a": 1,
"osc_b": 1,
"osc_c": 1
},
"FX": {
"enabled": 1,
"type": "Distortion",
"param1": 0.2,
"param2": 0,
"param3": 0.5,
"param4": 0,
"mix": 0.5,
"osc_a": 1,
"osc_b": 1,
"osc_c": 1
},
"ARP": {
"A_enabled": 0,
"B_enabled": 0,
"C_enabled": 0,
"pattern": "up",
"playbackRate": 2
}
}
Loading

1 comment on commit 7ed6b8f

@vercel
Copy link

@vercel vercel bot commented on 7ed6b8f May 5, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Successfully deployed to the following URLs:

ms24 – ./

ms24.vercel.app
ms24-git-master-iadt.vercel.app
ms24-iadt.vercel.app

Please sign in to comment.