Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 7480b19

Browse files
committedMay 30, 2024
Avoid using :GDScript type declaration for gd preloads
1 parent 8fb2716 commit 7480b19

13 files changed

+39
-39
lines changed
 

‎asset_adapter.gd

+5-5
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
@tool
55
extends Resource
66

7-
const object_adapter_class: GDScript = preload("./object_adapter.gd")
7+
const object_adapter_class := preload("./object_adapter.gd")
88
const post_import_material_remap_script: GDScript = preload("./post_import_model.gd")
9-
const convert_scene: GDScript = preload("./convert_scene.gd")
10-
const raw_parsed_asset: GDScript = preload("./raw_parsed_asset.gd")
11-
const bone_map_editor_plugin: GDScript = preload("./bone_map_editor_plugin.gd")
9+
const convert_scene := preload("./convert_scene.gd")
10+
const raw_parsed_asset := preload("./raw_parsed_asset.gd")
11+
const bone_map_editor_plugin := preload("./bone_map_editor_plugin.gd")
1212
const unidot_utils_class = preload("./unidot_utils.gd")
1313

1414
var unidot_utils = unidot_utils_class.new()
@@ -418,7 +418,7 @@ class AudioHandler:
418418

419419
class YamlHandler:
420420
extends AssetHandler
421-
const tarfile: GDScript = preload("./tarfile.gd")
421+
const tarfile := preload("./tarfile.gd")
422422

423423
func parse_yaml_or_binary(pkgasset: Object, temp_path: String) -> void:
424424
var outfile: FileAccess = FileAccess.open(temp_path, FileAccess.WRITE_READ)

‎asset_database.gd

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
@tool
55
extends Resource
66

7-
const asset_meta_class: GDScript = preload("./asset_meta.gd")
8-
const object_adapter_class: GDScript = preload("./object_adapter.gd")
9-
const vrm_integration_class: GDScript = preload("./vrm_integration.gd")
7+
const asset_meta_class := preload("./asset_meta.gd")
8+
const object_adapter_class := preload("./object_adapter.gd")
9+
const vrm_integration_class := preload("./vrm_integration.gd")
1010

1111
const ASSET_DATABASE_PATH: String = "res://unidot_asset_database.res"
1212

‎asset_meta.gd

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
@tool
55
extends Resource
66

7-
const yaml_parser_class: GDScript = preload("./yaml_parser.gd")
8-
const object_adapter_class: GDScript = preload("./object_adapter.gd")
9-
const bin_parser_class: GDScript = preload("./deresuteme/decode.gd")
10-
const unidot_utils_class: GDScript = preload("./unidot_utils.gd")
7+
const yaml_parser_class := preload("./yaml_parser.gd")
8+
const object_adapter_class := preload("./object_adapter.gd")
9+
const bin_parser_class := preload("./deresuteme/decode.gd")
10+
const unidot_utils_class := preload("./unidot_utils.gd")
1111
var unidot_utils := unidot_utils_class.new()
1212

1313

‎convert_scene.gd

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
@tool
55
extends Resource
66

7-
const object_adapter_class: GDScript = preload("./object_adapter.gd")
8-
const scene_node_state_class: GDScript = preload("./scene_node_state.gd")
7+
const object_adapter_class := preload("./object_adapter.gd")
8+
const scene_node_state_class := preload("./scene_node_state.gd")
99

1010

1111
func customComparison(a, b):

‎deresuteme/decode.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
@tool
1919
extends RefCounted
2020

21-
const object_adapter_class: GDScript = preload("../object_adapter.gd")
21+
const object_adapter_class := preload("../object_adapter.gd")
2222

2323
var object_adapter = object_adapter_class.new()
2424

‎import_worker.gd

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
@tool
55
extends "./thread_worker.gd"
66

7-
const tarfile: GDScript = preload("./tarfile.gd")
8-
const package_file: GDScript = preload("./package_file.gd")
7+
const tarfile := preload("./tarfile.gd")
8+
const package_file := preload("./package_file.gd")
99

1010
var stage2: bool = false
1111
var guid_to_pkgasset: Dictionary

‎meta_worker.gd

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
@tool
55
extends "./thread_worker.gd"
66

