Skip to content
Snippets Groups Projects

Re-factoring AA tree code from m_misc.c/m_misc.h into its own files

Merged Monster Iestyn requested to merge aatree-refactor into next

What the title says. The AA tree-related code now lives in the files m_aatree.c and m_aatree.h. Part of why I did this was to solve this m_misc.h/w_wad.h cyclic dependency problem (involving MAX_WADPATH and AA trees themselves) mentioned in the now-removed comments, another reason was ...only OpenGL uses AA trees at all, why include the relevent structs/functions/otherwise anywhere except where is necessary (which is very few files as it turns out)?

Otherwise, it just looked better on its own rather than mixed with all the other stuff already in the m_misc files. Not really important or anything affecting gameplay at all I guess.

Edited by Monster Iestyn

Merge request reports

Checking pipeline status.

Approval is optional

Merged by avatar (May 4, 2025 12:45am UTC)

Merge details

  • Changes merged into next with 24038d4d.
  • Deleted the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Contributor

    :thumbsup: Looks fine by me

  • +1: let stop the loops

  • Monster Iestyn Added 13 new commits:

    Added 13 new commits:

    • 742353d0 - Merge branch 'master' into next
    • 29ea733a - Fix sprites in skyboxes not having clipping arrays actually set properly
    • 6d2d48f1 - Merge branch 'skybox-sprites-fix' into 'master'
    • a2aeece4 - Significant rework of main seg-rendering code, to eliminate the possibility of d…
    • eb90f4f5 - welp no success in fixing the sky HOMs yet, committing progress anyway
    • 8b2b49fb - Just some final cleanup of the code I changed
    • d5184847 - Merge branch 'master' into software-fixes
    • 87cf02e2 - Merge branch 'master' into software-fixes
    • 4e41525b - Merge branch 'master' into software-fixes
    • 208fb75a - Merge branch 'master' into software-fixes
    • b4798538 - Merge branch 'software-fixes' into 'master'
    • 9ae2a403 - Merge branch 'master' into next
    • a135def1 - Merge branch 'next' into aatree-refactor
  • Alam Ed Arias Added 25 new commits:

    Added 25 new commits:

    • 60dd8dab - Backported clipping fix for FF_REVERSEPLATFORM collision.
    • 7c0eee6f - The fix now takes reverse gravity platform step-up into account properly.
    • 26744c2a - woops #1 (closed)
    • 191a4bc7 - Merge branch 'reverseplatform_clipping' into 'next'
    • df92dc8d - Print debugging message if sector->linecount is zero
    • a7a7a7ee - Added P_LoadReject function to properly check if REJECT lump is valid or not whe…
    • 1d0e74f9 - "REJECT" is only 5 chars long, not 8.
    • 472dce1a - Do not why we are not checking REJECT\0\0, let fix this check
    • f94dd510 - change back to 8, add \0s
    • 9b037164 - Added debug messages for when REJECT lump is not loaded
    • ee180807 - Merge branch 'setup-fixes' into 'next'
    • 9e31ab13 - Merge branch 'master' into next
    • 0b920ee2 - You know that problem where you bumped on the edges of Mario blocks and Bustable…
    • 17e0adcb - Renamed some struct variables so the problem this branch sets out to fix is more…
    • 7af14c20 - Everywhere in the code that was doing things wrong has been changed.
    • 8fc61bb6 - Merge branch 'sectorlist_traversal' into 'next'
    • e87e747a - clean up warning done in setup-fixes
    • 20c2d84c - Fix single side line midtexture skewing
    • a04fcce3 - Hack to fix midtextures for polyobjects being mucked up
    • 305d3287 - Effect 2 (No Midtexture Skew) now toggles off skewing for midtextures on single-…
    • df55019d - Merge branch 'master' into other-software-fixes
    • 307129f7 - Merge branch 'other-software-fixes' into 'master'
    • 6f4c52c9 - travis: treat warnings as errors
    • 95269ab4 - Merge branch 'master' into next
    • 24038d4d - Merge branch 'next' into aatree-refactor
  • Alam Ed Arias mentioned in commit c5fe08dc

    mentioned in commit c5fe08dc

  • Alam Ed Arias Status changed to merged

    Status changed to merged

  • Monster Iestyn changed the description

    changed the description

Please register or sign in to reply
Loading