Skip to content

Conversation

@Skyaero42
Copy link

@Skyaero42 Skyaero42 commented Oct 25, 2025

Equalized files between ZH and Gen that had smaller changes. Particular large changes are a texture rewrite, shading rewrite and lighting rewrite in ZH, which will be tackeled in seperate PR's

The following files have changed in this PR:

  • matpass

    • Texture array size change merged using RTS_* guards. I don't full graps the texture rewrite yet and don't know if Generals could handle the larger array size as well. TODO: Figure that out
  • boxrobj

    • Changed buffer type from BUFFER_TYPE_DYNAMIC_SORTING (gen) to BUFFER_TYPE_DYNAMIC_DX8 (zh)
    • Copy additional checks in zh to gen
  • hmorphanim

    • framerate set using RTS_* guards. In ZH the animation framerate is read from file (?) in Gen it is a constant of 30. TODO: can generals also read from file?
  • hanimgr

    • add additional cleanup logic from ZH to Gen
  • hlod

    • Add boneindex safeguard from ZH to Gen
  • nullobj

    • Change sphere and box extend default to nonzero
  • w3d_file

  • hrawanim

    • Use ZH logic to changed pivot index
  • animobj

    • Modified conditions and logic for simple animations

These changes have no (visual) impact on Generals as far as I've tested

@Skyaero42 Skyaero42 self-assigned this Oct 25, 2025
@Skyaero42 Skyaero42 added the Unify Unifies code between Generals and Zero Hour label Oct 25, 2025
@Skyaero42 Skyaero42 changed the title Unify WW3D2 unify(ww3d2): Equalize files between Zero Hour and Generals in WW3d2 Oct 26, 2025
@Skyaero42
Copy link
Author

I want to approach this differently. Closing this draft.

@Skyaero42 Skyaero42 closed this Nov 8, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Unify Unifies code between Generals and Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant