Skip to content

Conversation

@xezon
Copy link

@xezon xezon commented Dec 14, 2025

Merge with Rebase

This change has 2 commits.

The first commit merges texture related changes from Zero Hour to Generals. It also fully merges W3DWater and W3DWaterTracks, because the water was not drawn otherwise. The second commit moves the relevant merged files to Core.

Generals gets the following things as documented by EA

  • Base texture class to abstract major texture types, e.g. 3d, z, cube, etc
  • Texture class abstraction
  • Texture class redesign
  • Render to shadow buffer texture support in texproject
  • Optional custom zbuffer in texproject

Note

I did not attempty to decouple the individual EA changes, because the change complexity is too large. I simply copied everything texture related from Zero Hour to Generals as is. I think the complexit of this merge is reasonable for what it is trying to achieve.

Known Issue(s)

I only identified one issue and that is the segline, aka binary stream, missing from Lotus, Patriot. I was unable to figure out why, but I think it is ok to ignore that for now. It will very likely fix itself when we merge more of W3D. The segline does show for waypoints.

@xezon xezon added this to the Code foundation build up milestone Dec 14, 2025
@xezon xezon added Major Severity: Minor < Major < Critical < Blocker Gen Relates to Generals Unify Unifies code between Generals and Zero Hour labels Dec 14, 2025
@xezon xezon force-pushed the xezon/unify-texture branch 2 times, most recently from 31dd190 to 2eb16c1 Compare December 14, 2025 11:14
@xezon xezon force-pushed the xezon/unify-texture branch from 2eb16c1 to a03ed31 Compare December 14, 2025 11:35
@xezon
Copy link
Author

xezon commented Dec 14, 2025

Generals World Builder fixed. Tested and Worked.

@xezon xezon force-pushed the xezon/unify-texture branch from a03ed31 to 96d463e Compare December 14, 2025 12:35
@xezon
Copy link
Author

xezon commented Dec 14, 2025

Since this moves "W3DWater" and "W3DWaterTracks" to Core, I have now also moved "Water" to Core.

@Skyaero42
Copy link

Water looks good, but textures show artifacts

image image

@xezon
Copy link
Author

xezon commented Dec 14, 2025

What map is this? I do not recognize it. The things you marked refer to terrain tiles, and that should be tested with the height map merge #1991 then. I loaded 2 official maps in Generals and I am unable to observe tiling issues.

@xezon
Copy link
Author

xezon commented Dec 14, 2025

I tested more and I found this is an intermediate issue with this change, it is automatically resolved with #1991.

@xezon
Copy link
Author

xezon commented Dec 15, 2025

First commit is also compiling on its own.

@xezon xezon merged commit c110a0e into TheSuperHackers:main Dec 15, 2025
23 checks passed
@xezon xezon deleted the xezon/unify-texture branch December 15, 2025 21:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Gen Relates to Generals Major Severity: Minor < Major < Critical < Blocker Unify Unifies code between Generals and Zero Hour

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants