Started work on multiplayer fix, major changes in websockets connecti…

…on techniques
Lixie-Labs · May 28, 2024 · 129e39b · 129e39b
1 parent 0825a4a
commit 129e39b
Show file tree

Hide file tree

Showing 12 changed files with 547 additions and 442 deletions.
diff --git a/data/js/menu_toggles.js b/data/js/menu_toggles.js
@@ -4,13 +4,13 @@ function set_menu_toggle_state(toggle_name, toggle_state){
 		document.getElementById(toggle_name).classList.remove("menu_item_toggle_off");
 		document.getElementById(toggle_name).classList.add("menu_item_toggle_on");
 		document.getElementById(toggle_name).innerHTML = "ON";
-		transmit(`set|${toggle_name}|1`);
+		wstx(`set|${toggle_name}|1`);
 	}
 	else{
 		document.getElementById(toggle_name).classList.remove("menu_item_toggle_on");
 		document.getElementById(toggle_name).classList.add("menu_item_toggle_off");
 		document.getElementById(toggle_name).innerHTML = "OFF";
-		transmit(`set|${toggle_name}|0`);
+		wstx(`set|${toggle_name}|0`);
 	}
 
 	configuration[toggle_name] = !configuration[toggle_name];

diff --git a/data/js/render_controls.js b/data/js/render_controls.js
@@ -310,10 +310,10 @@ function check_and_attach_buzz_listeners() {
 			});
 
 			document.addEventListener('touchstart', function(){
-				transmit("touch_start");
+				wstx("touch_start");
 			}, { passive: true });
 			document.addEventListener('touchend', function(){
-				transmit("touch_end");
+				wstx("touch_end");
 			}, { passive: true });
 
 			window.addEventListener('contextmenu', function(e) {

diff --git a/data/js/sliders.js b/data/js/sliders.js
@@ -49,7 +49,7 @@ function track_sliders() {
 
 		eventPoints.forEach(point => {
 			let id = point.target.closest('.slider_track').getAttribute('id');
-			transmit(`slider_touch_start|${id}`);
+			wstx(`slider_touch_start|${id}`);
 
 			// Store initial touch positions
 			touch_start_data.set(isMouseEvent ? 'mouse' : point.identifier, {
@@ -106,7 +106,7 @@ function track_sliders() {
 
 								if(configuration[id] != resulting_value){
 									configuration[id] = resulting_value;
-									transmit(`set|${id}|${truncate_float(resulting_value, 3)}`);
+									wstx(`set|${id}|${truncate_float(resulting_value, 3)}`);
 								}
 
 								let percentage = ((resulting_value-slider_min) / (slider_max-slider_min)) * 100.0;
@@ -129,7 +129,7 @@ function track_sliders() {
 
         if (data && data.target_div.classList.contains("slider_track")) {
             let id = data.target_div.getAttribute('id');
-            transmit(`slider_touch_end|${id}`);
+            wstx(`slider_touch_end|${id}`);
         }
 
         touch_start_data.delete(isMouseEvent ? 'mouse' : point.identifier);

diff --git a/data/js/toggles.js b/data/js/toggles.js
@@ -20,7 +20,7 @@ function toggle_toggle(toggle_name){
 			trigger_vibration(20);
 			let resulting_value = configuration[id] ? 1 : 0;
 
-			transmit(`set|${toggle_name}|${resulting_value}`);
+			wstx(`set|${toggle_name}|${resulting_value}`);
 		}
 	}   
 }
@@ -116,7 +116,7 @@ function track_toggles() {
 								if(configuration[id] != resulting_value){
 									configuration[id] = resulting_value;
 									trigger_vibration(20);
-									transmit(`set|${id}|${resulting_value}`);
+									wstx(`set|${id}|${resulting_value}`);
 								}
 
 								//let percentage = ((resulting_value-slider_min) / (slider_max-slider_min)) * 100.0;