Repository navigation
Partial reloads 06: Add the ZR68C reload after magazine detach animation - #179
Closed
sunzenshen wants to merge 2 commits into
Closed
sunzenshen wants to merge 2 commits into
sunzenshen wants to merge 2 commits into
Conversation
glue.py adds glued clips, the reload phases file, the post-export preview and team sharing to the export. The ZR68C gains the authored drawunloaded slot and the glued drawunloaded_reload clip (Jinrai source, shared by NSF through glued.qci), its phases file, three sound pieces cut from the reload sound, and compiled models for both teams.
With one scene per gun there is no NSF scene to compare, skip or share: the NSF model compiles the Jinrai glued clips through glued.qci. glue.py loses the team checks and the SKIPPED and SHARED paths. The post-export preview now holds both teams' arms, like viewmodels.blend, and keeps its image paths relative. Export jinrai_tachi jinrai_zr68c: rc 0, no clamp, seam 0.0000 u, no SMD or phases change. The models compile byte-identical to the committed ones.
This was referenced Nov 9, 2026
Closed
This was referenced Nov 9, 2026
sunzenshen
force-pushed
the
stack/reload-zr68c/20-zr68c-sources
branch
from
November 10, 2026 02:07
51ab288 to
8977e66
Compare
sunzenshen
force-pushed
the
stack/reload-zr68c/30-mvp
branch
from
November 10, 2026 02:07
dfc322d to
48197ed
Compare
This was referenced Nov 10, 2026
sunzenshen
marked this pull request as ready for review
November 10, 2026 04:44
sunzenshen
marked this pull request as draft
November 13, 2026 03:51
This was referenced Nov 13, 2026
Closed
Closed
Closed
Closed
[backup] Partial reloads 18: Add the SRM family sources and its reload clips
sunzenshen/neoAssets#18
Closed
[backup] Partial reloads 20: Add the M41 family sources and its reload clips
sunzenshen/neoAssets#20
Closed
Closed
Contributor
Author
|
Closing to clear the board in favor of the PR stack of sunzenshen#25 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
When the ZRC reload is interrupted after detaching the magazine, swapping back to the ZRC resumes the reload at the fresh magazine insert step.
Demo:
sc-3-dry-unload.mp4
Partial reloads 06. This PR adds the first reload-resume animation for the ZR68C, used by
NeotokyoRebuild/neo#2293: with
sv_neo_reload_experimental 1, a ZR68C reload interrupted after the unload stepcontinues on the next draw. The draw brings up the fresh magazine, seats it and pulls the bolt.
It is layer 06 of a stack and builds on #177 (05: the ZR68C sources), #196 (04), #195 (03), #194 (02) and #176 (01: the Blender layout and tools).
Next: #178 (07) adds the resume after the load (
drawtocycle), #180 (08) the bolt-cycle clips (skipcycle).With the flag at 0 nothing plays the new animation, but the game loads the recompiled ZR68C models instead of the
original ones, so the flag-off change is measured below.
Overview of Changes
glue.py, which the export from Partial reloads 01: Move the Tachi animation sources into a consolidated Blender project #176 runs when present: it writes the glued clips of a project'scomposites.txt, sets the reload phase times from the timeline markers, rebuilds the previewviewmodels_post_export.blend(both teams' arms, relative image paths). NSF compiles its new clips from theJinrai project's
glued.qci; no sharing code remains.drawunloadedin thejinrai_zr68cscene, a one-handed 33-frame draw (f0-32) with the magazineout, ending on the pose of
reloadat f30 (markerreload:1_unload.join). The one scene serves both teams.reloadin thejinrai_zr68cscene:1_unloadf21,1_unload.joinf30,2_loadf40 with its twosounds (f39, f52),
3_cyclef68 with its sound (f61).drawunloaded_reload=drawunloaded+reloadf31-81, 84 frames (2.767 s), written by theexport from the one line of
jinrai_zr68c/composites.txt. Both team QCs includejinrai_zr68c/glued.qci, so bothmodels compile the Jinrai clip.
neo/scripts/weapon_zr68c_reload_phases.txt, theReloadPhasesrows neo's weapon script includeswith
#base.reload:1_unload0.700 s (resumedrawunloaded_reload),2_load1.333 s.drawunloaded_reload:2_load1.400 s (sounds 1.367 s, 1.800 s),3_cycle2.333 s (sound 2.100 s).The export writes every time from the markers.
zr68_reload_load.wav,zr68_reload_load_part2.wav(the tap after loading) andzr68_reload_cycle.wav, cut from the reload sound at its quiet gaps, for the neo entriesweapon_zr68.reload_<step>[_partN]. The resume plays them as pieces, because the single reload sound cannotstart part way.
v_jinrai_zr68candv_nsf_zr68c, the 15 shipped sequences plusdrawunloaded_reload.neo-side files; the
README_ANIMATORtext block gains the ZR68C marker table.How to Review
glue.py,composites.txt,glued.qci, the two QC lines, the phases file and theREADME. The SMDs, models and both
.blendfiles are generated or binary; the gates below check them.viewmodels.blendchanges only in thedrawunloadedslot and the ZR68C markers; the Tachi scenes are as in Partial reloads 01: Move the Tachi animation sources into a consolidated Blender project #176.glue.py; the resume clip with its sources, phases file, sounds and README; the compiled models; "Drop the team sharing code from glue.py".Why one glued resume sequence, not a runtime join
A runtime join (a transition clip, then
reloadstarted at the resume frame) showed a hold of about 85 ms and then askip at the join, from how the engine updates a predicted viewmodel's sequence, and saved only about 3.9 KB per model.
The resume sequence duplicates the reload frames instead.
Checks (measured)
Blender 5.2.3 with Blender Source Tools, Source SDK Base 2013 MP
studiomdl.exeunder Wine.jinrai_tachi jinrai_zr68cKEPT; 0 clamps; the post-export blend is unchanged on a second exportSEAM drawunloaded_reload seam gap 0.0000 u, 0.000 deg: the ease changes nothing; f33-83 arereload's own framesdrawunloadedagainst the shipped clipsPACE jinrai_zr68c 1 authored slots, 0 warningsREADYfor all three pieces (ends 1.617 s, 1.867 s, 2.517 s; clip 2.767 s)drawunloaded_reloadafter the unload: clip 0 to 30 at +1.815 s, fill at +3.225 s (draw +1.410), end at draw +2.83; load, part2 and cycle pieces once each; cancel before the unload: plain draw; flag 0: plain draw, fresh reload 0 to 30 (master); HUD dim 30, Tachi 15, dim 30, bright 30 with 2 magazines; 1 baseline assertReloadPhaseswarning (a bad row in a test copy does print one)drawunloaded_reload, clip 0 to 30 at 1.41 s after the draw, fire allowed at its end; switch before the unload, flag 0, fire held: as on master's code pathsFlag-off change
.vvdstores a different bind pose, which thebind matrices offset; the posed frames match as above. There is no
.xbox.vtx, which the PC game does not load.How to Test
sv_neo_reload_experimental 0(set it before loading a map), take a ZR68C on each team. Draw, fire, reload and idle should look asthey do today.
sv_neo_reload_experimental 1while the stack is reviewed), take a ZR68C, press reload, switch to the secondaryafter the magazine drops out (about 0.7 s in), and switch back. The draw should run into the magazine insert
without a pop, then seat and pull the bolt with sound.
viewmodels_post_export.blend, scenejinrai_zr68c, slotdrawunloaded_reload, to see the clipas the game plays it. The Team toggle shows the NSF arms.
Known limits
1_unload). Layers 07 and 08 add the resume after2_loadand the cycle clips.reload(2.700 s):drawunloaded(33 frames) is 2 frameslonger than the
reloadf0-30 it replaces, for a slower magazine clasp flip.Related