Minor tweaks to the avatar importing based on suggestions from Lyuma …

…and iFire. (#11)
Malcolmnixon · Aug 14, 2024 · 3f5b23f · 3f5b23f
1 parent d2b1801
commit 3f5b23f
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/assets/test_chan/Test-Chan.fbx.import b/assets/test_chan/Test-Chan.fbx.import
@@ -29,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={
 "materials": {
@@ -99,18 +100,16 @@ _subresources={
 },
 "nodes": {
 "PATH:Armature/Skeleton3D": {
+"rest_pose/external_animation_library": null,
 "retarget/bone_map": Object(BoneMap,"resource_local_to_scene":false,"resource_name":"","profile":Object(SkeletonProfileHumanoid,"resource_local_to_scene":false,"resource_name":"","root_bone":&"Root","scale_base_bone":&"Hips","group_size":4,"bone_size":56,"script":null)
 ,"bonemap":null,"bone_map/Root":&"Root","bone_map/Hips":&"J_Bip_C_Hips","bone_map/Spine":&"J_Bip_C_Spine","bone_map/Chest":&"J_Bip_C_Chest","bone_map/UpperChest":&"J_Bip_C_UpperChest","bone_map/Neck":&"J_Bip_C_Neck","bone_map/Head":&"J_Bip_C_Head","bone_map/LeftEye":&"J_Adj_L_FaceEye","bone_map/RightEye":&"J_Adj_R_FaceEye","bone_map/Jaw":&"","bone_map/LeftShoulder":&"J_Bip_L_Shoulder","bone_map/LeftUpperArm":&"J_Bip_L_UpperArm","bone_map/LeftLowerArm":&"J_Bip_L_LowerArm","bone_map/LeftHand":&"J_Bip_L_Hand","bone_map/LeftThumbMetacarpal":&"J_Bip_L_Thumb1","bone_map/LeftThumbProximal":&"J_Bip_L_Thumb2","bone_map/LeftThumbDistal":&"J_Bip_L_Thumb3","bone_map/LeftIndexProximal":&"J_Bip_L_Index1","bone_map/LeftIndexIntermediate":&"J_Bip_L_Index2","bone_map/LeftIndexDistal":&"J_Bip_L_Index3","bone_map/LeftMiddleProximal":&"J_Bip_L_Middle1","bone_map/LeftMiddleIntermediate":&"J_Bip_L_Middle2","bone_map/LeftMiddleDistal":&"J_Bip_L_Middle3","bone_map/LeftRingProximal":&"J_Bip_L_Ring1","bone_map/LeftRingIntermediate":&"J_Bip_L_Ring2","bone_map/LeftRingDistal":&"J_Bip_L_Ring3","bone_map/LeftLittleProximal":&"J_Bip_L_Little1","bone_map/LeftLittleIntermediate":&"J_Bip_L_Little2","bone_map/LeftLittleDistal":&"J_Bip_L_Little3","bone_map/RightShoulder":&"J_Bip_R_Shoulder","bone_map/RightUpperArm":&"J_Bip_R_UpperArm","bone_map/RightLowerArm":&"J_Bip_R_LowerArm","bone_map/RightHand":&"J_Bip_R_Hand","bone_map/RightThumbMetacarpal":&"J_Bip_R_Thumb1","bone_map/RightThumbProximal":&"J_Bip_R_Thumb2","bone_map/RightThumbDistal":&"J_Bip_R_Thumb3","bone_map/RightIndexProximal":&"J_Bip_R_Index1","bone_map/RightIndexIntermediate":&"J_Bip_R_Index2","bone_map/RightIndexDistal":&"J_Bip_R_Index3","bone_map/RightMiddleProximal":&"J_Bip_R_Middle1","bone_map/RightMiddleIntermediate":&"J_Bip_R_Middle2","bone_map/RightMiddleDistal":&"J_Bip_R_Middle3","bone_map/RightRingProximal":&"J_Bip_R_Ring1","bone_map/RightRingIntermediate":&"J_Bip_R_Ring2","bone_map/RightRingDistal":&"J_Bip_R_Ring3","bone_map/RightLittleProximal":&"J_Bip_R_Little1","bone_map/RightLittleIntermediate":&"J_Bip_R_Little2","bone_map/RightLittleDistal":&"J_Bip_R_Little3","bone_map/LeftUpperLeg":&"J_Bip_L_UpperLeg","bone_map/LeftLowerLeg":&"J_Bip_L_LowerLeg","bone_map/LeftFoot":&"J_Bip_L_Foot","bone_map/LeftToes":&"J_Bip_L_ToeBase","bone_map/RightUpperLeg":&"J_Bip_R_UpperLeg","bone_map/RightLowerLeg":&"J_Bip_R_LowerLeg","bone_map/RightFoot":&"J_Bip_R_Foot","bone_map/RightToes":&"J_Bip_R_ToeBase","script":null)
 ,
 "retarget/bone_renamer/unique_node/make_unique": false,
 "retarget/bone_renamer/unique_node/skeleton_name": "Skeleton3D",
-"retarget/rest_fixer/fix_silhouette/enable": true,
 "retarget/rest_fixer/fix_silhouette/filter": [&"LeftFoot", &"RightFoot"]
 }
 }
 }
 fbx/importer=0
 fbx/allow_geometry_helper_nodes=false
 fbx/embedded_image_handling=1
-gltf/naming_version=1
-gltf/embedded_image_handling=1
diff --git a/assets/test_chan/Tex/Shirt.png.import b/assets/test_chan/Tex/Shirt.png.import
@@ -22,7 +22,7 @@ compress/lossy_quality=0.7
 compress/hdr_compression=1
 compress/normal_map=0
 compress/channel_pack=0
-mipmaps/generate=true
+mipmaps/generate=false
 mipmaps/limit=-1
 roughness/mode=0
 roughness/src_normal=""

diff --git a/assets/test_kun/Test-Kun.fbx.import b/assets/test_kun/Test-Kun.fbx.import
@@ -29,6 +29,7 @@ animation/import=true
 animation/fps=30
 animation/trimming=false
 animation/remove_immutable_tracks=true
+animation/import_rest_as_RESET=false
 import_script/path=""
 _subresources={
 "materials": {
@@ -103,18 +104,16 @@ _subresources={
 },
 "nodes": {
 "PATH:Armature/Skeleton3D": {
+"rest_pose/external_animation_library": null,
 "retarget/bone_map": Object(BoneMap,"resource_local_to_scene":false,"resource_name":"","profile":Object(SkeletonProfileHumanoid,"resource_local_to_scene":false,"resource_name":"","root_bone":&"Root","scale_base_bone":&"Hips","group_size":4,"bone_size":56,"script":null)
 ,"bonemap":null,"bone_map/Root":&"Root","bone_map/Hips":&"J_Bip_C_Hips","bone_map/Spine":&"J_Bip_C_Spine","bone_map/Chest":&"J_Bip_C_Chest","bone_map/UpperChest":&"J_Bip_C_UpperChest","bone_map/Neck":&"J_Bip_C_Neck","bone_map/Head":&"J_Bip_C_Head","bone_map/LeftEye":&"J_Adj_L_FaceEye","bone_map/RightEye":&"J_Adj_R_FaceEye","bone_map/Jaw":&"","bone_map/LeftShoulder":&"J_Bip_L_Shoulder","bone_map/LeftUpperArm":&"J_Bip_L_UpperArm","bone_map/LeftLowerArm":&"J_Bip_L_LowerArm","bone_map/LeftHand":&"J_Bip_L_Hand","bone_map/LeftThumbMetacarpal":&"J_Bip_L_Thumb1","bone_map/LeftThumbProximal":&"J_Bip_L_Thumb2","bone_map/LeftThumbDistal":&"J_Bip_L_Thumb3","bone_map/LeftIndexProximal":&"J_Bip_L_Index1","bone_map/LeftIndexIntermediate":&"J_Bip_L_Index2","bone_map/LeftIndexDistal":&"J_Bip_L_Index3","bone_map/LeftMiddleProximal":&"J_Bip_L_Middle1","bone_map/LeftMiddleIntermediate":&"J_Bip_L_Middle2","bone_map/LeftMiddleDistal":&"J_Bip_L_Middle3","bone_map/LeftRingProximal":&"J_Bip_L_Ring1","bone_map/LeftRingIntermediate":&"J_Bip_L_Ring2","bone_map/LeftRingDistal":&"J_Bip_L_Ring3","bone_map/LeftLittleProximal":&"J_Bip_L_Little1","bone_map/LeftLittleIntermediate":&"J_Bip_L_Little2","bone_map/LeftLittleDistal":&"J_Bip_L_Little3","bone_map/RightShoulder":&"J_Bip_R_Shoulder","bone_map/RightUpperArm":&"J_Bip_R_UpperArm","bone_map/RightLowerArm":&"J_Bip_R_LowerArm","bone_map/RightHand":&"J_Bip_R_Hand","bone_map/RightThumbMetacarpal":&"J_Bip_R_Thumb1","bone_map/RightThumbProximal":&"J_Bip_R_Thumb2","bone_map/RightThumbDistal":&"J_Bip_R_Thumb3","bone_map/RightIndexProximal":&"J_Bip_R_Index1","bone_map/RightIndexIntermediate":&"J_Bip_R_Index2","bone_map/RightIndexDistal":&"J_Bip_R_Index3","bone_map/RightMiddleProximal":&"J_Bip_R_Middle1","bone_map/RightMiddleIntermediate":&"J_Bip_R_Middle2","bone_map/RightMiddleDistal":&"J_Bip_R_Middle3","bone_map/RightRingProximal":&"J_Bip_R_Ring1","bone_map/RightRingIntermediate":&"J_Bip_R_Ring2","bone_map/RightRingDistal":&"J_Bip_R_Ring3","bone_map/RightLittleProximal":&"J_Bip_R_Little1","bone_map/RightLittleIntermediate":&"J_Bip_R_Little2","bone_map/RightLittleDistal":&"J_Bip_R_Little3","bone_map/LeftUpperLeg":&"J_Bip_L_UpperLeg","bone_map/LeftLowerLeg":&"J_Bip_L_LowerLeg","bone_map/LeftFoot":&"J_Bip_L_Foot","bone_map/LeftToes":&"J_Bip_L_ToeBase","bone_map/RightUpperLeg":&"J_Bip_R_UpperLeg","bone_map/RightLowerLeg":&"J_Bip_R_LowerLeg","bone_map/RightFoot":&"J_Bip_R_Foot","bone_map/RightToes":&"J_Bip_R_ToeBase","script":null)
 ,
 "retarget/bone_renamer/unique_node/make_unique": false,
 "retarget/bone_renamer/unique_node/skeleton_name": "Skeleton3D",
-"retarget/rest_fixer/fix_silhouette/enable": true,
 "retarget/rest_fixer/fix_silhouette/filter": [&"LeftFoot", &"RightFoot"]
 }
 }
 }
 fbx/importer=0
 fbx/allow_geometry_helper_nodes=false
 fbx/embedded_image_handling=1
-gltf/naming_version=1
-gltf/embedded_image_handling=1
diff --git a/demo.tscn b/demo.tscn
@@ -1,4 +1,4 @@
-[gd_scene load_steps=14 format=4 uid="uid://dkkew3u3hi7md"]
+[gd_scene load_steps=14 format=3 uid="uid://dkkew3u3hi7md"]
 
 [ext_resource type="Script" path="res://demo.gd" id="1_7k4ei"]
 [ext_resource type="PackedScene" uid="uid://bhc6nngwjdvum" path="res://assets/test_chan/Test-Chan.fbx" id="1_lkeve"]