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_srs.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srs.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srs.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srs.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srs.vvd
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srs.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srs.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srs.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srs.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srs.vvd
Binary file not shown.
30 changes: 19 additions & 11 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,
ZR68-L, Kyla, MilSO and AA13.
ZR68-L, Kyla, MilSO, AA13 and SRS.
Expect the folder layout, scripts and steps here to change as more weapons are added.

## Change an animation (quick recipe)
Expand All @@ -25,20 +25,21 @@ 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`, `jinrai_zr68l`, `jinrai_klya9` (the Kyla), `jinrai_milso` and
`jinrai_aa13`. 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`, `jinrai_klya9` (the Kyla), `jinrai_milso`,
`jinrai_aa13` and `jinrai_srs`. 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, ZR68-L, Kyla and AA13): 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).
- `jinrai_GUN/glued.qci` (guns with glued clips, now the ZR68C, ZR68-L, Kyla, AA13 and SRS): 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 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 AA13 follows the ZR68C layout with `aa13/viewmodel.qci`. The MilSO keeps a whole `.qc` per team, as its team
models differ in more than their bones.
The AA13 follows the ZR68C layout with `aa13/viewmodel.qci`. The SRS shares `srs/viewmodel.qci` and keeps
`$definebone` per team, as its team rigs differ; a part of its preview mesh uses the M41's image, in
`mosok41/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 @@ -74,9 +75,10 @@ teams' arm meshes are skinned to that rig, so a key moves both. Each team's mesh
- The shipped slots (`reload`, `draw`, ...) stay the original clips. The export fails when a shipped slot's SMD would
change, unless it runs with `--edit-shipped`; then the changed clip goes to both teams (see Exporting animations).
- `reference.smd` was not changed by the merge: each team's compiled model keeps its own rest pose.
- The MilSO team rigs differ by 0.006 units in the arms. The NSF mesh keeps this only in its compiled model; in the
scene, `merge_teams.py` re-bound the NSF arm vertices for the preview only, so the NSF arms show as the NSF model
plays them.
- The team rigs were the same except for small differences of the original models (SRS `Release` 22 degrees,
MilSO arms 0.006 units). The NSF mesh keeps these only in its compiled model; in the scene, `merge_teams.py`
re-bound the NSF `Release` and MilSO arm vertices for the preview only, so the NSF arms show as the NSF model plays
them (within 0.013 units).

The Tachi and the MilSO have no glued clips; their phases files only track the chamber (see Chamber tracking for
pistols). The Kyla has one glued clip (see Reload resume for the Kyla).
Expand Down Expand Up @@ -314,6 +316,12 @@ The AA13 has the same four clips. It joins `reload` after f58 (the drum fully ou
the drum seat. Slots: `drawunloaded` f0-44, `drawtocycle` f0-37, `skipcycle` f0-18. Its unload step has two sound
pieces (`reload_unload`, `reload_unload_part2`: the release tick and the drum pull).

The SRS (bolt action) has the same four clips. It joins `reload` after f30 (its magazine moves into the hand there)
and f79, and leaves it at f56, the magazine seat. Slots: `drawunloaded` f0-38, `drawtocycle` f0-31, `skipcycle`
f0-16 (ends on `idle` f0: the SRS idle sequence has no `01`). Its `charge` sequence (the bolt after each shot) is
unchanged; the marker `charge:3_cycle` (f25, the bolt home) gives the `charge` row of the phases file, the time
the next round counts as chambered after a shot.

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
Loading