Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added neo/models/weapons/v_jinrai_zr68l.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_zr68l.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_zr68l.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_zr68l.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_zr68l.vvd
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68l.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68l.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68l.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68l.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_zr68l.vvd
Binary file not shown.
23 changes: 13 additions & 10 deletions neo/modelsrc/weapons/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Weapon model sources

The Tachi and ZR68C viewmodels are the first weapons maintained under these conventions, followed by the ZR68-S
and MilSO.
The Tachi and ZR68C viewmodels are the first weapons maintained under these conventions, followed by the ZR68-S,
ZR68-L and MilSO.
Expect the folder layout, scripts and steps here to change as more weapons are added.

## Change an animation (quick recipe)
Expand All @@ -25,18 +25,19 @@ For example, a new pose in a slot of the Tachi. Run the commands from this folde
Layout:

- `viewmodels.blend`: the Blender file for every viewmodel. It holds one **scene** per gun, called a project:
`jinrai_tachi`, `jinrai_zr68c`, `jinrai_zr68s` and `jinrai_milso`. Each scene has one rig and one action, and both teams' arms
(see One scene per gun).
`jinrai_tachi`, `jinrai_zr68c`, `jinrai_zr68s`, `jinrai_zr68l` and `jinrai_milso`. Each scene has one rig and one action, and
both teams' arms (see One scene per gun).
- `PROJECT/` (such as `jinrai_tachi/`): the project's `.qc`, `reference.smd`, `anims/*.smd` (written by the
export) and `composites.txt` (if used). The scripts take project names.
- `nsf_GUN/` (such as `nsf_zr68c/`): the NSF model's `.qc`, `reference.smd` and its shipped clips in `anims/`. It has
no scene and is never exported: it compiles from these SMDs and from the Jinrai glued clips.
- `jinrai_GUN/glued.qci` (guns with glued clips, now the ZR68C): the `$sequence` lines of the glued
- `jinrai_GUN/glued.qci` (guns with glued clips, now the ZR68C and ZR68-L): the `$sequence` lines of the glued
clips, read from `jinrai_GUN/anims/`. Both team `.qc` files include it, so the NSF model compiles the Jinrai glued
clips. The variants of a gun family include their base gun's file instead (see Gun families).
- `GUN/viewmodel.qci` (such as `tachi/viewmodel.qci`): the QC lines both team models of a gun share. Each team's `.qc`
sets only `$modelname` and includes this file. The ZR68-S follows the ZR68C layout
(`zr68s/viewmodel.qci`).
sets only `$modelname` and includes this file. The ZR68-S and ZR68-L follow the ZR68C layout
(`zr68s/viewmodel.qci`, `zr68l/viewmodel.qci`); the ZR68-L scope's preview images are the MX's, in `mx/textures/`.
The MilSO keeps a whole `.qc` per team, as its team models differ in more than their bones.
- `arms/textures/` (Jinrai and NSF arms, shared by every weapon) and `GUN/textures/`: preview images the `.blend` loads.
- `rom_limits.py`, `rom_spec.json` and `rom_widen.json`: the range-of-motion limits on the rigs (see
Range-of-motion limits).
Expand Down Expand Up @@ -96,6 +97,7 @@ A variant compiles the glued clips of its base gun, so the base gun authors the
- A bone the base's SMDs lack (a silencer, a scope) stays at the variant's own rest pose in the glued clips; the
shared bones, the `Muzzle` and `Eject` points included, follow the base. The variants' shipped clips have the
base's motion and attachment points on the shared bones.
- Not in a family: the ZR68-L (its own `reload` motion, markers and sounds). It authors its own slots.
- **Variant toggle:** the base scene shows each variant's gun on the base rig and action, to check a new slot on
every gun that plays it. The team collections hold the arms only; the guns are in collections `BASE_gun` and
`VARIANT_gun` (`zr68c_gun`, `zr68s_gun`), one visible at a time. Pick the gun in the **Variant** dropdown of the
Expand Down Expand Up @@ -276,9 +278,10 @@ A reload with a round chambered keeps that round and leaves out the bolt pull. T

