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.

Sign up for GitHub

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

Jump to bottom

Support most Maniac Patch Picture enhancements #2628

Merged
merged 9 commits into from
Oct 16, 2021
Merged

Support most Maniac Patch Picture enhancements #2628

merged 9 commits into from
Oct 16, 2021

Conversation

Ghabry
Copy link
Member

@Ghabry Ghabry commented Sep 1, 2021 •
edited
Loading

and Flip X/Y because this was trivial to add

needs EasyRPG/liblcf#434

@Ghabry Ghabry added this to the 0.7.0 milestone Sep 1, 2021
@Ghabry Ghabry added the Has PR Dependencies This PR depends on another PR label Sep 1, 2021
@Ghabry Ghabry mentioned this pull request Sep 1, 2021
Open
27 tasks
@fdelapena
Copy link
Contributor

Maybe it's a good chance for supporting #1068.

@Ghabry Ghabry mentioned this pull request Sep 1, 2021
Open
@Ghabry
Copy link
Member Author

Ghabry commented Sep 1, 2021 •
edited
Loading

I'm not a fan of this filename stuff, imo this should be focused on Pictures only (for other stuff there could be an additional config option in our editor cough).

But I like this Pixman op -> enum mapping. Will adopt this...

Default, // SRC or OVER depending on the image
Normal,  // OP_OVER
NormalWithoutAlpha, // OP_SRC
XOR,
Additive,
Multiply,
Overlay,
Saturate,
Darken,
Lighten,
ColorDodge,
ColorBurn,
Difference,
Exclusion,
SoftLight,
HardLight

Ghabry added a commit to Ghabry/easyrpg-player that referenced this pull request Sep 1, 2021
@Ghabry
Support specifying the Blend Mode as part of the filename
38ed088 
This is supported e.g. by a DynRPG plugin but we are not feature compatible to this.

Works for everything that is processed as a Sprite which is almost everything except scrolling backgrounds (e.g. Panorama) and the Tilemap.

Fix EasyRPG#2628
@Ghabry
Copy link
Member Author

Ghabry commented Sep 1, 2021

Added blending based on the filename but this is more for playing around. Not sure if we should keep this abomination (or move it at least to a different PR)

@Ghabry Ghabry removed the Has PR Dependencies This PR depends on another PR label Sep 9, 2021
@Ghabry
Copy link
Member Author

Ghabry commented Sep 9, 2021

I remove the filename based Blend Mode for now and only focus on the Maniacs part.
But I will keep the Get/SetFilename part of Bitmap because this is nice for debugging.

@Ghabry Ghabry modified the milestones: 0.7.0, 0.7.1 Sep 9, 2021
@Ghabry Ghabry marked this pull request as draft September 9, 2021 19:40
@Ghabry Ghabry changed the title Support Blend Modes for Picture Blits Support most Maniac Patch Picture enhancements Sep 9, 2021
@Ghabry Ghabry modified the milestones: 0.7.0, 0.7.1 Sep 9, 2021
@Ghabry Ghabry added the Has PR Dependencies This PR depends on another PR label Sep 12, 2021
@Ghabry
Bitmap: Support specifying of a Pixman Blend Mode for most Blit funct…
9b485e3 
…ions.

The until now unused variable "blend_type_effect" in Sprite is used to configure the blend mode.
@Ghabry
Maniac: Support some "Show Picture" enhancements
336dde2 
- Blend Mode
- Flip X/Y

The way how this is stored in the savefile is incompatible. Maniac Patch uses the upper bits of "bottom_transparency" here.
@Ghabry
Maniac: Support some "Move Picture" enhancements
a460de6 
- Blend Mode
- Flip X/Y

The way how this is stored in the savefile is incompatible. Maniac Patch uses the upper bits of "bottom_transparency" here.
@Ghabry
Add an additional abstraction between pixman_op_t and the Blend Mode
4392df8
@Ghabry Ghabry removed the Has PR Dependencies This PR depends on another PR label Sep 13, 2021
@Ghabry Ghabry marked this pull request as ready for review September 13, 2021 13:33
@Ghabry
Copy link
Member Author

Ghabry commented Sep 13, 2021

@gadesx you played around with some of the features already. Could you also test the rest?

The stuff that should work is:

For Show Picture:

  • All the Blend Modes
  • Flip X/Y
  • NOT SUPPORTED: Origin and fixed rotation

For Move Picture:

  • All the Blend Modes
  • Flip X/Y
  • NOT SUPPORTED: Origin and fixed rotation

For Erase Picture:

  • Everything

"Variable ID" should also work for most of the options but I did not check all of them.

@gadesx
Copy link

gadesx commented Sep 13, 2021

@gadesx you played around with some of the features already. Could you also test the rest?

For Show Picture:

All the Blend Modes ------------- WORKS
Flip X/Y            ------------- WORKS

For Move Picture:

All the Blend Modes ------------- WORKS
Flip X/Y            ------------- WORKS

For Erase Picture:

Everything            ------------- WORKS

@Ghabry Ghabry requested review from carstene1ns and removed request for carstene1ns October 2, 2021 12:59
@Ghabry
Copy link
Member Author

Ghabry commented Oct 14, 2021

Can this be merged? There was no further feedback since weeks on this ^^

@fdelapena fdelapena merged commit 7dd0e98 into EasyRPG:master Oct 16, 2021
@Ghabry Ghabry deleted the blend-mode branch February 22, 2022 13:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fdelapena fdelapena fdelapena approved these changes

@carstene1ns carstene1ns Awaiting requested review from carstene1ns

Assignees
No one assigned
Labels
Pictures RPG_RT Patches
Milestone
0.7.0
Development

Successfully merging this pull request may close these issues.
3 participants
@Ghabry @fdelapena @gadesx