Repository navigation
Partial reloads 01: Move the Tachi animation sources into a consolidated Blender project - #176
Closed
sunzenshen wants to merge 2 commits into
Closed
sunzenshen wants to merge 2 commits into
sunzenshen wants to merge 2 commits into
Conversation
sunzenshen
force-pushed
the
stack/reload-zr68c/10-layout
branch
from
November 9, 2026 04:50
b595a45 to
d7287f1
Compare
sunzenshen
marked this pull request as ready for review
November 9, 2026 05:52
One Blender file holds a scene per viewmodel project (rig, preview mesh, camera, one Action with a slot per sequence), replacing the per-team .blend files. The two Tachi QCs share one viewmodel.qci and the arm preview images move to arms/textures for every weapon. The export now guards the shipped clips (round-off rewrites keep the old bytes; a real change fails unless --edit-shipped), checks the range-of-motion limits from rom_spec.json before writing, and warns when an authored slot moves faster than the shipped clips. A sidebar panel (viewmodel_tools.py) runs these from Blender. The README describes the workflow. The shipped Tachi SMDs and models are unchanged.
sunzenshen
force-pushed
the
stack/reload-zr68c/10-layout
branch
from
November 9, 2026 06:07
d7287f1 to
f52e3ec
Compare
viewmodels.blend now holds one scene per gun: jinrai_tachi keeps its rig and action, and the NSF preview mesh moves onto that rig in its own collection, so one key moves both teams' arms. The NSF project has no scene: it compiles from its shipped SMDs on disk. merge_teams.py did the merge and stays for a gun added later with two scenes. The export takes the Jinrai project only and refuses an NSF one. --edit-shipped copies a changed shipped SMD into the NSF project, so both teams play the edited clip. rom_spec.json has one section per gun. The Viewmodel panel shows the team on view and flips it with a Team button. The preview images keep their paths relative to the .blend. Export jinrai_tachi: rc 0, no clamp, no SMD changed. Both Tachi models compile byte-identical to before, except the texture pointer slots studiomdl leaves uninitialized.
This was referenced Nov 9, 2026
Contributor
Author
|
Related to the Tachi animation assets from #170: ps-tachi-2-empty.mp4ps-tachi-3-drawempty.mp4 |
This was referenced Nov 9, 2026
Closed
This was referenced Nov 10, 2026
Contributor
Author
|
To reiterate the proposed process from Discord, the intention is not to merge this specific PR directly. Instead, It's meant to help illustrate the gradual evolution from small steps to the larger picture. The first PR of this stack that would be a candidate for merging in to master would be the sprint with an empty open Tachi animation: #194 But depending on how quickly we get through the first 4 PRs, it might be better to merge the combined Tachi and Milso PRs: #196 |
Contributor
Author
|
Closing in favor of reviewing #196 as a consolidated PR, with the commits showing the staged evolution of the combined feature. |
This was referenced Nov 13, 2026
Closed
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
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
Move the Tachi model sources into one Blender file and add various animator quality of life tweaks.
This PR moves the Tachi model sources into one Blender file,
viewmodels.blend, and adds the tools thelater weapon PRs use: a guarded export, range-of-motion limits on the rigs, and a sidebar panel for
animators. It (ideally) changes no game file with this iteration: the shipped Tachi SMDs and models are (almost within minor floating point drift after compilation) byte-for-byte the same, so nothing changes in game.
Overview of Changes
neo/modelsrc/weapons/viewmodels.blendholds one scene per gun(
jinrai_tachi) and replaces the per-team.blendfiles from Tachi animations for reload from empty with the slide locked open #170. The scene has one rig (<project>_rig), onecamera, one Action (
<project>_animations) with one slot per sequence, and the arm meshes of both teams, bothskinned to that rig. A Team toggle (collection visibility, and a button in the panel) shows one team's arms or
the other. A
README_ANIMATORtext block in the file lists the rules. The Jinrai and NSF arm images move fromtachi/textures/toarms/textures/, shared by every weapon. They are Blender previews only; the blend keepstheir paths relative.
merge_teams.py): builds the one scene from the two team scenes and checks that the mergedscene poses the same as both originals (
PASS 0.0000 ufor the Tachi). It is kept in the repo so a later guncan be merged the same way.
$modelname. Each team QC is now$modelnameplus$include "../tachi/viewmodel.qci".export_viewmodels.py): the shipped slots stay the original clips. A rewrite that differsonly by float round-off gets its old bytes back (
KEPT); a real change restores every shipped SMD and fails,naming the slot, frame and bone, unless
--edit-shippedis given. The export finds each scene's rig and Actionby the project's name, so a new gun needs no table entry. The export writes only the Jinrai project of each gun; naming
an
nsf_project fails with a message. NSF compiles its shipped clips from its ownanims/on disk. Gluedclips and reload phase times are not here: a later layer adds them as
glue.py, which the export and thepanel run when the file is present.
rom_limits.py,rom_spec.json,rom_widen.json): each limited bone carriesROM:loc/ROM:rotconstraints set to its range in the shipped clips plus 0.05 u / 0.5 deg, so a drag stopswhere the original animation never goes. The export checks every frame first and fails on a clamped key, then
exports with the limits muted, so the SMDs are the keys.
rom_widen.jsonlists meant poses past a limit(empty here).
anims/) is compared with the shipped clips; aPACE WARNnames bones that move more than 10 % faster. TheTachi has no authored slot, so it reports 0.
viewmodel_tools.py): a 3D Viewport sidebar tab that shows the slot's kind (shipped orauthored), sets the frame range, checks the slot's limits, mutes or frees limits, widens a limit with a
reason, and exports the gun (its Jinrai project). Not installed:
blender viewmodels.blend --python viewmodel_tools.py.exporting, compiling and adding a gun.
How to Review
export_viewmodels.py,rom_limits.py,viewmodel_tools.py,compile_viewmodels.py(wording only), the QC / QCI files, the two JSON files and the README.viewmodels.blendis binary. Its content is the two old Tachi scenes merged into one, plus theROM:*constraints that
rom_limits.py -- applywrites fromrom_spec.json. The gates below check it against theshipped SMDs and models.
merge (
merge_teams.py, the one-scene blend, the export, panel and README updates; blend 1.89 to 1.17 MB).Checks (measured)
Blender 5.2.3 with Blender Source Tools, Source SDK Base 2013 MP
studiomdl.exeunder Wine.merge_teams.pyon the TachiPASS 0.0000 uagainst both original scenesjinrai_tachiKEPT (round-off only); no shipped SMD or QC differs from the layer before the mergerom_limits.py -- specon the filerom_spec.jsonunchanged.mdldiffer in 6 bytes, all in texture-entry pointer slotsneo/modelsrc)fireempty),reloadempty0 to 15, reserve 45 to 30,idle01; HUD matches; only the engine baseline assertsThe compiled models are not committed: they match the shipped ones, so the shipped files stay.
A recompile does not reproduce the shipped
.vvdbyte for byte: the normals and tangents differ by at most1.8e-7 (one float rounding step); positions, weights, UVs and vertex order are identical. Compiling master's own
Tachi sources gives the same bytes as this PR, so the difference comes from the studiomdl build, not from this change.
Toolchain
Related