From dbcb202914e4787da6a2394530cb1d68b4607626 Mon Sep 17 00:00:00 2001 From: Relintai Date: Sun, 20 Mar 2022 14:16:46 +0100 Subject: [PATCH] Updated the engine. I removed TMeshInstance. --- HEADS | 2 +- game/models/entities/human/models/armature_huf.tscn | 2 +- game/player/CharacterSkeletonGD.gd | 8 +------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/HEADS b/HEADS index 70094263..105d5b53 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "b287513656c131c2e0acc74969919e69ee7647d1"}} \ No newline at end of file +{"engine": {"3.2": "94a0fc47f7b4e90f8973f9adbfd3312579ed2825", "master": "8c73e813134001e575b6f59e3b0100471c007410", "3.x": "c4864a0e5f73a375259503ea1485794a6aad6df7"}, "world_generator": {"master": "260c430f11b0b591eaf4714516419aa327d2842c"}, "entity_spell_system": {"master": "3536f01bacf5f54cefb32b768cd020a1f94d0ade"}, "ui_extensions": {"master": "80a3b96fc56991a0f88a1d441ed1e3cebaf3307a"}, "voxelman": {"master": "65485930a20f65844d496b4ba47dec5b6ed70b91"}, "texture_packer": {"master": "ae4d222fbaade063ed6f0bc9f3aaa53df68a7fed"}, "fastnoise": {"master": "46bb1f610bfb7171613b5c708d312bcf94e89356"}, "mesh_data_resource": {"master": "a062d871d49d954c5466b9de54b4075cb61cbef4"}, "procedural_animations": {"master": "f8aae42bf06b3936cc6bd24cb18e1c3ec9f78f4f"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "983090d21a08ebed30a5ce06681269819ab12e48"}, "mesh_utils": {"master": "b52a261c31f04fad624e5cfbcdcc4a45d61136da"}, "broken_seals_module": {"master": "52c5a81350db1c29d375c63d95010260911ec034"}, "thread_pool": {"master": "0917511d04bb1aa308385b63ec88d3c182990628"}, "terraman": {"master": "c72d8fc03295588fc18c5168ce351bd0c321ec5f"}, "pandemonium_engine": {"master": "d9022a845c292cfbfe0856b33d916a7dc76c2269"}} \ No newline at end of file diff --git a/game/models/entities/human/models/armature_huf.tscn b/game/models/entities/human/models/armature_huf.tscn index 1a2f3fe5..d7409054 100644 --- a/game/models/entities/human/models/armature_huf.tscn +++ b/game/models/entities/human/models/armature_huf.tscn @@ -156,7 +156,7 @@ bones/21/bound_children = [ NodePath("ShieldAttachment") ] bones/22/bound_children = [ NodePath("LeftHandAttachment") ] bones/27/bound_children = [ NodePath("NeckAttachment") ] -[node name="MeshInstance" type="TMeshInstance" parent="armature/Armature/Skeleton" index="0"] +[node name="MeshInstance" type="MeshInstance" parent="armature/Armature/Skeleton" index="0"] visible = false [node name="LeftHandAttachment" type="BoneAttachment" parent="armature/Armature/Skeleton" index="1"] diff --git a/game/player/CharacterSkeletonGD.gd b/game/player/CharacterSkeletonGD.gd index 3b2949d9..92af8c9b 100644 --- a/game/player/CharacterSkeletonGD.gd +++ b/game/player/CharacterSkeletonGD.gd @@ -256,9 +256,6 @@ func finish_build_mesh() -> void: func job_finished(): meshes = _mesh_job.meshes mesh_instance.mesh = meshes[_current_lod_level] - - if !mesh_instance.is_software_skinning_enabled(): - mesh_instance.initialize_skinning(true, true) func clear_mesh() -> void: meshes.clear() @@ -331,10 +328,7 @@ func set_lod_level(level : int) -> void: _current_lod_level = level mesh_instance.mesh = meshes[_current_lod_level] - - if !mesh_instance.is_software_skinning_enabled(): - mesh_instance.initialize_skinning(true, true) - + func toggle_sheath():