Merge branch 'master' of https://git.alanocull.com/triple-aaa-games/assets

README.md

@@ -18,3 +18,9 @@ Texture maps should be followed with specific names. Examples are provided
 - `mat_example_normal` - Normal Map, export as 16-bit if possible
 - `mat_example_opacity` - Opacity map, only use if necessary
 - `mat_example_mask` - Mask, only use if necessary
+
+## Animations
+Guides for animation:
+- [Setting Up a New Animation](docs/animation.md/#setting-up-a-new-animation)
+- [Finalizing an Animation](docs/animation.md/#finalizing-an-animation)
+- [Editing Existing Animations](docs/animation.md/#editing-existing-animations)

characters/insurrectionist/post_rig.py

@@ -21,10 +21,10 @@ fixList = [
     'DEF-middle01.L',
     'DEF-ring01.L',
     'DEF-pinky01.L',
-    'DEF-palm.01.L',
-    'DEF-palm.02.L',
-    'DEF-palm.03.L',
-    'DEF-palm.04.L',
+    
+    # Arms
+    'shoulder.L',
+    'breast.L',
     
     # Legs
     'DEF-thigh.L',
@@ -38,11 +38,22 @@ for item in fixList:
 # Pelvis parents work a little differently
 reparent('DEF-pelvis.L', 'DEF-spine')
 reparent('DEF-pelvis.R', 'DEF-spine')
+# Deform parents on palms are actually parented to originals, so skip that layer
+reparent('DEF-palm.01.L', 'DEF-hand.L')
+reparent('DEF-palm.02.L', 'DEF-hand.L')
+reparent('DEF-palm.03.L', 'DEF-hand.L')
+reparent('DEF-palm.04.L', 'DEF-hand.L')
+reparent('DEF-palm.01.R', 'DEF-hand.R')
+reparent('DEF-palm.02.R', 'DEF-hand.R')
+reparent('DEF-palm.03.R', 'DEF-hand.R')
+reparent('DEF-palm.04.R', 'DEF-hand.R')
+
+# Force axe to be exported by setting it as a deform bone
+rig.data.edit_bones['axe'].use_deform = True
 
 # Switch into POSE mode to set up animation constraints
 bpy.ops.object.mode_set(mode='POSE')
 
-
 ## Declare Functions for animation constraints
 def arrcopy(copyTo, copyFrom):
     for i in range(min(len(copyTo), len(copyFrom))):
@@ -150,3 +161,7 @@ if axe_base is not None:
 ## 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)
+
+## 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)

docs/animation.md

@@ -0,0 +1,42 @@
+# So you wanna animate in Blender?
+
+Various guides for animation.
+
+## Setting Up A New Animation
+Upon animating the file, you need to add a new action to the rig. Click on the "New" button on the action editor.
+
+![](images/anim_setup1.png)
+
+Now, name your animation, and configure it to the expected framge range you'll need. The file's animations are currently set to 60 FPS, so 60 frames = 1 second of animation. Also, mark it as cyclic (if it is intended to loop). You can adjust this frame range later if necessary--it's just used for exporting.
+
+![](images/anim_setup2.png)
+
+Finally, hide the Rigify layers you don't want so you can focus more clearly on what you need for blocking out poses. This is the default setup I suggest.
+
+![](images/anim_setup3.png)
+
+Now you're ready to start animating!
+
+## Finalizing an Animation
+When you're done with your animation (or want to look at others), go ahead and push it to the NLA stack. You'll have to be on the "AnimationFull" workspace to do this step (see the tabs at the top of the window).
+
+![](images/anim_finalize1.png)
+
+If you're done working on it, mute the track so it doesn't play while working on other animations.
+
+![](images/anim_finalize2.png)
+
+Finally, to reset your rig for further animation, re-enable all the Rigify layers, select all bones in the 3D viewport with the 'A' key (or `Select > All` at the top of the viewport), and then `Pose > Clear Transform > All` to reset bone transforms.
+
+![](images/anim_finalize3.png)
+
+Your rig should be A-posed and ready for more animation!
+
+## Editing Existing Animations
+If you want to go back and tweak an already-pushed animation, simply double-click the track, and start it so you can see the preview.
+
+![](images/anim_editing1.png)
+
+When you're done, deselect the track and unstar it.
+
+![](images/anim_editing2.png)