The `"resume"` key on a row of the phases file names the clip to draw after that step.

The ZR68-S compiles the ZR68C's glued clips (Gun families). Its step markers sit at `1_unload` f20, `2_load` f42
(the ZR68C's at f21, f40 on the same motion; no join moves). It plays the ZR68C's sound pieces
(`weapon_zr68.reload_*`).
The ZR68-S compiles the ZR68C's glued clips (Gun families). The ZR68-L reuses the ZR68C's transitions, moved
onto its own poses at each end, with the same frame counts. The step markers of both sit at `1_unload` f20,
`2_load` f42. The ZR68-S plays the ZR68C's sound pieces (`weapon_zr68.reload_*`); the ZR68-L has its own
(`weapon_zr68l.reload_*`).

The animator makes the motion look right and places markers; the export does the frame and time arithmetic.
The `README_ANIMATOR` text block in `viewmodels.blend` repeats these rules.
Expand Down
1,300 changes: 1,300 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/changemode.smd

Large diffs are not rendered by default.

1,408 changes: 1,408 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/draw.smd

Large diffs are not rendered by default.

1,786 changes: 1,786 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/drawtocycle.smd

Large diffs are not rendered by default.

2,920 changes: 2,920 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/drawtocycle_reload.smd

Large diffs are not rendered by default.

1,840 changes: 1,840 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/drawunloaded.smd

Large diffs are not rendered by default.

4,594 changes: 4,594 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/drawunloaded_reload.smd

Large diffs are not rendered by default.

3,730 changes: 3,730 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/drawunloaded_reload_skipcycle.smd

Large diffs are not rendered by default.

760 changes: 760 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/fire.smd

Large diffs are not rendered by default.

760 changes: 760 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/fire1.smd

Large diffs are not rendered by default.

760 changes: 760 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/fire2.smd

Large diffs are not rendered by default.

760 changes: 760 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/fire3.smd

Large diffs are not rendered by default.

544 changes: 544 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/fireempty.smd

Large diffs are not rendered by default.

598 changes: 598 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/holster.smd

Large diffs are not rendered by default.

1,732 changes: 1,732 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/idle01.smd

Large diffs are not rendered by default.

1,732 changes: 1,732 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/idle01empty.smd

Large diffs are not rendered by default.

652 changes: 652 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/idletolow.smd

Large diffs are not rendered by default.

1,462 changes: 1,462 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/lowidle.smd

Large diffs are not rendered by default.

598 changes: 598 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/lowtoidle.smd

Large diffs are not rendered by default.

1,732 changes: 1,732 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/melee01.smd

Large diffs are not rendered by default.

4,486 changes: 4,486 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/reload.smd

Large diffs are not rendered by default.

3,622 changes: 3,622 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/reload_skipcycle.smd

Large diffs are not rendered by default.

598 changes: 598 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/anims/skipcycle.smd

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/composites.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
drawunloaded_reload drawunloaded reload@1_unload-
drawunloaded_reload_skipcycle drawunloaded reload@1_unload-2_load.exit skipcycle:1-
drawtocycle_reload drawtocycle reload@2_load-
reload_skipcycle reload:0-2_load.exit skipcycle:1-
4 changes: 4 additions & 0 deletions neo/modelsrc/weapons/jinrai_zr68l/glued.qci
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
$sequence "drawunloaded_reload" "../jinrai_zr68l/anims/drawunloaded_reload.smd" fps 30 fadein 0.20 fadeout 0.20 node "0"
$sequence "drawunloaded_reload_skipcycle" "../jinrai_zr68l/anims/drawunloaded_reload_skipcycle.smd" fps 30 fadein 0.20 fadeout 0.20 node "0"
$sequence "drawtocycle_reload" "../jinrai_zr68l/anims/drawtocycle_reload.smd" fps 30 fadein 0.20 fadeout 0.20 node "0"
$sequence "reload_skipcycle" "../jinrai_zr68l/anims/reload_skipcycle.smd" fps 30 fadein 0.20 fadeout 0.20 node "0"
Loading