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

[IDB IGNORE] [MDB IGNORE] Unifying exterior and simulated flooring. #3478

Closed
wants to merge 1 commit into from
Closed

[IDB IGNORE] [MDB IGNORE] Unifying exterior and simulated flooring. #3478

wants to merge 1 commit into from

Conversation

MistakeNot4892
Copy link
Contributor

@MistakeNot4892 MistakeNot4892 commented Oct 31, 2023 •
edited
Loading

DNM, opening for diff and CI.

Description of changes

  • Unifies exterior and simulated flooring behavior on /turf by making turfs contain a lazy flooring_layers list of /decl/flooring.
  • Moves flooring icon and smoothing behavior onto /decl/flooring.

Why and what will this PR improve

Simpler code, shared code, more consistent behavior and easier maintenance.
Flooring icons no longer have two completely distinct icon state schemes.

TODO

  • Coarse unification, flooring decl updates.
  • Verify all icons have appropriate states.
  • Generalize burned/broken to exterior.
  • Horizontal/vertical inner edge smoothing.
  • Horizontal/vertical outer edge smoothing.
  • Inner corner smoothing.
  • Outer corner smoothing.
  • Inner junction smoothing.
  • Outer junction smoothing.
  • Adjacent outer non-blending corner smoothing.
  • Profile/optimize to avoid bloating init time.
  • Add missing icon states for CI.
  • Verify facings are all correct for corners etc.
  • Correct decal directions on ninja and heist maps.
  • Fix broken smoothing after inlining the checks.
  • Get wild grass, water and sand working.

Authorship

Myself.

Changelog

🆑
tweak: Flooring behavior has been rewritten - please report bugs with floor icons like carpet edges on the tracker.
/:cl:

@MistakeNot4892 MistakeNot4892 added do not merge This PR is on hold, do not merge it. work in progress This PR is under development and shouldn't be merged. labels Oct 31, 2023
@MistakeNot4892 MistakeNot4892 force-pushed the flooring branch 12 times, most recently from f3a5260 to acbcb6a Compare October 31, 2023 12:14
@MistakeNot4892 MistakeNot4892 changed the title Unifying exterior and simulated flooring. Unifying exterior and simulated flooring. [IDB IGNORE] Oct 31, 2023
@MistakeNot4892 MistakeNot4892 force-pushed the flooring branch 3 times, most recently from d5348cd to 4a2f5d4 Compare October 31, 2023 13:15
@MistakeNot4892 MistakeNot4892 mentioned this pull request Oct 31, 2023
Merged
@MistakeNot4892 MistakeNot4892 force-pushed the flooring branch 10 times, most recently from 52e0695 to 874848b Compare November 1, 2023 02:38
@MistakeNot4892
Copy link
Contributor Author

Depends on #3479.

@MistakeNot4892 MistakeNot4892 added the has dependencies This PR should not be merged prior to any PRs linked in body or comments. label Nov 1, 2023
@MistakeNot4892 MistakeNot4892 force-pushed the flooring branch 4 times, most recently from b2cdf63 to 8d07733 Compare November 7, 2023 03:56
@MistakeNot4892 MistakeNot4892 force-pushed the flooring branch 2 times, most recently from 6734fce to 2488b86 Compare December 1, 2023 09:32
@MistakeNot4892 MistakeNot4892 force-pushed the flooring branch 2 times, most recently from 4fdafd0 to d93f344 Compare January 29, 2024 01:03
@MistakeNot4892 MistakeNot4892 removed has dependencies This PR should not be merged prior to any PRs linked in body or comments. do not merge This PR is on hold, do not merge it. labels Jan 29, 2024
@MistakeNot4892 MistakeNot4892 changed the title Unifying exterior and simulated flooring. [IDB IGNORE] [IDB IGNORE] Unifying exterior and simulated flooring. [IDB IGNORE] Feb 18, 2024
@MistakeNot4892 MistakeNot4892 force-pushed the flooring branch 3 times, most recently from bf93d1e to 71d89d7 Compare February 18, 2024 13:54
@MistakeNot4892 MistakeNot4892 changed the title [IDB IGNORE] Unifying exterior and simulated flooring. [IDB IGNORE] [IDB IGNORE] [MDB IGNORE] Unifying exterior and simulated flooring. [IDB IGNORE] Feb 18, 2024
@MistakeNot4892 MistakeNot4892 changed the title [IDB IGNORE] [MDB IGNORE] Unifying exterior and simulated flooring. [IDB IGNORE] [IDB IGNORE] [MDB IGNORE] Unifying exterior and simulated flooring. Feb 18, 2024
@MistakeNot4892
Unifying exterior and simulated flooring behavior.
a42ea4a 
Trying to inline test_link().

Condensing broken/burned logic on /turf.
@MistakeNot4892 MistakeNot4892 added the has dependencies This PR should not be merged prior to any PRs linked in body or comments. label Mar 13, 2024
@MistakeNot4892
Copy link
Contributor Author

Breaking this one up for parts. Depends on #3793 #3792 #3791

@MistakeNot4892
Copy link
Contributor Author

Obviated by other PRs and ongoing work.

@MistakeNot4892 MistakeNot4892 deleted the flooring branch May 23, 2024 02:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
has dependencies This PR should not be merged prior to any PRs linked in body or comments. work in progress This PR is under development and shouldn't be merged.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@MistakeNot4892