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

Connections between patches and regions should be shown #5786

Conversation

Patryk26g
Copy link
Contributor

@Patryk26g Patryk26g commented Jan 1, 2025

Brief Description of What This PR Does

This PR adds connections between the patches and regions sides. I increased the margin between the patches and also changed the color of the connections to gray (subject to change, maybe they also should be a little bit transparent?) because otherwise it would get a little bit to crowded with all of the connections.
image
image
Screenshot_20250101_131756

PS. Happy new year!!!

Related Issues

Closes #3556

Progress Checklist

Note: before starting this checklist the PR should be marked as non-draft.

  • PR author has checked that this PR works as intended and doesn't
    break existing features:
    https://wiki.revolutionarygamesstudio.com/wiki/Testing_Checklist
    (this is important as to not waste the time of Thrive team
    members reviewing this PR)
  • Initial code review passed (this and further items should not be checked by the PR author)
  • Functionality is confirmed working by another person (see above checklist link)
  • Final code review is passed and code conforms to the
    styleguide.

Before merging all CI jobs should finish on this PR without errors, if
there are automatically detected style issues they should be fixed by
the PR author. Merging must follow our
styleguide.

@revolutionary-bot
Copy link

The lead programmer for Thrive is currently on vacation until 2025-01-07. Until then other programmers will try to make pull request reviews, but please be patient if your PR is not getting reviewed.

PRs may be merged after multiple programmers have approved the changes (especially making sure to ensure style guide conformance and gameplay testing are good). If there are no active experienced programmers who can perform merges, PRs may need to wait until the lead programmer is back to be merged.

@hhyyrylainen hhyyrylainen added this to the Release 0.8.1 milestone Jan 8, 2025
@hhyyrylainen hhyyrylainen requested review from a team January 8, 2025 12:37
@CountingBeeps
Copy link
Contributor

This is a great start, but I don't always like how these look. I think the visuals could use a little work before this is merged. Specifically in this case:
image

@hhyyrylainen
Copy link
Member

I did a partial review of this PR. I left a big chunk of the code unreviewed but it was probably mostly just the path algorithm changes that caused the internal API to change, which looks long but isn't actually that complicated of a change...

This is already in pretty good shape I think overall design wise.

Anyway I'd like to first get the biggest issues out of the way before reviewing everything in here:

  • The columns and rows variables which will break save compatibility
  • Use of zindex in the line rendering on the map

Ones those are taken care of I think this will be close to done already. (though I just saw @CountingBeeps comment)

@Patryk26g
Copy link
Contributor Author

This is a great start, but I don't always like how these look. I think the visuals could use a little work before this is merged. Specifically in this case: image

It should look better now

@Patryk26g
Copy link
Contributor Author

I did a partial review of this PR. I left a big chunk of the code unreviewed but it was probably mostly just the path algorithm changes that caused the internal API to change, which looks long but isn't actually that complicated of a change...

This is already in pretty good shape I think overall design wise.

Anyway I'd like to first get the biggest issues out of the way before reviewing everything in here:

  • The columns and rows variables which will break save compatibility
  • Use of zindex in the line rendering on the map

Ones those are taken care of I think this will be close to done already. (though I just saw @CountingBeeps comment)

I have removed z-indeces and the column and row variables. I also adjusted the look of the patches

Copy link
Member

@hhyyrylainen hhyyrylainen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think overall architecture-wise this is now in good shape. I did a full readthrough of the code and I commented on a few places that could do with some improved clarity or slight changes to match our styleguide. I didn't test in game yet but I liked how the visual screenshots looked. Even if the extra space looks unfamiliar, but to avoid like overlaps it looks like the empty space is required.

src/microbe_stage/editor/PatchMapDrawer.cs Outdated Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Outdated Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Outdated Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Outdated Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Outdated Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Show resolved Hide resolved
src/microbe_stage/editor/PatchMapDrawer.cs Show resolved Hide resolved
@hhyyrylainen
Copy link
Member

I've now tested this in-game and the results are really good.

I tried that antialias option and it doesn't really seem to do much, sadly. So I wouldn't turn it on.

As I tested this in-game I noticed there's some pretty unclear situations. In these kind of situations I think it would be more clear and hopefully easy to make the links between patches highlight whenever a patch is selected (so not just the between region links):

kuva

@Patryk26g
Copy link
Contributor Author

Do not review it yet, I'm not finished

@Patryk26g
Copy link
Contributor Author

Ready for testing now

Copy link
Member

@hhyyrylainen hhyyrylainen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the code is still probably fine since I last looked, and the visuals have been tweaked a lot already. There is one known problem but I'll open a separate issue for that after merging.

@hhyyrylainen hhyyrylainen merged commit a07a466 into Revolutionary-Games:master Jan 17, 2025
4 checks passed
@hhyyrylainen
Copy link
Member

The follow up issue: #5822

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Patches that link map regions together should be more obvious
4 participants