From 598d7e4b9caf15c989f5d11526846e76c45f7b12 Mon Sep 17 00:00:00 2001
From: Maikiwi <polaris@zerocalorie.us>
Date: Tue, 8 Mar 2022 20:25:30 -0800
Subject: [PATCH] don't code while ur drunk

---
 src/renderer/audio/audio.js            |  8 +++----
 src/renderer/views/pages/audiolabs.ejs | 33 ++++++++++++--------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/renderer/audio/audio.js b/src/renderer/audio/audio.js
index b929dc1d..6252840e 100644
--- a/src/renderer/audio/audio.js
+++ b/src/renderer/audio/audio.js
@@ -108,11 +108,11 @@ const CiderAudio = {
                     
                 });
                 app.cfg.audio.maikiwiAudio.spatialType = 0;
-                break;
-        }        
+                break;   
+            }    
         }
         else {
-                CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context);
+            CiderAudio.audioNodes.spatialNode = new ResonanceAudio(CiderAudio.context);
             let roomDimensions = {
                 width: 32,
                 height: 12,
@@ -130,7 +130,7 @@ const CiderAudio = {
             CiderAudio.audioNodes.spatialNode.setRoomProperties(roomDimensions, roomMaterials);
             CiderAudio.audioNodes.spatialInput = CiderAudio.audioNodes.spatialNode.createSource();
             CiderAudio.audioNodes.gainNode.connect(CiderAudio.audioNodes.spatialInput.input);}
-    },
+    }, 
     spatialOff: function (){
         CiderAudio.hierarchical_loading();
     },
diff --git a/src/renderer/views/pages/audiolabs.ejs b/src/renderer/views/pages/audiolabs.ejs
index 21b2a6c1..6d330723 100644
--- a/src/renderer/views/pages/audiolabs.ejs
+++ b/src/renderer/views/pages/audiolabs.ejs
@@ -70,7 +70,7 @@
                     <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description')}}</small>
                 </div>
                 <div class="md-option-segment md-option-segment_auto">
-                    <input type="checkbox" v-model="app.cfg.audio.spatial" v-on:change="toggleSpatial" switch/>
+                    <input type="checkbox" v-model="app.cfg.audio.spatial" :disabled="app.cfg.audio.maikiwiAudio.spatial === true" v-on:change="toggleSpatial" switch/>
                 </div>
             </div>
             <div class="md-option-line" v-show="app.cfg.advanced.AudioContext === true">
@@ -80,7 +80,7 @@
                     <small>{{$root.getLz('settings.option.audio.enableAdvancedFunctionality.tunedAudioSpatialization.description')}}</small>
                 </div>
                 <div class="md-option-segment md-option-segment_auto">
-                    <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial" :disabled="app.cfg.audio.spatial === false" v-on:change="toggleSpatial" switch/>
+                    <input type="checkbox" v-model="app.cfg.audio.maikiwiAudio.spatial" :disabled="app.cfg.audio.spatial === false" v-on:change="toggleMaikiwiSpatial" switch/>
                 </div>
             </div>
             <div class="md-option-line" v-show="app.cfg.audio.maikiwiAudio.spatial === true && app.cfg.audio.spatial === true">
@@ -169,26 +169,23 @@
         methods: {
             toggleSpatial: function () {
                 if (app.cfg.audio.spatial) {              
-                        if (app.cfg.audio.maikiwiAudio.spatial === false) {
-                            if (app.mk.volume - 0.2512 > 0) {app.mk.volume -= 0.2512}
-                            else {app.mk.volume = 0.0001}
-                        }
-                        CiderAudio.spatialOn()
-                        CiderAudio.hierarchical_loading();
-                        if (app.cfg.audio.maikiwiAudio.spatial === true) {
-                            if (app.mk.volume + 0.2512 < 1) {app.mk.volume += 0.2512}
-                            else {app.mk.volume = 1}
-                        }
+                    CiderAudio.spatialOn()
+                    CiderAudio.hierarchical_loading();
                     }
                 else {
-                    if (app.cfg.audio.maikiwiAudio.spatial === true) {
-                        if (app.mk.volume - 0.2512 > 0) {app.mk.volume -= 0.2512}
-                        else {app.mk.volume = 0.0001}
-                        }
-                    app.cfg.audio.maikiwiAudio.spatial = false;
                     CiderAudio.spatialOff()             
                 }
-
+            },
+            toggleMaikiwiSpatial: function () {
+                if (app.cfg.audio.maikiwiAudio.spatial === true) { 
+                    let normalized = Math.pow(10, (((Math.log10(app.mk.volume) * 20) + 12) / 20)); 
+                    if (normalized > 1.0) {app.mk.volume = 1}
+                    else {app.mk.volume = normalized}    
+                }
+                else { 
+                    let normalized = Math.pow(10, (((Math.log10(app.mk.volume) * 20) - 12) / 20)); 
+                    app.mk.volume = normalized
+                }
             },
             ciderPPEStandard: function () {
                 app.cfg.audio.maikiwiAudio.ciderPPE_value = 0.5;