diff --git a/.gitattributes b/.gitattributes index ac8e490..65ce03a 100644 --- a/.gitattributes +++ b/.gitattributes @@ -6,3 +6,6 @@ *.kra filter=lfs diff=lfs merge=lfs -text *.clip filter=lfs diff=lfs merge=lfs -text *.wav filter=lfs diff=lfs merge=lfs -text +*.hdr filter=lfs diff=lfs merge=lfs -text +*.fbx filter=lfs diff=lfs merge=lfs -text +*.blend filter=lfs diff=lfs merge=lfs -text diff --git a/animations/insurrectionist/p1-anims.blend b/animations/insurrectionist/p1-anims.blend index 61f025b..1e25217 100644 Binary files a/animations/insurrectionist/p1-anims.blend and b/animations/insurrectionist/p1-anims.blend differ diff --git a/characters/insurrectionist/models/body_asset/mesh_body_hp.fbx b/characters/insurrectionist/models/body_asset/mesh_body_hp.fbx new file mode 100644 index 0000000..6c8ab69 --- /dev/null +++ b/characters/insurrectionist/models/body_asset/mesh_body_hp.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:211f27bdce583e8539ef73d30f9ba68f9d83d89b3f5ed03b27f189d98037f44d +size 31030796 diff --git a/characters/insurrectionist/models/body_asset/mesh_body_lp.fbx b/characters/insurrectionist/models/body_asset/mesh_body_lp.fbx new file mode 100644 index 0000000..202cd50 --- /dev/null +++ b/characters/insurrectionist/models/body_asset/mesh_body_lp.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7f387089591414b5abd7c935bab06680f3d9c62fa30ae7b7f6e3cd850b5399a2 +size 606764 diff --git a/characters/insurrectionist/p1-blockout.blend b/characters/insurrectionist/p1-blockout.blend index 08f0b70..c81a967 100644 Binary files a/characters/insurrectionist/p1-blockout.blend and b/characters/insurrectionist/p1-blockout.blend differ diff --git a/characters/insurrectionist/p2-blockout.blend b/characters/insurrectionist/p2-blockout.blend index 257c614..23dce42 100644 Binary files a/characters/insurrectionist/p2-blockout.blend and b/characters/insurrectionist/p2-blockout.blend differ diff --git a/characters/insurrectionist/p3-blockout.blend b/characters/insurrectionist/p3-blockout.blend index 23b61b0..939ffc2 100644 Binary files a/characters/insurrectionist/p3-blockout.blend and b/characters/insurrectionist/p3-blockout.blend differ diff --git a/characters/insurrectionist/p4-rigging.blend b/characters/insurrectionist/p4-rigging.blend index f167a5b..734e755 100644 Binary files a/characters/insurrectionist/p4-rigging.blend and b/characters/insurrectionist/p4-rigging.blend differ diff --git a/characters/insurrectionist/p5-baking.blend b/characters/insurrectionist/p5-baking.blend new file mode 100644 index 0000000..6b1872d --- /dev/null +++ b/characters/insurrectionist/p5-baking.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f7d9911904a4ba01cf1327a69e1bd50f2b4b3ba24253b4be01d8713ef170c7b5 +size 51138136 diff --git a/characters/insurrectionist/post_rig.py b/characters/insurrectionist/post_rig.py index ddecd8a..ef7dfa0 100644 --- a/characters/insurrectionist/post_rig.py +++ b/characters/insurrectionist/post_rig.py @@ -1,7 +1,7 @@ import bpy from bpy.types import Constraint, PoseBone -rig = bpy.data.objects["insurrectionist"] +rig = bpy.data.objects["skeleton_insurrectionist"] ## FIX PARENTS def reparent(b: str, newParent: str = 'DEF-spine'): @@ -116,10 +116,12 @@ for b in rig.pose.bones: arrcopy(b.lock_rotation, [True, True, True]) arrcopy(b.lock_scale, [True, True, True]) b.lock_rotation_w = True + elif b.name == "axe_gripadjust": + b.custom_shape_scale_xyz = (1.0, 0.8, 0.1) # Constrain menu sliders so they are limited to proper bounds constrain_slider(rig.pose.bones.get('slider1d_axe_gripadjust')) -constrain_slider(rig.pose.bones.get('slider1d_axe_thrust')) +constrain_slider(rig.pose.bones.get('slider1d_axe_lefthand_grip')) constrain_slider(rig.pose.bones.get('slider1d_axe_smear'), -0.03, 0.03) # Arm and Hand switch for Axe Base @@ -134,5 +136,17 @@ if axe_base is not None: axe_constraint.owner_space = 'POSE' axe_constraint.influence = 0.0 -## Set up driver constraint for the switch +# Left-Hand grip switch for Axe +left_hand = rig.pose.bones.get("hand_ik.L") +lh_constraint: Constraint = None +if axe_base is not None: + lh_constraint = left_hand.constraints.new('COPY_TRANSFORMS') + lh_constraint.target = rig + lh_constraint.subtarget = 'axe_grip_lefthand' # note subtarget uses name not object + lh_constraint.target_space = 'POSE' + lh_constraint.owner_space = 'POSE' + lh_constraint.influence = 0.0 + +## Set up driver constraint for the switches drv_constraint_1D(axe_constraint, 'slider1d_axe_gripadjust', 0.06) +drv_constraint_1D(lh_constraint, 'slider1d_axe_lefthand_grip', 0.06) diff --git a/hdris/empty_warehouse_01_2k.hdr b/hdris/empty_warehouse_01_2k.hdr new file mode 100644 index 0000000..7c6eb70 --- /dev/null +++ b/hdris/empty_warehouse_01_2k.hdr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9734d30c83fe480a2a7c7521b7bdb816d869c2468d45d3794bde729d6181f830 +size 6581920 diff --git a/hdris/kloofendal_misty_morning_puresky_2k.hdr b/hdris/kloofendal_misty_morning_puresky_2k.hdr new file mode 100644 index 0000000..a57dd70 --- /dev/null +++ b/hdris/kloofendal_misty_morning_puresky_2k.hdr @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a59683cd08861fb18d69ee8f3938f50ec81c6feda5381e8b8576f340d5a25bb1 +size 2958072