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

Improve spray condition check #537

Merged

Conversation

Xtarsia
Copy link
Contributor

@Xtarsia Xtarsia commented Nov 1, 2024

Admin edit: Cherry-pick 0.9.3

fixes use case of spraying onto freshly painted base texture, by overrwiting overlay texture when it is not visible (less than 0.5 blend)

still some undesireable edge cases can occur when intentionally "making a mess" with lots of different textures sprayed in close proximity but its not really avoidable, since these conditions are attempting to emulate the feel of using a spatmap with many channels, with the just the 2 in the index map.

Also added alt CTRL key modifier to invert the blend direction, which is handy for quickly un-spraying any over-shoot, also prevents any new ID changes on the control map during this so that it explicitly only effects the blend value.

modified the tool colors slightly, SEA_GREEN and FOREST_GREEN were not visually distinct to me

@TokisanGames
Copy link
Owner

Alt is already used for the slope filter. However Ctrl is free for texture, and the video you showed on discord looks more like removal/inverse so I think that will fit better.

You mentioned we're getting into edge cases, but the way I see it is this is the primary case for using the spray tool. That is, paint two adjacent areas then spray the edge to blend. The tools should do that case perfectly, no matter the underlying base/overlay values. With only two textures it should be perfect. I think this changed after #518.

I'm less concerned with mixing 3-4+ textures in one area, but it has worked well in the past and I was happy with it.

I'll try it out a bit later today. I want to get this in soon and pushed into 0.9.3 as it seems broken now. I'll test this PR as well as pre-#518 with both 2-4 textures.

To update you on my schedule, I want to get all the PRs merged in, but I'm working on getting my team what we need to get our demo pushed out and I need to work on a new video showing all the new features. You're free to work on whatever you're interested in and I'll get through the PRs eventually. Thanks!

@TokisanGames TokisanGames added this to the 0.9 milestone Nov 2, 2024
@TokisanGames TokisanGames added the bug Something isn't working label Nov 2, 2024
@Xtarsia
Copy link
Contributor Author

Xtarsia commented Nov 2, 2024

I agree that the primary use case should take priority, and I belive this does cover that now.

Looking forwards to giving the demo a go :)

@Xtarsia Xtarsia marked this pull request as ready for review November 2, 2024 13:13
@TokisanGames TokisanGames merged commit fd6ca1c into TokisanGames:main Nov 3, 2024
12 checks passed
@TokisanGames
Copy link
Owner

Excellent work as always!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants