Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various custom asset support #756

Merged
merged 8 commits into from
Aug 23, 2024

Conversation

Archez
Copy link
Contributor

@Archez Archez commented Aug 14, 2024

This PR adds various support of loading custom assets and toggling between assets (read: this is not meant to be all encompassing of every possible custom asset)

List so far of changes:

  • Lib_SegmentedToVirtual no longer loads resource data and instead will just pass through whatever pointer it is given. This will ensure that asset path strings end up to the renderer or later in some of the games systems (animations/skeletons)
    • Fixes things like eye/mouth textures, effects/particles, Tektites, snow trees, etc
  • Title cards render as one rectangle now
  • Debug GfxPrint now uses font data from archives if available
  • Support pause menu overworld map with multi tile load that handles asset paths

New issues introduced by these changes that need to be resolved:

  • Animation timings are incorrect
  • Manually load resources that are no longer freely loaded by Lib_SegmentedToVirtual (mostly Vertex data)

Build Artifacts

@Archez Archez force-pushed the various-custom-asset-support branch from 832a6a5 to 9beeb83 Compare August 14, 2024 03:26
@Archez Archez force-pushed the various-custom-asset-support branch from dc5655a to a03d0a3 Compare August 16, 2024 23:29
@Archez Archez changed the title [WIP] Various custom asset support Various custom asset support Aug 18, 2024
@Archez
Copy link
Contributor Author

Archez commented Aug 18, 2024

Marking this as ready to review. The listed changes wrap up most of the reported issues with the mm reloaded pack.

Remaining issues will be addressed in follow up PRs as these changes will be extensive enough to warrant individual PRs

  • Igos Curtains (CPU modified)
  • Couple authentic texture overflows (Arrow tips, Freezards, Iron Knuckle effect) (this would resemble the similar SoH authentic texture overflow enhancement)
  • Sakon hideout conveyor belt door (Seems like irregular texture UV coordinates that are not scaling correctly for HD texture sizes)
  • Minimaps (requires pulling in minimap updates from decomp to get extracted textures)

@Archez Archez marked this pull request as ready for review August 18, 2024 20:08
Copy link
Contributor

@inspectredc inspectredc left a comment

Choose a reason for hiding this comment

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

LGTM just some small things

mm/src/code/c_keyframe.c Outdated Show resolved Hide resolved
mm/src/code/z_lib.c Show resolved Hide resolved
@Archez Archez mentioned this pull request Aug 19, 2024
31 tasks
@Archez
Copy link
Contributor Author

Archez commented Aug 20, 2024

Updated for PR feedback.

Also found a few more resources that needed to be loaded manually so those have been added to the PR.

Copy link
Contributor

@inspectredc inspectredc left a comment

Choose a reason for hiding this comment

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

Looks good and thanks for the added comment! New changes all good too 👍🏼

@Archez Archez merged commit 0c2a51c into HarbourMasters:develop Aug 23, 2024
5 checks passed
mckinlee pushed a commit to mckinlee/2ship2harkinian that referenced this pull request Oct 4, 2024
* use asset paths for better custom asset support

* fix keyframe animation timings

* display title cards as a full texture

* asset support for gfxprint

* support pause menu overworld map

* fix more resources that need to be loaded

* pr feedback
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