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_srm.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm.vvd
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm_s.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm_s.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm_s.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm_s.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_jinrai_srm_s.vvd
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm.vvd
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm_s.dx80.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm_s.dx90.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm_s.mdl
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm_s.sw.vtx
Binary file not shown.
Binary file added neo/models/weapons/v_nsf_srm_s.vvd
Binary file not shown.
16 changes: 11 additions & 5 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, AA13, SRS, PZ252 and the MPN45 family (MPN45, MPN45-S).
ZR68-L, Kyla, MilSO, AA13, SRS, PZ252, the MPN45 family (MPN45, MPN45-S) and the SRM family (SRM, SRM-S).
Expect the folder layout, scripts and steps here to change as more weapons are added.

## Change an animation (quick recipe)
Expand All @@ -27,13 +27,13 @@ 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`,
`jinrai_aa13`, `jinrai_srs`, `jinrai_pz` (the PZ252), `jinrai_mpn` (the MPN45, unsilenced) and `jinrai_mpn_s`
(the MPN45-S, the game's default MPN45). Each scene has one rig and one action, and both teams' arms (see One scene
per gun).
(the MPN45-S, the game's default MPN45), `jinrai_srm` and `jinrai_srm_s`. 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, AA13, SRS, PZ252 and MPN45): the
- `jinrai_GUN/glued.qci` (guns with glued clips, now the ZR68C, ZR68-L, Kyla, AA13, SRS, PZ252, MPN45 and SRM): 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).
Expand All @@ -43,7 +43,8 @@ Layout:
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 PZ252 shares `pz/viewmodel.qci` and keeps `$definebone` per team, as the SRS. The
MPN45 and MPN45-S share `mpn/viewmodel.qci` across their four models and keep `$definebone` per model.
MPN45 and MPN45-S share `mpn/viewmodel.qci` across their four models and keep `$definebone` per model. The SRM
and SRM-S follow the ZR68C layout (`srm/viewmodel.qci`, `srm_s/viewmodel.qci`).
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
Expand Down Expand Up @@ -96,6 +97,7 @@ A variant compiles the glued clips of its base gun, so the base gun authors the
| :-- | :-- |
| ZR68C (`jinrai_zr68c`) | ZR68-S |
| MPN45 (`jinrai_mpn`) | MPN45-S |
| SRM (`jinrai_srm`) | SRM-S |

- Both team `.qc` files of a variant end with `$include "../jinrai_BASE/glued.qci"`. The variant has no
`composites.txt`, no `glued.qci` and no authored or glued SMDs.
Expand Down Expand Up @@ -339,6 +341,10 @@ f72, and leaves it at f51 (the magazine seat; it has no tap). Slots: `drawunload
`skipcycle` f0-13. Its `3_cycle.sound` marker sits on the f72 join, which `drawtocycle_reload` replaces with the last
frame of `drawtocycle`, so that slot carries its own `drawtocycle:3_cycle.sound` marker at f45.

The SRM has the same four clips, and the SRM-S compiles them (Gun families). It joins `reload` after f33 and f75,
and leaves it at f58, the magazine seat (no tap). Slots: `drawunloaded` f0-34, `drawtocycle` f0-32, `skipcycle`
f0-11.

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,024 changes: 1,024 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/changemode.smd

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

718 changes: 718 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/fire.smd

Large diffs are not rendered by default.

718 changes: 718 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/fire1.smd

Large diffs are not rendered by default.

718 changes: 718 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/fire2.smd

Large diffs are not rendered by default.

718 changes: 718 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/fire3.smd

Large diffs are not rendered by default.

514 changes: 514 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/fireempty.smd

Large diffs are not rendered by default.

820 changes: 820 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/holster.smd

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

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

Large diffs are not rendered by default.

616 changes: 616 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/idletolow.smd

Large diffs are not rendered by default.

157 changes: 157 additions & 0 deletions neo/modelsrc/weapons/jinrai_srm/anims/lowidle.smd
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
version 1
nodes
0 "Dummy01" -1
1 "bone forearm01" 0
2 "bone hand01" 1
3 "bone middle 05" 2
4 "bone middle 06" 3
5 "bone middle 07" 4
6 "bone middle 08" 5
7 "bone index 05" 2
8 "bone index 06" 7
9 "bone index 07" 8
10 "bone index 08" 9
11 "bone ring 05" 2
12 "bone ring 06" 11
13 "bone ring 07" 12
14 "bone ring 08" 13
15 "bone pinky 05" 2
16 "bone pinky 06" 15
17 "bone pinky 07" 16
18 "bone pinky 08" 17
19 "bone thumb 04" 2
20 "bone thumb 05" 19
21 "bone thumb 06" 20
22 "bone forearm" 0
23 "bone hand" 22
24 "bone middle 1" 23
25 "bone middle 2" 24
26 "bone middle 3" 25
27 "bone middle 4" 26
28 "bone index 1" 23
29 "bone index 2" 28
30 "bone index 3" 29
31 "bone index 4" 30
32 "bone ring 1" 23
33 "bone ring 2" 32
34 "bone ring 3" 33
35 "bone ring 4" 34
36 "bone pinky 1" 23
37 "bone pinky 2" 36
38 "bone pinky 3" 37
39 "bone pinky 4" 38
40 "bone thumb 1" 23
41 "bone thumb 2" 40
42 "bone thumb 3" 41
43 "body" 23
44 "charge01" 43
45 "mag" 43
46 "trigger01" 43
47 "Muzzle" 43
48 "Eject" 43
49 "Object02" 43
end
skeleton
time 0
0 8.830845 -0.735720 -23.696539 -0.156472 0.008193 -3.095018
1 -4.697228 -1.846526 -15.703404 -2.251422 -0.888951 -1.130296
2 -0.035534 -23.756725 -0.084864 0.219207 0.336365 -0.311555
3 0.273372 -3.765807 -0.387136 -0.000000 0.000000 0.000000
4 0.000006 -3.784239 -0.191476 -0.698132 -0.178305 0.000000
5 0.024375 -3.235437 0.175097 -1.271159 -0.002704 0.002331
6 -0.111961 -3.553717 0.074809 -0.841241 0.087075 0.015758
7 1.858449 -3.773893 0.198659 -0.000000 -0.245131 0.075729
8 0.000000 -3.784240 -0.191476 -0.633092 0.090881 -0.024549
9 0.074582 -3.334558 0.036041 -1.358425 -0.002704 0.002331
10 -0.033768 -2.966129 0.050350 -0.664475 0.026121 0.048147
11 -1.407706 -3.765808 -0.387136 0.000000 -0.000000 -0.095034
12 0.000001 -3.784247 -0.191475 -0.791333 -0.125139 0.025178
13 0.038986 -2.749644 0.107386 -1.270513 -0.028980 -0.038419
14 0.013189 -3.474695 0.024519 -1.074014 0.019874 0.037834
15 -2.992728 -3.619922 0.091621 -0.000000 -0.000000 -0.168174
16 -0.231694 -2.899981 -0.226468 -0.991927 -0.125139 0.025178
17 0.047095 -3.464700 0.060478 -1.445661 0.006848 0.017134
18 -0.012930 -2.746921 0.096229 -0.428993 -0.072458 0.061817
19 2.231821 -1.416989 1.590844 -1.048084 -0.774568 1.232354
20 0.316672 -3.892340 -0.185574 -0.190424 -0.578900 -0.202701
21 0.269054 -3.933443 0.328680 -0.522319 0.089592 -0.216743
22 24.577011 -12.501706 1.716361 -1.570428 1.590246 -0.769009
23 0.035543 23.756729 -0.084858 0.853563 0.023420 -0.045527
24 -0.273356 3.765805 0.387137 -0.000000 -0.000000 -0.000000
25 -0.000002 3.784240 0.191476 -0.446109 -0.143092 0.061073
26 -0.024375 3.235439 -0.175104 -1.253706 -0.002704 0.002331
27 0.111964 3.553718 -0.074806 -1.364840 0.087075 0.015758
28 -1.858451 3.773897 -0.198662 0.000000 -0.245131 0.075729
29 0.000000 3.784235 0.191475 -0.122252 0.093311 -0.004824
30 -0.074583 3.334561 -0.036041 -0.223961 -0.002704 0.002331
31 0.033766 2.966139 -0.050351 -0.856461 0.026121 0.048147
32 1.407700 3.765810 0.387135 -0.000000 0.000000 -0.095034
33 -0.000005 3.784240 0.191475 -0.705893 -0.116309 0.040343
34 -0.038984 2.749646 -0.107388 -1.270513 -0.028980 -0.038419
35 -0.013193 3.474698 -0.024516 -1.423080 0.019874 0.037834
36 2.992727 3.619925 -0.091621 -0.000000 0.000000 -0.168174
37 0.231691 2.899979 0.226466 -0.730128 -0.125139 0.025178
38 -0.047092 3.464703 -0.060477 -1.358395 0.006848 0.017134
39 0.012930 2.746930 -0.096224 -1.144578 -0.072458 0.061817
40 -2.231817 1.416985 -1.590845 -0.961137 -0.813399 1.071354
41 -0.316676 3.892340 0.185576 -0.766383 -0.578900 -0.202701
42 -0.269054 3.933451 -0.328679 -1.154412 0.089592 -0.216743
43 -4.555761 13.022080 -2.692908 -1.489673 -1.518259 1.524577
44 -1.178657 4.395971 3.928037 0.000000 0.000000 0.000000
45 -0.013614 3.815055 6.390801 0.000000 0.000000 0.000000
46 0.000000 0.598906 -0.451901 0.000000 0.000000 0.000000
47 -0.038171 18.614559 2.711087 1.573160 0.028204 1.568043
48 1.860149 -15.748778 4.007541 -0.138191 -0.347792 0.001409
49 -0.076017 -0.926034 11.809433 0.000000 -0.000000 -3.141592
time 1
0 8.830845 -0.735720 -23.696539 -0.156472 0.008193 -3.095018
1 -4.697228 -1.846526 -15.703404 -2.251422 -0.888951 -1.130296
2 -0.035534 -23.756725 -0.084864 0.219207 0.336365 -0.311555
3 0.273372 -3.765807 -0.387136 -0.000000 0.000000 0.000000
4 0.000006 -3.784239 -0.191476 -0.698132 -0.178305 0.000000
5 0.024375 -3.235437 0.175097 -1.271159 -0.002704 0.002331
6 -0.111961 -3.553717 0.074809 -0.841241 0.087075 0.015758
7 1.858449 -3.773893 0.198659 -0.000000 -0.245131 0.075729
8 0.000000 -3.784240 -0.191476 -0.633092 0.090881 -0.024549
9 0.074582 -3.334558 0.036041 -1.358425 -0.002704 0.002331
10 -0.033768 -2.966129 0.050350 -0.664475 0.026121 0.048147
11 -1.407706 -3.765808 -0.387136 0.000000 -0.000000 -0.095034
12 0.000001 -3.784247 -0.191475 -0.791333 -0.125139 0.025178
13 0.038986 -2.749644 0.107386 -1.270513 -0.028980 -0.038419
14 0.013189 -3.474695 0.024519 -1.074014 0.019874 0.037834
15 -2.992728 -3.619922 0.091621 -0.000000 -0.000000 -0.168174
16 -0.231694 -2.899981 -0.226468 -0.991927 -0.125139 0.025178
17 0.047095 -3.464700 0.060478 -1.445661 0.006848 0.017134
18 -0.012930 -2.746921 0.096229 -0.428993 -0.072458 0.061817
19 2.231821 -1.416989 1.590844 -1.048084 -0.774568 1.232354
20 0.316672 -3.892340 -0.185574 -0.190424 -0.578900 -0.202701
21 0.269054 -3.933443 0.328680 -0.522319 0.089592 -0.216743
22 24.577011 -12.501706 1.716361 -1.570428 1.590246 -0.769009
23 0.035543 23.756729 -0.084858 0.853563 0.023420 -0.045527
24 -0.273356 3.765805 0.387137 -0.000000 -0.000000 -0.000000
25 -0.000002 3.784240 0.191476 -0.446109 -0.143092 0.061073
26 -0.024375 3.235439 -0.175104 -1.253706 -0.002704 0.002331
27 0.111964 3.553718 -0.074806 -1.364840 0.087075 0.015758
28 -1.858451 3.773897 -0.198662 0.000000 -0.245131 0.075729
29 0.000000 3.784235 0.191475 -0.122252 0.093311 -0.004824
30 -0.074583 3.334561 -0.036041 -0.223961 -0.002704 0.002331
31 0.033766 2.966139 -0.050351 -0.856461 0.026121 0.048147
32 1.407700 3.765810 0.387135 -0.000000 0.000000 -0.095034
33 -0.000005 3.784240 0.191475 -0.705893 -0.116309 0.040343
34 -0.038984 2.749646 -0.107388 -1.270513 -0.028980 -0.038419
35 -0.013193 3.474698 -0.024516 -1.423080 0.019874 0.037834
36 2.992727 3.619925 -0.091621 -0.000000 0.000000 -0.168174
37 0.231691 2.899979 0.226466 -0.730128 -0.125139 0.025178
38 -0.047092 3.464703 -0.060477 -1.358395 0.006848 0.017134
39 0.012930 2.746930 -0.096224 -1.144578 -0.072458 0.061817
40 -2.231817 1.416985 -1.590845 -0.961137 -0.813399 1.071354
41 -0.316676 3.892340 0.185576 -0.766383 -0.578900 -0.202701
42 -0.269054 3.933451 -0.328679 -1.154412 0.089592 -0.216743
43 -4.555761 13.022080 -2.692908 -1.489673 -1.518259 1.524577
44 -1.178657 4.395971 3.928037 0.000000 0.000000 0.000000
45 -0.013614 3.815055 6.390801 0.000000 0.000000 0.000000
46 0.000000 0.598906 -0.451901 0.000000 0.000000 0.000000
47 -0.038171 18.614559 2.711087 1.573160 0.028204 1.568043
48 1.860149 -15.748778 4.007541 -0.138191 -0.347792 0.001409
49 -0.076017 -0.926034 11.809433 0.000000 -0.000000 -3.141592
end
Loading