Skip to content

Conversation

@Tmcg2
Copy link
Collaborator

@Tmcg2 Tmcg2 commented Jan 12, 2023

Some of these required adding a new operation mode to n64graphics.
This new mode takes an image and a tlut (both as PNGs) and outputs the equivalent CI8 in inc.c form
As mentioned in the commit message, I have left those n64graphics changes in a, shall we say, crusty state in order to bring attention to them. They work fine for our immediate purposes but better names should be made and the new mode should be made more feature complete (for example, handle rgba32).

Tmcg2 added 6 commits January 8, 2023 20:09
Remove some bin2c calls from the Makefile

Signed-off-by: Taggerung <[email protected]>
Added an option that makes n64graphics operate in a mode where it
 takes an image and tlut (as pngs) and spits out the appropriate
 CI8 indices inc.c form

I've left those changes in a purposefully crusty state in order
 to get attention

Signed-off-by: Taggerung <[email protected]>
Turns out all the TLUTs for Lakitu are kept in one place, far away
 from the textures that use them

Also named a few other textures. Already new what they were, they
 just weren't named anything useful

Signed-off-by: Taggerung <[email protected]>
Pretty helpful actually, helped identify where a few different
 objects types are initialized. Should be a little useful to
 whoever dives into the object stuff more deeply

Signed-off-by: Taggerung <[email protected]>
Signed-off-by: Taggerung <[email protected]>
Added some commments, gave more appropriate names to some
 variables.

Leaving the new mode argument as `-Z` for now

Signed-off-by: Taggerung <[email protected]>
@Tmcg2
Copy link
Collaborator Author

Tmcg2 commented Jan 24, 2023

I've made my additions to the n64graphics utility a little less crappy. As it stands it works for the purposes of the MK64 project. There are a couple things that could be done to make it more useful to other projects, but unless there's a desire to push these changes to the sm64tools project, I don't see much value in pursuing them.

Tmcg2 added 7 commits January 29, 2023 10:12
Remove some bin2c calls from the Makefile

Signed-off-by: Taggerung <[email protected]>
Added an option that makes n64graphics operate in a mode where it
 takes an image and tlut (as pngs) and spits out the appropriate
 CI8 indices inc.c form

I've left those changes in a purposefully crusty state in order
 to get attention

Signed-off-by: Taggerung <[email protected]>
Turns out all the TLUTs for Lakitu are kept in one place, far away
 from the textures that use them

Also named a few other textures. Already new what they were, they
 just weren't named anything useful

Signed-off-by: Taggerung <[email protected]>
Pretty helpful actually, helped identify where a few different
 objects types are initialized. Should be a little useful to
 whoever dives into the object stuff more deeply

Signed-off-by: Taggerung <[email protected]>
Signed-off-by: Taggerung <[email protected]>
Added some commments, gave more appropriate names to some
 variables.

Leaving the new mode argument as `-Z` for now

Signed-off-by: Taggerung <[email protected]>
@MegaMech
Copy link
Collaborator

MegaMech commented Jan 31, 2023

Note that I have a PR for your PR. I've nearly patched n64graphics to output CIs properly. Then I've worked to put everything into a proper rule and remove all (or most) of the individual commands.

If you want to test or help I have PR'd my changes at:
queueRAM/sm64tools#18

I have one more commit I need to add though.

@MegaMech MegaMech merged commit 3a99685 into n64decomp:master Feb 7, 2023
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