From 8a590e8951050c5480e68708d43d98ff1ac65e82 Mon Sep 17 00:00:00 2001 From: Will Date: Thu, 29 Feb 2024 23:20:06 -0500 Subject: [PATCH 1/2] Drone pass 2 --- props/Aerial Turret Drone/Drone.fbx | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 props/Aerial Turret Drone/Drone.fbx diff --git a/props/Aerial Turret Drone/Drone.fbx b/props/Aerial Turret Drone/Drone.fbx new file mode 100644 index 0000000..3cf5d14 --- /dev/null +++ b/props/Aerial Turret Drone/Drone.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4a2f7a3fefdafe3efd1209b60b59239bcb63e5c5959e5f62136455e5961e26ba +size 191856 From 5b30ee05b404bc9eec2907de8a7225d1d794333d Mon Sep 17 00:00:00 2001 From: alan Date: Fri, 1 Mar 2024 01:07:12 -0500 Subject: [PATCH 2/2] WIP Infantry import for engine --- .../Shelby/anims-shelby_infantry_001.blend | 4 ++-- animations/infantry/anims-alan.blend | 4 ++-- characters/infantry/EXPORT_MESHES.blend | 3 +++ characters/infantry/p10-rigging.blend | 4 ++-- characters/infantry/post_rig.py | 21 +++++++++++++++++++ pipeline/export_anims.py | 2 +- 6 files changed, 31 insertions(+), 7 deletions(-) create mode 100644 characters/infantry/EXPORT_MESHES.blend diff --git a/animations/infantry/Shelby/anims-shelby_infantry_001.blend b/animations/infantry/Shelby/anims-shelby_infantry_001.blend index 7223472..fb5fbe7 100644 --- a/animations/infantry/Shelby/anims-shelby_infantry_001.blend +++ b/animations/infantry/Shelby/anims-shelby_infantry_001.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfb3fe652821ddc5d2c0a2455b76107df51a7cbc74418bb35742baf106bcad61 -size 3923324 +oid sha256:2c706269e938f90d02314a9d49a9b693e87f8ec40d01301d564a95fd45c52aa8 +size 4035068 diff --git a/animations/infantry/anims-alan.blend b/animations/infantry/anims-alan.blend index bcdc0d9..7d41968 100644 --- a/animations/infantry/anims-alan.blend +++ b/animations/infantry/anims-alan.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:87e7a1cbbcf40a9282c91609e67f8d068e1de1e3cc3784fce178c7c1967dd706 -size 3168064 +oid sha256:7edefb8cfbbe4ac52c25e853a27168fcd0805b34c9934483ac7951c0dcf69451 +size 3137884 diff --git a/characters/infantry/EXPORT_MESHES.blend b/characters/infantry/EXPORT_MESHES.blend new file mode 100644 index 0000000..532ff7f --- /dev/null +++ b/characters/infantry/EXPORT_MESHES.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:29dc35976e0f854802a442076a9010f7fc518cdf49fd92b0181b56857113f70c +size 2649802 diff --git a/characters/infantry/p10-rigging.blend b/characters/infantry/p10-rigging.blend index ea079ab..75b1b4a 100644 --- a/characters/infantry/p10-rigging.blend +++ b/characters/infantry/p10-rigging.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b6ba39f749ad1c7ea973f2e37b1b19da62c7c1604c4ce1e81bb606f7c491330d -size 5655806 +oid sha256:677f04642fb640465e566d1b11a32d40530423bbda032167cd6ddd3671570151 +size 5673642 diff --git a/characters/infantry/post_rig.py b/characters/infantry/post_rig.py index b87e4cf..8847f4f 100644 --- a/characters/infantry/post_rig.py +++ b/characters/infantry/post_rig.py @@ -223,3 +223,24 @@ drv_constraint_1D(ghl_constraint, 'slider1d_gun_handLIK', 0.06) ### Set up smear effect drivers for axe #drv_blend_1D('Key', 'smear_down', 'slider1d_axe_smear', 0.03) #drv_blend_1D('Key', 'smear_up', 'slider1d_axe_smear', -0.03) + + +# Enforce deformation bones for FBX export +def mfx(boneName: str): # Mark for export + rig.data.bones[boneName].use_deform = True + +EXPORT_LIST = [ +'DEF-spine.005', # Helmet +'camera_head', +'camera_base', +'grip_baton', # Baton +'jetpack_grip', # Jetpack +'grip_gun', # Gun +'gun_ammunition', +'gun_trigger', +'gun_muzzle', +] + +if True: + for b in EXPORT_LIST: + mfx(b) diff --git a/pipeline/export_anims.py b/pipeline/export_anims.py index d95260c..8b5fd84 100644 --- a/pipeline/export_anims.py +++ b/pipeline/export_anims.py @@ -1,7 +1,7 @@ import bpy # Get export directory -path: str = bpy.data.filepath +path: str = bpy.data.filepath.replace('\\Shelby', '').replace('\\Tommy', '') pathPrefix = max(path.rfind('animations/'), path.rfind('animations\\')) pathStart = pathPrefix + len('animations/') pathEnd = max(path.rfind('/'), path.rfind('\\'))