search

ogamespec / ShandalarToolbox

Microprose classic games .PIC file format decoder
MIT License
7 stars 3 forks source link

Port changes from ShandalarImageToolbox fork #2

Closed CelestialAmber closed 1 year ago

CelestialAmber commented 1 year ago

I've been meaning to send a PR for a long time ever since I'd added support for other formats and completely reworked the tool from the ground up. This PR namely features:

-Support for card art images found in .cat archives (wavelet format) -Support for .spr images -Saving images as .png images -Reworked/overhauled UI

Understandably you may not be okay with a lot of the changes made, but I still would like to see the main improvements make their way into the original repo. It's up to you though.

ogamespec commented 1 year ago

Whoa, that's cool :) I don't mind the changes, it was a 1-2 day project after all, glad someone could use my research :) I don't know how to be honest... It's basically a different utility and the name PicDecoder would be too narrowly focused.

CelestialAmber commented 1 year ago

That's the problem about this ;^^ Maybe this could be put on a separate branch?

ogamespec commented 1 year ago

I can just rename the repository after the PR, I think that's the easiest thing to do. I can name it whatever you like.

CelestialAmber commented 1 year ago

I want to leave the choice to you.

ogamespec commented 1 year ago

ShandalarToolbox is ok?

ogamespec commented 1 year ago

We also need to resolve conflicts somehow, I don't know which side to do it from? :)

ogamespec commented 1 year ago

By the way, I don't know if you've seen these repositories or not? They are also on the topic.

https://github.com/ogamespec/WvlDecoder https://github.com/ogamespec/CatView

CelestialAmber commented 1 year ago

Sorry for the late reply. ShandalarToolbox is ok by me. And yes I have seen both repos, I ported the wavelet code to C# several years ago, and borrowed some code from the .cat viewer.

CelestialAmber commented 1 year ago

I'll try to resolve conflicts on my end.

CelestialAmber commented 1 year ago

I can't seem to find a way to fix conflicts. Could you fix them on your end via a rebase or something else?

ogamespec commented 1 year ago

Merged & renamed :)