diff --git a/README.md b/README.md index 017a564..e5f5854 100644 --- a/README.md +++ b/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) diff --git a/Turret/Turret_Base.fbx b/Turret/Turret_Base.fbx new file mode 100644 index 0000000..9dd7683 --- /dev/null +++ b/Turret/Turret_Base.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:473cb9612813fd109caa9416014a5c7875faa0bc3ee4e2d13f04d39fce20edba +size 244720 diff --git a/Turret/Turret_Head.fbx b/Turret/Turret_Head.fbx new file mode 100644 index 0000000..ac04ef7 --- /dev/null +++ b/Turret/Turret_Head.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c0751ad8ec956ae176abe72310d6992e1a5d25c4da596435895448d4decf0a6c +size 156112 diff --git a/animations/insurrectionist/anims-alan.blend b/animations/insurrectionist/anims-alan.blend index 1e25217..ab86b93 100644 --- a/animations/insurrectionist/anims-alan.blend +++ b/animations/insurrectionist/anims-alan.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:670aaca11d3313d796976f980e1a7445419b1b08052d297437fb0087521cf3b4 -size 3098352 +oid sha256:af0f0fdf4e9dfb3bdf54ba428fb83818c2f0196e429c29aa8480b514a730a8b8 +size 3330800 diff --git a/animations/insurrectionist/anims-shelby.blend b/animations/insurrectionist/anims-shelby.blend index 1e25217..d2657b1 100644 --- a/animations/insurrectionist/anims-shelby.blend +++ b/animations/insurrectionist/anims-shelby.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:670aaca11d3313d796976f980e1a7445419b1b08052d297437fb0087521cf3b4 -size 3098352 +oid sha256:2e290382716b07e3fb624bc494a0be41fdf1978507091a37c97bd5fc7c246737 +size 3260308 diff --git a/animations/insurrectionist/anims-tommy.blend b/animations/insurrectionist/anims-tommy.blend index 1e25217..37fb6a7 100644 --- a/animations/insurrectionist/anims-tommy.blend +++ b/animations/insurrectionist/anims-tommy.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:670aaca11d3313d796976f980e1a7445419b1b08052d297437fb0087521cf3b4 -size 3098352 +oid sha256:cad2c70a644836c0960141ef9173bc3aba476e4fcaf41d979f25a4bd00a9a854 +size 3260324 diff --git a/animations/promotional/orange_justice.blend b/animations/promotional/orange_justice.blend new file mode 100644 index 0000000..ec2f6c6 --- /dev/null +++ b/animations/promotional/orange_justice.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:43877555a171210e0cabbc166677e0a85f2fe6914f675246d4c7482fdc3f6cff +size 12747856 diff --git a/characters/infantry/p1-blockout.blend b/characters/infantry/p1-blockout.blend new file mode 100644 index 0000000..f50d4f5 --- /dev/null +++ b/characters/infantry/p1-blockout.blend @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e8f5f4a0ec00f07f87d5ecceaaab99438930b758728240bff600ab4f9a34715a +size 888340 diff --git a/characters/insurrectionist/p4-rigging.blend b/characters/insurrectionist/p4-rigging.blend index 734e755..2c57809 100644 --- a/characters/insurrectionist/p4-rigging.blend +++ b/characters/insurrectionist/p4-rigging.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:65db611798f0bce2c3e9f544719e7b9a1721378ea19563e639c9eb0f4a461da3 -size 26541822 +oid sha256:01c658305fc2e4eef3328fd31151506f7cad28c0ad14b07d44adf0a36e4d719c +size 6617443 diff --git a/characters/insurrectionist/p5-baking.blend b/characters/insurrectionist/p5-baking.blend index 7e15bf4..b630093 100644 --- a/characters/insurrectionist/p5-baking.blend +++ b/characters/insurrectionist/p5-baking.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:03da82de0c98452cfd1c4a4e5f12da6f2ad26a2e10713c91cb38a9e842a6b498 -size 51106276 +oid sha256:76ff84909469466d9537f3e4117d213823934080ccd0a4f6fed4567a9fb06536 +size 51120964 diff --git a/characters/insurrectionist/post_rig.py b/characters/insurrectionist/post_rig.py index ef7dfa0..6b54fdb 100644 --- a/characters/insurrectionist/post_rig.py +++ b/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) diff --git a/characters/insurrectionist/textures/mat_body_arm.png b/characters/insurrectionist/textures/mat_body_arm.png new file mode 100644 index 0000000..088f17d --- /dev/null +++ b/characters/insurrectionist/textures/mat_body_arm.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:48fba38454212e68380ce2e94b2913a3232030044b2ccb0e1686a4a40ccf23ba +size 15358604 diff --git a/characters/insurrectionist/textures/mat_body_basecolor.png b/characters/insurrectionist/textures/mat_body_basecolor.png new file mode 100644 index 0000000..99dd759 --- /dev/null +++ b/characters/insurrectionist/textures/mat_body_basecolor.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16a742b5e16572b67f66ba6527173d4fcc743ad667858af7b4f52530070301f1 +size 18759903 diff --git a/characters/insurrectionist/textures/mat_body_normal.png b/characters/insurrectionist/textures/mat_body_normal.png new file mode 100644 index 0000000..9ee8bfd --- /dev/null +++ b/characters/insurrectionist/textures/mat_body_normal.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1cde9afb2cf574b34e425fc7270140b31d25054fb501db528d0df372dda4ee93 +size 59593390 diff --git a/docs/animation.md b/docs/animation.md new file mode 100644 index 0000000..913f374 --- /dev/null +++ b/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) diff --git a/docs/images/anim_editing1.png b/docs/images/anim_editing1.png new file mode 100644 index 0000000..a74cae2 --- /dev/null +++ b/docs/images/anim_editing1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c407e6741446adf2d3bf55a97d1303707cc0d4f67cba0079798d3d1b3cd4da33 +size 13726 diff --git a/docs/images/anim_editing2.png b/docs/images/anim_editing2.png new file mode 100644 index 0000000..e135315 --- /dev/null +++ b/docs/images/anim_editing2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d3767d946e17bb59f755b90b3ed19e1b756d522b1208b7b7c7327fb01fee7e86 +size 11651 diff --git a/docs/images/anim_finalize1.png b/docs/images/anim_finalize1.png new file mode 100644 index 0000000..02dd6bb --- /dev/null +++ b/docs/images/anim_finalize1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:88ba14f313160a093b5154f1ae7673e14902ac9270cf249ca5455890b31975c3 +size 44365 diff --git a/docs/images/anim_finalize2.png b/docs/images/anim_finalize2.png new file mode 100644 index 0000000..5d8e4e0 --- /dev/null +++ b/docs/images/anim_finalize2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:67a509b8771c4e364260469710f4099a656eb6c078fde08fc85e5b001da77bb1 +size 16176 diff --git a/docs/images/anim_finalize3.png b/docs/images/anim_finalize3.png new file mode 100644 index 0000000..451dd53 --- /dev/null +++ b/docs/images/anim_finalize3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:981b814e975b51e9d34b92fe64cd710ad14e58c803dbb1c645976439633d303a +size 171068 diff --git a/docs/images/anim_setup1.png b/docs/images/anim_setup1.png new file mode 100644 index 0000000..5acfb50 --- /dev/null +++ b/docs/images/anim_setup1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:26587a0cd0aa78726067ea380c838c29e9784d7efa36fdc551b062c3f8ca6e74 +size 60649 diff --git a/docs/images/anim_setup2.png b/docs/images/anim_setup2.png new file mode 100644 index 0000000..5cf0a54 --- /dev/null +++ b/docs/images/anim_setup2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f2bffaf332fc27693be31c2dcb0e3cfc63b4962c09346d3fc76fa4e76e6f8cc5 +size 55460 diff --git a/docs/images/anim_setup3.png b/docs/images/anim_setup3.png new file mode 100644 index 0000000..3bfcc1a --- /dev/null +++ b/docs/images/anim_setup3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fb4a962c46e8ceb0b7188fbccec28dc19cf4a06dd0810ec103318c6485f29321 +size 240645 diff --git a/props/posters/Grey Poster.png b/props/posters/Grey Poster.png new file mode 100644 index 0000000..df9bd97 --- /dev/null +++ b/props/posters/Grey Poster.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fbf375fcea207dcccefedd89504f57dff85e0c17d29941f5c299abd3ea3208e9 +size 1262172 diff --git a/props/posters/Politicians Poster.png b/props/posters/Politicians Poster.png new file mode 100644 index 0000000..f1886a7 --- /dev/null +++ b/props/posters/Politicians Poster.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d08798275de7ec2fe2c3648f37c379edb15fb9763b219b3e6240b22001a9e101 +size 2579271 diff --git a/props/posters/Wanted Poster.png b/props/posters/Wanted Poster.png new file mode 100644 index 0000000..381dad3 --- /dev/null +++ b/props/posters/Wanted Poster.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4ef6b0566959d4e19f6a71f26c3a9589e7e93027aeda5c7c5645704fd078986b +size 6274668 diff --git a/references/infantry.pur b/references/infantry.pur new file mode 100644 index 0000000..e9b47cf --- /dev/null +++ b/references/infantry.pur @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:210289c152b4421659efc16d4de2dd2c686f6acaa07a23bdb5eb8654b137dbdd +size 3404 diff --git a/references/infantry/NPqthe.jpg b/references/infantry/NPqthe.jpg new file mode 100644 index 0000000..3ad7c0e --- /dev/null +++ b/references/infantry/NPqthe.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a433fd6aa4bebb81f298c327e897f7418bf6fa3dc90678e9603a03dee6fa562d +size 1743489 diff --git a/references/infantry/arm-cover-soldiers-2.jpg b/references/infantry/arm-cover-soldiers-2.jpg new file mode 100644 index 0000000..837a7b0 --- /dev/null +++ b/references/infantry/arm-cover-soldiers-2.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ad5033e0fc0549ff4aa3c95ebd2e5dbad064d6815e69aa30e8fc36d12e4236b +size 1343006 diff --git a/references/infantry/rtr3in69.jpg b/references/infantry/rtr3in69.jpg new file mode 100644 index 0000000..7ef7bfc --- /dev/null +++ b/references/infantry/rtr3in69.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:00c5aeec94824f47535ff296320d658adb45ade12b851a216b856d31fd24db13 +size 518830 diff --git a/references/infantry/secret-service-clancy.webp b/references/infantry/secret-service-clancy.webp new file mode 100644 index 0000000..4dd4130 Binary files /dev/null and b/references/infantry/secret-service-clancy.webp differ diff --git a/references/infantry/us-military.jpg b/references/infantry/us-military.jpg new file mode 100644 index 0000000..b2aa30a --- /dev/null +++ b/references/infantry/us-military.jpg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:01d057cc04366d8315bd373600f0ab00137969deb49e05744a45271b461c057d +size 2230244 diff --git a/references/infantry/zzodvz3fuk251.webp b/references/infantry/zzodvz3fuk251.webp new file mode 100644 index 0000000..a8ff303 Binary files /dev/null and b/references/infantry/zzodvz3fuk251.webp differ