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

Replace EFPs and FNTs with PNGs #117

Merged
merged 8 commits into from
Jan 23, 2019
Merged

Replace EFPs and FNTs with PNGs #117

merged 8 commits into from
Jan 23, 2019

Conversation

akx
Copy link
Collaborator

@akx akx commented Jan 16, 2019

This PR:

  • adds Python conversion tooling for EFP -> PNG and FNT -> PNG
  • replaces the Error Free Picture (EFP) assets with PNGs and replaces the loading code to look for "FOO.png" when "FOO.EFP" is requested.
  • replaces the FNT assets with PNGs and replaces the loading and drawing code with something somewhat saner. The original code was hard enough to make sense of.

The game code itself (call sites to EFP loading and text drawing) remains unmodified.

Fixes #115
Fixes #118

@akx akx mentioned this pull request Jan 16, 2019
@akx akx force-pushed the png branch 4 times, most recently from 29528db to 279c5a3 Compare January 16, 2019 10:25
@akx akx changed the title Replace EFPs with PNGs Replace EFPs and FNTs with PNGs Jan 16, 2019
@veikkos
Copy link
Member

veikkos commented Jan 16, 2019

Readme has libraries section and Windows specific cmake spell, which should be updated to include SDL_image.

@veikkos
Copy link
Member

veikkos commented Jan 16, 2019

Could consider putting new files under still existing SRC/EFP directory as SRC directory has lots of files. Which reminds me that I should have actually done that with some new files introduced lately. Need to craft a PR.

SRC/EFP/EFP.CPP Outdated Show resolved Hide resolved
SRC/EFP/EFP.CPP Outdated Show resolved Hide resolved
SRC/PORT_IMAGE.CPP Outdated Show resolved Hide resolved
SRC/PORT_IMAGE.CPP Outdated Show resolved Hide resolved
SRC/PORT_IMAGE.H Outdated Show resolved Hide resolved
SRC/PORT_TEXT.CPP Outdated Show resolved Hide resolved
SRC/WRITE.CPP Outdated Show resolved Hide resolved
@akx
Copy link
Collaborator Author

akx commented Jan 17, 2019

Could consider putting new files under still existing SRC/EFP directory as SRC directory has lots of files.

I disagree, since we're getting rid of EFPs as a concept here.

@akx akx force-pushed the png branch 3 times, most recently from ca11b87 to aa32664 Compare January 17, 2019 10:40
@akx
Copy link
Collaborator Author

akx commented Jan 17, 2019

@veikkos Ready for re-review.

@veikkos
Copy link
Member

veikkos commented Jan 17, 2019

Would have renamed .EFP -> .PNG instead of .png like rest of the files. :-)

@akx
Copy link
Collaborator Author

akx commented Jan 21, 2019

Would have renamed .EFP -> .PNG instead of .png like rest of the files. :-)

Sure. Added a commit to do that.

Aside: it makes perfect sense really, but on a case-insensitive file system like my Mac's APFS, one needs to git rm --cached ...; git add files for Git to pick up the case changes.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants