unify(gui): Move game window files to Core - #3197
Conversation
PR Summary by QodoCentralize shared game-window implementation in Core
AI Description
Diagram
High-Level Assessment
Files changed (10)
|
Code Review by Qodo🐞 Bugs (0) 📘 Rule violations (0) 📎 Requirement gaps (0)
Great, no issues found!Qodo reviewed your code and found no material issues that require reviewTip of the day💡 Did you know, you can hide the parts of a finding you never read, like the evidence or the agent prompt |
972e4fe to
d7d0096
Compare
There was a problem hiding this comment.
getFlashTransitionColor and getFullFadeTransitionColor are refactors and not a merge.
It is the better solution in this case to reduce the number of guards needed.
It's good enough for me, but xezon may want to have the refactor in its own commit, to keep the merge commit clean. I'll leave that up to him.
The rest looks good.
Yeah I figured that. But I wasn't 100% sure so I was just going to wait to see what he was going to say. |
|
There are more GameWindow related files, for example GameWindowID, GameWindowGlobal |
d7d0096 to
f707fd7
Compare
|
|
Is this good enough to be merged? |
|
Merge looks good. Are there more Game Window files that can be moved? |
Not that I'm aware of in the given scope this PR handles. |
f707fd7 to
c6eb5c4
Compare
|
| Filename | Overview |
|---|---|
| Core/GameEngine/CMakeLists.txt | Adds the relocated window headers and implementations to the shared GameEngine source interface. |
| Core/GameEngine/Source/GameClient/GUI/GameWindowTransitionsStyles.cpp | Consolidates transition color creation while preserving separate Generals and Zero Hour RGB values. |
| Core/GameEngine/Source/GameClient/GUI/GameWindowManagerScript.cpp | Moves the unified WND parser implementation, including ON_MOUSE_DOWN support and RAM-file conversion, into Core. |
| Generals/Code/GameEngine/CMakeLists.txt | Stops compiling the removed Generals-local window implementations so the target consumes the shared Core versions. |
| GeneralsMD/Code/GameEngine/CMakeLists.txt | Stops compiling the moved Zero Hour window implementations from the variant-local tree. |
| scripts/cpp/unify_move_files.py | Records the seven completed GUI file moves in the manual unification mapping list. |
Flowchart
%%{init: {'theme': 'neutral'}}%%
flowchart TD
Core[Core GameEngine window implementation] --> Generals[Generals GameEngine target]
Core --> ZeroHour[Zero Hour GameEngine target]
Generals --> GConfig[RTS_GENERALS behavior and colors]
ZeroHour --> ZConfig[RTS_ZEROHOUR behavior and colors]
Reviews (3): Last reviewed commit: "unify(gui): Move game window files to Co..." | Re-trigger Greptile
f24e9bf to
eb9c659
Compare
|
I rebased this PR, and now one of the CI checks is failing. I suspect the issue stems from the recently merged vcpkg work. |
Yeah it's nothing in this PR, and it looks like something flaky - the other 5 vcpkg tasks finished fine. That's annoying, looking into it |
Fixed the flaky race :) pr #3244 |
This merges the shared game window implementation and moves it into Core:
AnimateWindowManager.hAnimateWindowManager.cppGameWindowID.hGameWindowManager.hGameWindowManager.cppGameWindowManagerScript.cppGameWindowTransitionsStyles.cppBefore this change, Generals and Zero Hour differed by product-name banners, a documentation typo, two Zero Hour WND parsing additions, and game-specific transition colors.
Generals gets
ON_MOUSE_DOWNWND status.Refactoring
Verification