Skip to content

Dump Several Map-Related NARCs#939

Open
ravepossum wants to merge 13 commits intopret:mainfrom
ravepossum:prop_bins
Open

Dump Several Map-Related NARCs#939
ravepossum wants to merge 13 commits intopret:mainfrom
ravepossum:prop_bins

Conversation

@ravepossum
Copy link
Collaborator

Please see the original PR for more details - all of the information there still applies

The only difference in the changes in this PR and the original are:

  • The NARCs being dumped have been given more descriptive names now that nitrorom allows us to do so.
  • A couple more prop models have been documented since then - those files and their new constants have been updated to match

Re-opening this PR as it's been blocked by other tooling changes for a while but ultimately the concerns we had were not impactful enough to keep it blocked further (and any time new prop models get documented, it adds work to this PR).

The main issue previously was that the python conversion scripts were not as performant as a datagen tool. The intent is that the scripts in this PR will be rewritten once #852 is complete and dataproc is ready to use.

There's a lot in this PR and I put together the history with intention - I'd prefer if these changes weren't squashed.

@ravepossum ravepossum marked this pull request as draft February 9, 2026 03:28
@ravepossum ravepossum marked this pull request as ready for review February 9, 2026 03:58
Copy link
Contributor

@Kuruyia Kuruyia left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Beautiful!

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

question: Does it make sense to somehow generate this file from generated/map_prop_models.txt?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is an excellent suggestion and I'm currently trying to come up with a reasonably clean and Meson-ic way to accomplish this.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, although I'm no Meson connoisseur :)

@ravepossum ravepossum force-pushed the prop_bins branch 2 times, most recently from fff6278 to 4e27428 Compare February 13, 2026 17:18
@ravepossum
Copy link
Collaborator Author

Feedback addressed - force push 1 moves float_to_fx16 to convert.py. Force push 2 changes the map_prop_models.order file to be generated by the map prop model constants.

@ravepossum ravepossum marked this pull request as draft February 14, 2026 16:11
@ravepossum
Copy link
Collaborator Author

Per discord discussion I'm going to rework this to use NAIX constants for prop models instead of metang ones. I'll need to PR a change to narc to generate count constants in NAIX files first. Knocking back to draft while I'm working on that.

@ravepossum
Copy link
Collaborator Author

ravepossum commented Feb 15, 2026

Sorry for the extremely noisy force push. Changes include:

  • Map prop models now no longer uses constants defined in a header file or in a metang generated file - they use the map prop model NAIX constants as the source of truth. This means that any references in code and in the prop model sets use NAIX constants now.
  • Prop models that I had named unk_XYZ have been renamed prop_model_XYZ to make the new NAIX constants more unique and more obvious (and they align better with the other temporary names like prop_texture_set_000 and such).
  • The prop model build process now uses an explicit list of files like most other build scripts in the repo. My thinking here vs. using the order file like we were before is that future modders will only need to touch the list of files in the build script (which they will one way or the other, because meson) and they can ignore the .order file entirely. Plus it's aligned with the rest of the repo this way.

@ravepossum ravepossum marked this pull request as ready for review February 15, 2026 17:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants