fix how vrm models are loaded in, fix deleting presets

Former-commit-id: feb1041

Author: you-win

export_presets.cfg

@@ -5,7 +5,7 @@ platform="Windows Desktop"
 runnable=true
 custom_features=""
 export_filter="resources"
-export_files=PoolStringArray( "res://addons/Godot-MToon-Shader/inspector_mtoon.gd", "res://addons/Godot-MToon-Shader/mtoon.shader", "res://addons/Godot-MToon-Shader/mtoon_cull_off.shader", "res://addons/Godot-MToon-Shader/mtoon_outline.shader", "res://addons/Godot-MToon-Shader/mtoon_trans.shader", "res://addons/Godot-MToon-Shader/mtoon_trans_cull_off.shader", "res://addons/Godot-MToon-Shader/mtoon_trans_zwrite.shader", "res://addons/Godot-MToon-Shader/mtoon_trans_zwrite_cull_off.shader", "res://addons/Godot-MToon-Shader/plugin.gd", "res://addons/MToonCompat/mtooncompat.shader", "res://addons/MToonCompat/mtooncompat_cull_off.shader", "res://addons/MToonCompat/mtooncompat_outline.shader", "res://addons/MToonCompat/mtooncompat_trans.shader", "res://addons/MToonCompat/mtooncompat_trans_cull_off.shader", "res://addons/MToonCompat/mtooncompat_trans_zwrite.shader", "res://addons/MToonCompat/mtooncompat_trans_zwrite_cull_off.shader", "res://addons/advanced-expression/advanced_expression.gd", "res://addons/gdnative-runtime-loader/gdnative_runtime_loader.gd", "res://addons/real-time-lip-sync-gd/lip_sync.gdns", "res://addons/real-time-lip-sync-gd/lip_sync_mock.gd", "res://addons/real-time-lip-sync-gd/real_time_lip_sync.gdnlib", "res://addons/repl_gd/debug_console.gd", "res://addons/repl_gd/debug_console.theme", "res://addons/repl_gd/debug_console.tscn", "res://addons/repl_gd/plugin.gd", "res://addons/repl_gd/repl.gd", "res://addons/repl_gd/repl.tscn", "res://addons/vrm/import_vrm.gd", "res://addons/vrm/plugin.gd", "res://addons/vrm/vrm_collidergroup.gd", "res://addons/vrm/vrm_loader.gd", "res://addons/vrm/vrm_meta.gd", "res://addons/vrm/vrm_secondary.gd", "res://addons/vrm/vrm_springbone.gd", "res://addons/vrm/vrm_toplevel.gd", "res://assets/ChromaKeyGreen.png", "res://assets/DefaultSpatialMaterial.tres", "res://assets/MainEnvironment.tres", "res://assets/NoPreview.png", "res://assets/SplashSetup.png", "res://assets/default.theme", "res://assets/default_env.tres", "res://assets/duck/m_duck.material", "res://assets/duck/m_eyes.material", "res://assets/duck/rubber-duck.glb", "res://assets/icon.png", "res://assets/osfgd_icon.png", "res://assets/styles/button/disabled_stylebox.tres", "res://assets/styles/button/hover_stylebox.tres", "res://assets/styles/button/pressed_stylebox.tres", "res://assets/styles/main_stylebox.tres", "res://assets/styles/main_theme.tres", "res://assets/vrm-models/alicia/AliciaSolid_vrm-0.51.glb", "res://assets/vrm-models/alicia/Alicia_body.material", "res://assets/vrm-models/alicia/Alicia_body_wear.material", "res://assets/vrm-models/alicia/Alicia_eye.material", "res://assets/vrm-models/alicia/Alicia_eye_white.material", "res://assets/vrm-models/alicia/Alicia_face.material", "res://assets/vrm-models/alicia/Alicia_face_mastuge.material", "res://assets/vrm-models/alicia/Alicia_hair.material", "res://assets/vrm-models/alicia/Alicia_hair_trans.material", "res://assets/vrm-models/alicia/Alicia_hair_trans_zwrite.material", "res://assets/vrm-models/alicia/Alicia_hair_wear.material", "res://assets/vrm-models/alicia/Alicia_other_zwrite.material", "res://assets/vrm-models/alicia/Alicia_wear.material", "res://entities/duck/duck.gd", "res://entities/duck/duck.tres", "res://entities/duck/duck.tscn", "res://entities/duck/duck_eyes.tres", "res://entities/duck/duck_eyes_texture.tres", "res://entities/duck/duck_texture.tres", "res://entities/main_light.gd", "res://entities/main_light.tscn", "res://entities/sun.gd", "res://model/config/base_config.gd", "res://model/config/data_point.gd", "res://model/config/metadata.gd", "res://model/config/model_config.gd", "res://model/dummies/tracking_backend_dummy.gd", "res://model/env.gd", "res://model/error.gd", "res://model/extensions/extension.gd", "res://model/extensions/extension_context.gd", "res://model/extensions/extension_resource.gd", "res://model/extensions/puppet_trait.gd", "res://model/extensions/runner_trait.gd", "res://model/extensions/tracking_backend_interface.gd", "res://model/globals.gd", "res://model/interpolation_data.gd", "res://model/prop.gd", "res://model/signal_payload.gd", "res://model/stored_offsets.gd", "res://screens/default_runner.gd", "res://screens/gui/base_layout.gd", "res://screens/gui/base_tree_layout.gd", "res://screens/gui/default_gui.gd", "res://screens/gui/default_gui.tscn", "res://screens/gui/menu_bar.gd", "res://screens/gui/menu_bar.tscn", "res://screens/gui/popups/about.tscn", "res://screens/gui/popups/base_popup.gd", "res://screens/gui/popups/bones.gd", "res://screens/gui/popups/bones.tscn", "res://screens/gui/popups/debug_console.gd", "res://screens/gui/popups/debug_console.tscn", "res://screens/gui/popups/in_app_help.gd", "res://screens/gui/popups/in_app_help.tscn", "res://screens/gui/popups/licenses.gd", "res://screens/gui/popups/licenses.tscn", "res://screens/gui/popups/logs.gd", "res://screens/gui/popups/logs.tscn", "res://screens/gui/popups/model.gd", "res://screens/gui/popups/model.tscn", "res://screens/gui/popups/presets.gd", "res://screens/gui/popups/presets.tscn", "res://screens/gui/popups/props.tscn", "res://screens/gui/popups/tracking.gd", "res://screens/gui/popups/tracking.tscn", "res://screens/gui/runner.gd", "res://screens/gui/runner.tscn", "res://screens/gui/settings.gd", "res://screens/gui/settings.tscn", "res://screens/landing_screen.gd", "res://screens/landing_screen.tscn", "res://screens/splash_setup.gd", "res://screens/splash_setup.tscn", "res://utils/abstract_manager.gd", "res://utils/app_manager.gd", "res://utils/config_manager.gd", "res://utils/control_util.gd", "res://utils/extension_manager.gd", "res://utils/file_util.gd", "res://utils/json_util.gd", "res://utils/log_manager.gd", "res://utils/logger.gd", "res://utils/node_util.gd", "res://utils/notification_manager.gd", "res://utils/pub_sub.gd", "res://utils/temp_cache_manager.gd" )
+export_files=PoolStringArray( "res://addons/Godot-MToon-Shader/inspector_mtoon.gd", "res://addons/Godot-MToon-Shader/mtoon.shader", "res://addons/Godot-MToon-Shader/mtoon_cull_off.shader", "res://addons/Godot-MToon-Shader/mtoon_outline.shader", "res://addons/Godot-MToon-Shader/mtoon_trans.shader", "res://addons/Godot-MToon-Shader/mtoon_trans_cull_off.shader", "res://addons/Godot-MToon-Shader/mtoon_trans_zwrite.shader", "res://addons/Godot-MToon-Shader/mtoon_trans_zwrite_cull_off.shader", "res://addons/Godot-MToon-Shader/plugin.gd", "res://addons/MToonCompat/mtooncompat.shader", "res://addons/MToonCompat/mtooncompat_cull_off.shader", "res://addons/MToonCompat/mtooncompat_outline.shader", "res://addons/MToonCompat/mtooncompat_trans.shader", "res://addons/MToonCompat/mtooncompat_trans_cull_off.shader", "res://addons/MToonCompat/mtooncompat_trans_zwrite.shader", "res://addons/MToonCompat/mtooncompat_trans_zwrite_cull_off.shader", "res://addons/advanced-expression/advanced_expression.gd", "res://addons/gdnative-runtime-loader/gdnative_runtime_loader.gd", "res://addons/real-time-lip-sync-gd/lip_sync.gdns", "res://addons/real-time-lip-sync-gd/lip_sync_mock.gd", "res://addons/real-time-lip-sync-gd/real_time_lip_sync.gdnlib", "res://addons/repl_gd/debug_console.gd", "res://addons/repl_gd/debug_console.theme", "res://addons/repl_gd/debug_console.tscn", "res://addons/repl_gd/plugin.gd", "res://addons/repl_gd/repl.gd", "res://addons/repl_gd/repl.tscn", "res://addons/vrm/import_vrm.gd", "res://addons/vrm/plugin.gd", "res://addons/vrm/vrm_collidergroup.gd", "res://addons/vrm/vrm_loader.gd", "res://addons/vrm/vrm_meta.gd", "res://addons/vrm/vrm_secondary.gd", "res://addons/vrm/vrm_springbone.gd", "res://addons/vrm/vrm_toplevel.gd", "res://assets/ChromaKeyGreen.png", "res://assets/DefaultSpatialMaterial.tres", "res://assets/MainEnvironment.tres", "res://assets/NoPreview.png", "res://assets/SplashSetup.png", "res://assets/default.theme", "res://assets/default_env.tres", "res://assets/duck/m_duck.material", "res://assets/duck/m_eyes.material", "res://assets/duck/rubber-duck.glb", "res://assets/icon.png", "res://assets/osfgd_icon.png", "res://assets/styles/button/disabled_stylebox.tres", "res://assets/styles/button/hover_stylebox.tres", "res://assets/styles/button/pressed_stylebox.tres", "res://assets/styles/main_stylebox.tres", "res://assets/styles/main_theme.tres", "res://entities/duck/duck.gd", "res://entities/duck/duck.tres", "res://entities/duck/duck.tscn", "res://entities/duck/duck_eyes.tres", "res://entities/duck/duck_eyes_texture.tres", "res://entities/duck/duck_texture.tres", "res://entities/main_light.gd", "res://entities/main_light.tscn", "res://entities/sun.gd", "res://model/config/base_config.gd", "res://model/config/data_point.gd", "res://model/config/metadata.gd", "res://model/config/model_config.gd", "res://model/dummies/tracking_backend_dummy.gd", "res://model/env.gd", "res://model/error.gd", "res://model/extensions/extension.gd", "res://model/extensions/extension_context.gd", "res://model/extensions/extension_resource.gd", "res://model/extensions/puppet_trait.gd", "res://model/extensions/runner_trait.gd", "res://model/extensions/tracking_backend_interface.gd", "res://model/globals.gd", "res://model/interpolation_data.gd", "res://model/prop.gd", "res://model/signal_payload.gd", "res://model/stored_offsets.gd", "res://screens/default_runner.gd", "res://screens/gui/base_layout.gd", "res://screens/gui/base_tree_layout.gd", "res://screens/gui/default_gui.gd", "res://screens/gui/default_gui.tscn", "res://screens/gui/menu_bar.gd", "res://screens/gui/menu_bar.tscn", "res://screens/gui/popups/about.tscn", "res://screens/gui/popups/base_popup.gd", "res://screens/gui/popups/bones.gd", "res://screens/gui/popups/bones.tscn", "res://screens/gui/popups/debug_console.gd", "res://screens/gui/popups/debug_console.tscn", "res://screens/gui/popups/in_app_help.gd", "res://screens/gui/popups/in_app_help.tscn", "res://screens/gui/popups/licenses.gd", "res://screens/gui/popups/licenses.tscn", "res://screens/gui/popups/logs.gd", "res://screens/gui/popups/logs.tscn", "res://screens/gui/popups/model.gd", "res://screens/gui/popups/model.tscn", "res://screens/gui/popups/presets.gd", "res://screens/gui/popups/presets.tscn", "res://screens/gui/popups/props.tscn", "res://screens/gui/popups/tracking.gd", "res://screens/gui/popups/tracking.tscn", "res://screens/gui/runner.gd", "res://screens/gui/runner.tscn", "res://screens/gui/settings.gd", "res://screens/gui/settings.tscn", "res://screens/landing_screen.gd", "res://screens/landing_screen.tscn", "res://screens/splash_setup.gd", "res://screens/splash_setup.tscn", "res://utils/abstract_manager.gd", "res://utils/app_manager.gd", "res://utils/config_manager.gd", "res://utils/control_util.gd", "res://utils/extension_manager.gd", "res://utils/file_util.gd", "res://utils/json_util.gd", "res://utils/log_manager.gd", "res://utils/logger.gd", "res://utils/node_util.gd", "res://utils/notification_manager.gd", "res://utils/pub_sub.gd", "res://utils/temp_cache_manager.gd" )
 include_filter=""
 exclude_filter=""
 export_path="export/vpuppr.exe"
