Browse Source

added (non-functional) bypass button to generated nodes

Jonathan Higgins 1 month ago
parent
commit
97586ad2dc
3 changed files with 68 additions and 6 deletions
  1. 48 6
      export_presets.cfg
  2. 16 0
      scenes/Nodes/node_logic.gd
  3. 4 0
      scenes/main/scripts/run_thread.gd

+ 48 - 6
export_presets.cfg

@@ -9,7 +9,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="*.thd, export_presets.cfg"
 exclude_filter=""
-export_path="../SoundThread_Exports/v0-3-1-beta/v0-3-1-beta_windows/SoundThread.exe"
+export_path="../SoundThread_Exports/v0-4-0-beta/SoundThread_v0-4-0-beta_windows/SoundThread.exe"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
@@ -37,8 +37,8 @@ application/modify_resources=true
 application/icon=""
 application/console_wrapper_icon=""
 application/icon_interpolation=4
-application/file_version="0.3.1"
-application/product_version="0.3.1"
+application/file_version="0.4.0"
+application/product_version="0.4.0"
 application/company_name="Jonathan Higgins"
 application/product_name="SoundThread"
 application/file_description="SoundThread for CDP"
@@ -76,7 +76,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="*.thd, export_presets.cfg"
 exclude_filter=""
-export_path="../SoundThread_Exports/v0-3-1-beta/SoundThread-v0-3-1-beta_macos.zip"
+export_path="../SoundThread_Exports/v0-4-0-beta/SoundThread_v0-4-0-beta_macos/SoundThread-v0-4-0-beta_macos.zip"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
@@ -321,7 +321,7 @@ rm -rf \"{temp_dir}\""
 
 [preset.2]
 
-name="Linux"
+name="Linux x86_64"
 platform="Linux"
 runnable=true
 advanced_options=true
@@ -330,7 +330,7 @@ custom_features=""
 export_filter="all_resources"
 include_filter="*.thd, export_presets.cfg"
 exclude_filter=""
-export_path="../SoundThread_Exports/v0-3-1-beta/v0-3-1-beta_linux/SoundThread.x86_64"
+export_path="../SoundThread_Exports/v0-4-0-beta/SoundThread_v0-4-0-beta_linux_x86_64/SoundThread.x86_64"
 patches=PackedStringArray()
 encryption_include_filters=""
 encryption_exclude_filters=""
@@ -360,3 +360,45 @@ unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
 ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
 kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
 rm -rf \"{temp_dir}\""
+
+[preset.3]
+
+name="Linux arm64"
+platform="Linux"
+runnable=false
+advanced_options=true
+dedicated_server=false
+custom_features=""
+export_filter="all_resources"
+include_filter="*.thd, export_presets.cfg"
+exclude_filter=""
+export_path="../SoundThread_Exports/v0-4-0-beta/SoundThread_v0-4-0-beta_linux_arm64/SoundThread.arm64"
+patches=PackedStringArray()
+encryption_include_filters=""
+encryption_exclude_filters=""
+seed=0
+encrypt_pck=false
+encrypt_directory=false
+script_export_mode=2
+
+[preset.3.options]
+
+custom_template/debug=""
+custom_template/release=""
+debug/export_console_wrapper=0
+binary_format/embed_pck=true
+texture_format/s3tc_bptc=true
+texture_format/etc2_astc=false
+binary_format/architecture="arm64"
+ssh_remote_deploy/enabled=false
+ssh_remote_deploy/host="user@host_ip"
+ssh_remote_deploy/port="22"
+ssh_remote_deploy/extra_args_ssh=""
+ssh_remote_deploy/extra_args_scp=""
+ssh_remote_deploy/run_script="#!/usr/bin/env bash
+export DISPLAY=:0
+unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
+\"{temp_dir}/{exe_name}\" {cmd_args}"
+ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
+kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
+rm -rf \"{temp_dir}\""

+ 16 - 0
scenes/Nodes/node_logic.gd

@@ -32,6 +32,14 @@ func _ready() -> void:
 	btn.tooltip_text = "Open help for " + self.title
 	btn.connect("pressed", Callable(self, "_open_help")) #pass key (process name) when button is pressed
 	titlebar.add_child(btn)
+	
+	#add bypass
+	var bypass_btn = Button.new()
+	bypass_btn.text = "⏻"
+	bypass_btn.tooltip_text = "Bypass node from thread processing"
+	bypass_btn.pressed.connect(_bypass_node)
+	titlebar.add_child(bypass_btn)
+	
 	await get_tree().process_frame
 	#reset_size()
 	
@@ -178,3 +186,11 @@ func set_button_value(value, button) -> void:
 		button.set_pressed_no_signal(value)
 		
 	button_states[button] = value
+
+func _bypass_node() -> void:
+	if has_meta("bypassed") and get_meta("bypassed"):
+		set_meta("bypassed", false)
+		self.modulate = Color(1.0, 1.0, 1.0)
+	else:
+		set_meta("bypassed", true)
+		self.modulate = Color(1.0, 1.0, 1.0, 0.5)

+ 4 - 0
scenes/main/scripts/run_thread.gd

@@ -404,6 +404,10 @@ func run_thread_with_branches():
 					intermediate_files.append(output_file)
 					
 				process_count += 1
+				
+		#elif node.has_meta("bypassed") and node.get_meta("bypassed"):
+			#check if node is bypassed and skip processing
+			
 		else:
 			# Build the command for the current node's audio processing
 			var slider_data = _get_slider_values_ordered(node)