diff --git a/css/style.css b/css/style.css new file mode 100644 index 0000000..c113b50 --- /dev/null +++ b/css/style.css @@ -0,0 +1,59 @@ +@import url('https://fonts.googleapis.com/css2?family=Noto+Sans+JP:wght@500&display=swap'); +@import url('https://fonts.googleapis.com/css2?family=Archivo+Black&display=swap'); + +.osc { + display: flex; + /* margin: 0px 30px 45px 30px; */ + text-align: center; + background-color: #ffffff; +} + +.osc>* { + margin: 5px; +} + +body:not(.name) { + display: flex; + justify-content: center; + flex-direction: column; + align-items: center; + background-color: #80cbc4; + font-family: 'Noto Sans JP', sans-serif; + background-image: linear-gradient(rgb(0 0 0 / 91%), rgb(0 0 0 / 91%)), url(../img/noise.gif); + +} + +.row { + display: flex; + flex-direction: row; + margin: 20px; + +} + +.row>* { + margin: 20px; +} + +.wrapper { + background-color: #eeeeee; +} + +.logo { + height: 90px; + background-color: #68686842; + font-family: 'Archivo Black', sans-serif; + font-size: 60px; + padding-left: 30px; +} + +.name { + margin-left: 10px; +} + +.preset_loader { + float: right; + font-size: 16px; + margin-right: 20px; + font-family: 'Noto Sans JP', sans-serif; + margin-top: 63px; +} \ No newline at end of file diff --git a/img/noise.gif b/img/noise.gif new file mode 100644 index 0000000..c3234cc Binary files /dev/null and b/img/noise.gif differ diff --git a/index.html b/index.html index 2397574..ad00005 100644 --- a/index.html +++ b/index.html @@ -2,37 +2,28 @@ + + + - - Document - + EMP. - Synth By Azaaxin + -
Oscillator 1
+
+ +
Oscillator 1
Decay
@@ -45,11 +36,9 @@
Distortion
LFO
Reverb
-
-
Oscillator 2
- +
Oscillator 2
Decay
@@ -63,12 +52,9 @@
LFO
Reverb
-
- -
- +
- - - - diff --git a/scripts/osc1.js b/scripts/osc1.js index 5c46bef..1a421cc 100644 --- a/scripts/osc1.js +++ b/scripts/osc1.js @@ -13,7 +13,7 @@ synth1 = new Tone.FMSynth({ release: 0, }, - }).toMaster(); + }).toDestination(); piano.on('change',function(keyValue) { if (keyValue.state == true) { // If Key is down @@ -29,7 +29,6 @@ function midiNote(note, vel){ piano.toggleKey(note, false) } } - //filters function updateFilter1(){ var filter1 = new Tone.AutoFilter(filter1_1).start(); //LFO @@ -39,7 +38,6 @@ function updateFilter1(){ synth1.chain(filter1, distortion1, reverb1, Tone.Destination); } - // Controls var sus1_d = new Nexus.Dial('#sustain1', dial_settings1) var dec1_d = new Nexus.Dial('#decay1', dial_settings1) diff --git a/scripts/osc2.js b/scripts/osc2.js index 1b34ee0..27775d4 100644 --- a/scripts/osc2.js +++ b/scripts/osc2.js @@ -12,8 +12,7 @@ synth2 = new Tone.FMSynth({ sustain: 0, release: 0, }, - - }).toMaster(); + }).toDestination(); piano.on('change',function(keyValue) { if (keyValue.state == true) { // If Key is down @@ -67,7 +66,6 @@ rel2_d.on('change',function(value) { select2.on('change',function(value) { synth2.oscillator.type = value.value; }); - //Effect knobs dist2.on('change',function(value) { dist2_2 = value.toFixed(1); diff --git a/scripts/scripts.js b/scripts/scripts.js index 9aa1e87..1804bb1 100644 --- a/scripts/scripts.js +++ b/scripts/scripts.js @@ -1,6 +1,6 @@ //Piano roll var piano = new Nexus.Piano('#target',{ - 'size': [750,125], + 'size': [850,125], 'mode': 'button', // 'button', 'toggle', or 'impulse' 'lowNote': 24, 'highNote': 100