@@ -14,7 +14,7 @@ script_encryption_key=""
 
 [preset.0.options]
 
-custom_template/debug=""
+custom_template/debug="C:/Users/theaz/dev/godot-release-templates/godot-custom-3.x_editor.exe"
 custom_template/release="C:/Users/theaz/dev/godot-release-templates/godot-custom-3.x.exe"
 binary_format/64_bits=true
 binary_format/embed_pck=true

resources/extensions/open_see_face/data/tracking_gui_descriptor.gd

@@ -61,7 +61,7 @@ static func _on_line_edit_changed(text: String, key: String, is_int: bool = fals
 	if is_int and not text.is_valid_integer():
 		return
 
-	AM.ps.publish(key, text if not is_int else text)
+	AM.ps.publish(key, text if not is_int else text.to_int())
 
 static func _on_button_toggled(state: bool, key: String) -> void:
 	AM.ps.publish(key, state)

resources/extensions/vrm/vrm.gd

@@ -59,6 +59,7 @@ func load_vrm(path: String) -> Result:
 	m.set_script(load(script_res.unwrap()))
 
 	m.vrm_meta = vrm_meta
+	m.transform = m.transform.translated(Vector3(0, -1.3, -2.4))
 	m.transform = m.transform.rotated(Vector3.UP, PI)
 
 	translation_adjustment = Vector3(-1, 1, -1)

screens/default_runner.gd

@@ -196,8 +196,12 @@ func _setup_scene() -> void:
 
 	yield(model, "ready")
 
-	model.transform = AM.cm.get_data("model_transform")
-	model_parent.transform = AM.cm.get_data("model_parent_transform")
+	var model_transform = AM.cm.get_data("model_transform")
+	if model_transform != null and model_transform != Transform.IDENTITY:
+		model.transform = model_transform
+	var model_parent_transform = AM.cm.get_data("model_parent_transform")
+	if model_parent_transform != null and model_parent_transform != Transform.IDENTITY:
+		model_parent.transform = model_parent_transform
 
 	AM.tcm.push(MODEL_INITIAL_TRANSFORM, model.transform).cleanup_on_signal(self, "tree_exiting")
 	AM.tcm.push(MODEL_PARENT_INITIAL_TRANSFORM, model_parent.transform).cleanup_on_signal(self, "tree_exiting")

screens/gui/popups/presets.gd

@@ -181,7 +181,9 @@ class PresetsPage extends ScrollContainer:
 					return
 
 				var model_configs: Dictionary = AM.cm.get_data("model_configs")
+				FileUtil.remove_file_at_path(model_configs[name])
 				model_configs.erase(name)
+
 				AM.ps.publish("model_configs", model_configs, name)
 			_:
 				logger.error("Unhandled action %s" % action_type)

utils/file_util.gd

@@ -23,7 +23,7 @@ extends Reference
 ##
 ## @return: String - The stripped name
 static func path_to_stripped_name(path: String) -> String:
-	return path.get_basename().get_file()
+	return path.get_basename().get_file().validate_node_name()
 
 ## Loads a Godot resource at the given path
 ##