7-
const binary_parser: GDScript = preload("./deresuteme/decode.gd")
8-
const yaml_parser: GDScript = preload("./yaml_parser.gd")
9-
const tarfile: GDScript = preload("./tarfile.gd")
10-
const package_file: GDScript = preload("./package_file.gd")
7+
const binary_parser := preload("./deresuteme/decode.gd")
8+
const yaml_parser := preload("./yaml_parser.gd")
9+
const tarfile := preload("./tarfile.gd")
10+
const package_file := preload("./package_file.gd")
1111

1212

1313
class ThreadWork:

‎object_adapter.gd

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ const FORMAT_SINT16: int = 9
1717
const FORMAT_UINT32: int = 10
1818
const FORMAT_SINT32: int = 11
1919

20-
const aligned_byte_buffer: GDScript = preload("./aligned_byte_buffer.gd")
21-
const monoscript: GDScript = preload("./monoscript.gd")
22-
const anim_tree_runtime: GDScript = preload("./runtime/anim_tree.gd")
20+
const aligned_byte_buffer := preload("./aligned_byte_buffer.gd")
21+
const monoscript := preload("./monoscript.gd")
22+
const anim_tree_runtime := preload("./runtime/anim_tree.gd")
2323
const human_trait = preload("./humanoid/human_trait.gd")
2424
const humanoid_transform_util = preload("./humanoid/transform_util.gd")
2525
const unidot_utils_class = preload("./unidot_utils.gd")

‎package_file.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ExtractedTarFile:
2929
return f
3030

3131

32-
const tarfile: GDScript = preload("./tarfile.gd")
32+
const tarfile := preload("./tarfile.gd")
3333

3434

3535
class PkgAsset:

‎package_import_dialog.gd

+8-8
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@
44
@tool
55
extends RefCounted
66

7-
const package_file: GDScript = preload("./package_file.gd")
8-
const tarfile: GDScript = preload("./tarfile.gd")
9-
const import_worker_class: GDScript = preload("./import_worker.gd")
10-
const meta_worker_class: GDScript = preload("./meta_worker.gd")
11-
const asset_adapter_class: GDScript = preload("./asset_adapter.gd")
12-
const asset_database_class: GDScript = preload("./asset_database.gd")
13-
const object_adapter_class: GDScript = preload("./object_adapter.gd")
14-
const asset_meta_class: GDScript = preload("./asset_meta.gd")
7+
const package_file := preload("./package_file.gd")
8+
const tarfile := preload("./tarfile.gd")
9+
const import_worker_class := preload("./import_worker.gd")
10+
const meta_worker_class := preload("./meta_worker.gd")
11+
const asset_adapter_class := preload("./asset_adapter.gd")
12+
const asset_database_class := preload("./asset_database.gd")
13+
const object_adapter_class := preload("./object_adapter.gd")
14+
const asset_meta_class := preload("./asset_meta.gd")
1515

1616
# Set THREAD_COUNT to 0 to run single-threaded.
1717
const THREAD_COUNT = 10

‎plugin.gd

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ extends EditorPlugin
66

77
const tarfile = preload("./tarfile.gd")
88

9-
const package_import_dialog_class: GDScript = preload("./package_import_dialog.gd")
9+
const package_import_dialog_class := preload("./package_import_dialog.gd")
1010

1111
var package_import_dialog: RefCounted = null
1212
var last_selected_dir: String = ""

‎post_import_model.gd

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
@tool
55
extends EditorScenePostImport
66

7-
const asset_database_class: GDScript = preload("./asset_database.gd")
8-
const asset_meta_class: GDScript = preload("./asset_meta.gd")
9-
const object_adapter_class: GDScript = preload("./object_adapter.gd")
7+
const asset_database_class := preload("./asset_database.gd")
8+
const asset_meta_class := preload("./asset_meta.gd")
9+
const object_adapter_class := preload("./object_adapter.gd")
1010
const unidot_utils_class = preload("./unidot_utils.gd")
1111

1212
# Use this as an example script for writing your own custom post-import scripts. The function requires you pass a table

‎thread_worker.gd

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
@tool
55
extends RefCounted
66

7-
const queue_lib: GDScript = preload("./queue_lib.gd")
8-
const asset_adapter_class: GDScript = preload("./asset_adapter.gd")
7+
const queue_lib := preload("./queue_lib.gd")
8+
const asset_adapter_class := preload("./asset_adapter.gd")
99

1010
var asset_adapter = asset_adapter_class.new()
1111

0 commit comments

Comments
 (0)
Please sign in to comment.