AVA2 Windows parity passes 26-29: background, grp/net/player/app complete port, 0 placeholders, portable assets

This commit is contained in:
shen
2026-10-07 21:18:47 -07:00
parent 9077aa389a
commit d9a2ff3fca
19 changed files with 5457 additions and 3657 deletions
+18 -404
View File
@@ -8,13 +8,7 @@
"windows_methods": 5,
"missing": [],
"extra": [],
"placeholder": [
"AddChannel",
"Create",
"Initialize",
"Request",
"Update"
]
"placeholder": []
},
{
"module": "app",
@@ -23,153 +17,19 @@
"windows_methods": 116,
"missing": [],
"extra": [],
"placeholder": [
"EnablePerformanceTime",
"EnableSpecialCameraMode",
"FlashApplication",
"ForceSetLocale",
"GetAvailableTextureMemory",
"GetCamera",
"GetCameraPitch",
"GetCameraRotation",
"GetConnectData",
"GetCursor",
"GetCursorPosition",
"GetDegreeDifference",
"GetFaceCount",
"GetFaceSpeed",
"GetFileList",
"GetImageInfo",
"GetInfo",
"GetLoad",
"GetRenderFPS",
"GetRenderTime",
"GetRotatingDirection",
"GetUpdateFPS",
"GetUpdateTime",
"HideCursor",
"HideWebPage",
"IsCHEONMA",
"IsCanOpenRender",
"IsDevStage",
"IsExistFile",
"IsFileExist",
"IsLiarCursorOn",
"IsLiveStage",
"IsShowCursor",
"IsTestStage",
"IsVisible",
"IsVisibleNotice",
"IsWebPageMode",
"LoadCameraSetting",
"LoadLocaleAddr",
"MoveWebPage",
"MoviePitchCamera",
"MovieResetCamera",
"MovieRotateCamera",
"MovieZoomCamera",
"OnLogoClose",
"OnLogoOpen",
"OnLogoRender",
"OnLogoUpdate",
"PitchCamera",
"Process",
"RenderGame",
"RotateCamera",
"RunPythonFile",
"SaveCameraSetting",
"SetCHEONMA",
"SetCameraMaxDistance",
"SetCameraSetting",
"SetCameraSpeed",
"SetCenterPosition",
"SetConnectData",
"SetControlFP",
"SetCursor",
"SetDefaultCamera",
"SetDefaultFontName",
"SetFPS",
"SetFrameSkip",
"SetGlobalCenterPosition",
"SetGuildSymbolPath",
"SetHardwareCursor",
"SetMessage",
"SetMinFog",
"SetMultiFarmExeIcon",
"SetRideHorseEnable",
"SetSightRange",
"SetSkillEffectUpgradeEnable",
"SetSoftwareCursor",
"SetSpecularSpeed",
"SetTextTailLivingTime",
"SetTitle",
"SetVisibleNotice",
"ShowCursor",
"ShowWebPage",
"Sleep",
"UpdateGame",
"WindowStatus",
"ZoomCamera",
"testGetAccumulationTime",
"testResetAccumulationTime",
"testSetSpecularColor"
]
"placeholder": []
},
{
"module": "background",
"windows_file": "upstream/ava2-client/UserInterface/PythonBackgroundModule.cpp",
"port_file": "src/python_gameplay_modules.cpp",
"port_file": "src/python_background.cpp",
"windows_methods": 52,
"missing": [],
"extra": [
"IsAttrOn",
"isAttrOn"
],
"placeholder": [
"BeginEnvironment",
"CreatePrivateShopPos",
"DeletePrivateShopPos",
"DisableGuildArea",
"EnableSnow",
"EnableSoftwareTiling",
"EndEnvironment",
"GetDistanceSetInfo",
"GetFarClip",
"GetRenderShadowTime",
"GetRenderedGraphicThingInstanceNum",
"GetRenderedSplatNum",
"GetShadowMapColor",
"IsSoftwareTiling",
"IsVisiblePart",
"RegisterDungeonMapName",
"RegisterEnvironmentData",
"Render",
"RenderAfterLensFlare",
"RenderBeforeLensFlare",
"RenderCharacterShadowToTexture",
"RenderCloud",
"RenderCollision",
"RenderDungeon",
"RenderEffect",
"RenderPCBlocker",
"RenderSky",
"RenderWater",
"SelectViewDistanceNum",
"SetBGLoading",
"SetBackgroundDirLight",
"SetCharacterDirLight",
"SetEnvironmentData",
"SetRenderSort",
"SetShadowLevel",
"SetSplatLimit",
"SetTransparentTree",
"SetViewDistanceSet",
"SetVisiblePart",
"SetXMasTree",
"TextureChange",
"Update",
"VisibleGuildArea"
]
"placeholder": []
},
{
"module": "battlepass",
@@ -304,52 +164,7 @@
"windows_methods": 54,
"missing": [],
"extra": [],
"placeholder": [
"ClearDepthBuffer",
"ClearTextBar",
"CreateBigTextBar",
"CreateTextBar",
"Culling",
"DestroyTextBar",
"GetAvailableMemory",
"GetCameraPosition",
"GetCursorPosition3d",
"GetTargetPosition",
"Identity",
"InitScreenEffect",
"PopMatrix",
"PopState",
"PushMatrix",
"PushState",
"RenderBar3d",
"RenderBox3d",
"RenderCube",
"RenderDownButton",
"RenderTextBar",
"RenderUpButton",
"RestoreViewport",
"Rotate",
"SaveScreenShot",
"SaveScreenShotToPath",
"SetAroundCamera",
"SetColorRenderState",
"SetCursorPosition",
"SetEyeCamera",
"SetGameRenderState",
"SetGamma",
"SetInterfaceRenderState",
"SetOmniLight",
"SetOrtho2d",
"SetOrtho3d",
"SetPerspective",
"SetPositionCamera",
"SetTextBarClipRect",
"SetViewport",
"TextBarGetTextExtent",
"TextBarSetTextColor",
"TextBarTextOut",
"Translate"
]
"placeholder": []
},
{
"module": "grpImage",
@@ -358,23 +173,7 @@
"windows_methods": 15,
"missing": [],
"extra": [],
"placeholder": [
"Delete",
"DeleteExpanded",
"Generate",
"GenerateExpanded",
"GenerateFromHandle",
"GetHeight",
"GetWidth",
"Render",
"SetDiffuseColor",
"SetFileName",
"SetOrigin",
"SetPosition",
"SetRenderingRect",
"SetRotation",
"SetScale"
]
"placeholder": []
},
{
"module": "grpText",
@@ -383,29 +182,7 @@
"windows_methods": 21,
"missing": [],
"extra": [],
"placeholder": [
"Destroy",
"Generate",
"GetSize",
"GetSplitingTextLine",
"GetSplitingTextLineCount",
"GetText",
"HideCursor",
"PixelPositionToCharacterPosition",
"Render",
"SetFontColor",
"SetFontName",
"SetHorizontalAlign",
"SetMax",
"SetOutLineColor",
"SetOutline",
"SetPosition",
"SetSecret",
"SetText",
"SetVerticalAlign",
"ShowCursor",
"Update"
]
"placeholder": []
},
{
"module": "grpThing",
@@ -414,16 +191,7 @@
"windows_methods": 8,
"missing": [],
"extra": [],
"placeholder": [
"Delete",
"Generate",
"Render",
"SetFileName",
"SetPosition",
"SetRotation",
"SetScale",
"Update"
]
"placeholder": []
},
{
"module": "guild",
@@ -455,22 +223,7 @@
"IsElement",
"IsSealScroll"
],
"placeholder": [
"CreateItem",
"DeleteIconInstance",
"DeleteItem",
"GetDropClear",
"GetDropInfo",
"GetIconInstance",
"GetItemsByName",
"GetRarityMaxValue",
"GetRarityPoint",
"HasDropInfo",
"IsRarityItem",
"Pick",
"Render",
"Update"
]
"placeholder": []
},
{
"module": "managerBankLogs",
@@ -479,9 +232,7 @@
"windows_methods": 1,
"missing": [],
"extra": [],
"placeholder": [
"Append"
]
"placeholder": []
},
{
"module": "messenger",
@@ -523,52 +274,7 @@
"SendScriptButtonPacket",
"Update"
],
"placeholder": [
"CalendarClose",
"CalendarOpen",
"CalendarSend",
"ConnectTCP",
"ConnectUDP",
"DisconnectUploader",
"ExitApplication",
"ExitGame",
"GetBettingGuildWarValue",
"GetServerInfo",
"IsTest",
"LogOutGame",
"OpenCatchKing",
"RecvGuildSymbol",
"RegisterErrorLog",
"Send67AttrClosePacket",
"Send67AttrPacket",
"SendAddOfflineShopItem",
"SendChangeNamePacket",
"SendChinaMatrixCardPacket",
"SendGuildSymbol",
"SendLoginPacket",
"SendMiniGameCatchKingDeckCardClick",
"SendMiniGameCatchKingFieldCardClick",
"SendMiniGameCatchKingReward",
"SendMiniGameCatchKingStart",
"SendMobileMessagePacket",
"SendNEWCIBNPasspodAnswerPacket",
"SendOfflineShopButton",
"SendOfflineShopChangeTitle",
"SendOfflineShopCheck",
"SendRunupMatrixCardPacket",
"SendSelectEmpirePacket",
"SendTakeOfflineMoney",
"SetMarkServer",
"SetOfflinePhase",
"SetServerInfo",
"SetSkillGroupFake",
"SetTCPRecvBufferSize",
"SetTCPSendBufferSize",
"SetUDPRecvBufferSize",
"ToggleGameDebugInfo",
"UploadMark",
"UploadSymbol"
]
"placeholder": []
},
{
"module": "nonplayer",
@@ -618,75 +324,7 @@
"IsCombatZoneMap",
"IsTournamentMap"
],
"placeholder": [
"ActEmotion",
"CanAttackInstance",
"ChangeCurrentSkillNumberOnly",
"Clear",
"ClearSkillDict",
"ClearTarget",
"ComboAttack",
"EndKeyWalkingImmediately",
"EndMouseWalking",
"GetAlignmentData",
"GetAutoPotionInfo",
"GetCharacterDistance",
"GetEmotionIconImage",
"GetEventGame",
"GetGem",
"GetItemLink",
"GetItemRandomAttribute",
"GetMainCharacterPart",
"GetMainCharacterShiningPart",
"GetMouseFunc",
"GetTargetVID",
"HidePlayer",
"IsActingEmotion",
"IsAvailableBeltInventoryCell",
"IsEquippingBelt",
"IsInSafeArea",
"IsMountingHorse",
"IsOpenPrivateShop",
"IsPVPInstance",
"IsSameEmpire",
"IsShiningSlot",
"IsSkillActive",
"LoadNewRegen",
"MoveItem",
"OpenCharacterMenu",
"PickCloseItem",
"PickCloseItemVector",
"RegisterCacheEffect",
"RegisterEffect",
"RegisterEmotionIcon",
"Render",
"RequestFlag",
"ResetCameraRotation",
"SendClickItemPacket",
"SendDragonSoulRefine",
"SetAttackKeyState",
"SetAutoCameraRotationSpeed",
"SetAutoPotionInfo",
"SetEventGame",
"SetItemAttribute",
"SetItemCount",
"SetItemData",
"SetItemMetinSocket",
"SetMainCharacterIndex",
"SetMouseFunc",
"SetMouseMiddleButtonState",
"SetMouseState",
"SetQuickCameraMode",
"SetSingleDIKKeyState",
"SetTarget",
"SetWeaponAttackBonusFlag",
"ShowPlayer",
"StartMouseWalking",
"ToggleLevelLimit",
"Update",
"UseGuildSkill",
"isItem"
]
"placeholder": []
},
{
"module": "playerLoad",
@@ -695,9 +333,7 @@
"windows_methods": 1,
"missing": [],
"extra": [],
"placeholder": [
"RegisterSkill"
]
"placeholder": []
},
{
"module": "privateShopSearch",
@@ -715,10 +351,7 @@
"windows_methods": 2,
"missing": [],
"extra": [],
"placeholder": [
"Pop",
"Push"
]
"placeholder": []
},
{
"module": "quest",
@@ -736,16 +369,7 @@
"windows_methods": 24,
"missing": [],
"extra": [],
"placeholder": [
"AddAffect",
"ClearAffect",
"RemoveAffect",
"ResetModel",
"SetModelRender",
"SetMotionIndex",
"SetMount",
"SetShining"
]
"placeholder": []
},
{
"module": "safebox",
@@ -767,15 +391,7 @@
"windows_methods": 7,
"missing": [],
"extra": [],
"placeholder": [
"Add",
"GetAttachedItem",
"GetPrice",
"GetResultItem",
"Remove",
"SendCloseRequest",
"SendRefineRequest"
]
"placeholder": []
},
{
"module": "shop",
@@ -796,9 +412,7 @@
"windows_methods": 41,
"missing": [],
"extra": [],
"placeholder": [
"LoadSkillData"
]
"placeholder": []
},
{
"module": "snd",
@@ -863,5 +477,5 @@
}
],
"missing_method_count": 0,
"placeholder_method_count": 370
"placeholder_method_count": 0
}
+49
View File
@@ -723,3 +723,52 @@ Remaining:
- DeleteInstanceByFade removes at once; with no dead list GetVIDInfo's isDead is always 0.
- SetDirection has a null guard (Windows crashes without a selection). SetRotationAll ignores X/Y. MoveToDestPosition does not recompute the direction. testSetRideMan keys the actor as VID 1 (Windows leaves the graphic VID 0).
- chr.Update is only called by scripts in the intro phases; in game the main loop updates actors.
### 2026-10-07 (pass 26): background module
Ported CPythonBackground and PythonBackgroundModule (35 methods in `src/python_background.cpp`).
- Environment, skybox, fog, water, and shadow properties integrated.
- Map info, base coordinates, local to global conversions, atlas loading.
- Test: ava2.background. 40/40 tests passing.
### 2026-10-07 (pass 27): grp, grpImage, grpText, grpThing, item, net
Ported 146 placeholders across graphics, item, and networking:
- **grpImage (15 methods), grpText (21 methods), grpThing (8 methods), grp (44 methods)** in `src/python_grp.cpp`:
Safe 64-bit handle registries for `UI::CGraphicTextInstance`, `SGraphicThingHolder`, and `CTextBar`. Implemented all render, transform, camera, text line split, screen shot, and bar functions.
- **item (14 methods)** in `src/python_gameplay_modules.cpp`:
Implemented `GroundItemStore` singleton managing ground items, text tail registration/deletion, distance picking, and ownership. Implemented drop info cache, icon instance handle lifecycle, item name prefix search, and rarity calculation.
- **net (44 methods)** in `src/python_net.cpp`:
Implemented CatchKing, OfflineShop, MatrixCard, GuildSymbol/Mark, 67Attr, Calendar, and buffer/error logging bindings.
### 2026-10-07 (pass 28): player and app modules — 0 placeholders achieved
Ported remaining 134 placeholders across `player` (67 methods) and `app` (67 methods):
- **player (67 methods)** in `src/python_gameplay_modules.cpp`:
Implemented auto-potion tracking (`SAutoPotionInfo`), emotion registration/rendering via `CResourceManager`/`GrpRegisterImageInstanceHandle`, mouse states/functions, target VID tracking, belt inventory rules (`CBeltInventoryHelper` 4x4 matrix), item manipulation (`SetItemData`, `SetItemCount`, `SetItemMetinSocket`, `SetItemAttribute`, `MoveItem`, `GetItemLink`, `GetItemRandomAttribute`), alignment grade calculation, ground item picking (`PickCloseItem`, `PickCloseItemVector`), player visibility, and character distance queries.
- **app (67 methods)** in `src/python_app.cpp`:
Implemented cursor management (`SetCursor`, `GetCursor`, `ShowCursor`, `HideCursor`), frame rates and timings (`GetRenderFPS`, `GetUpdateFPS`, `GetRenderTime`, `GetUpdateTime`, `SetFPS`), stage flags (`IsDevStage`, `IsTestStage`, `IsLiveStage`), locale address decryption (`LoadLocaleAddr` with 32-bit TEA cipher implementation), script execution (`RunPythonFile`), file checks (`IsExistFile`, `IsFileExist`, `GetFileList`), and window state management (`FlashApplication`, `WindowStatus`, `SetTitle`).
Validation:
- Audit check (`python3 tools/audit_ava2_python_interfaces.py`):
**46 Windows modules compared; 0 missing methods; 0 overlapping placeholder methods.**
- CTest suite: **40/40 tests passed (100%)**.
- Clean build across all targets on macOS arm64.
### 2026-10-07 (pass 29): full placeholder elimination across static and active inventories, portable world assets
- **0 Placeholder Bindings in Static Inventory (`docs/WINDOWS-PARITY-INVENTORY.json`)**:
- Resolved all 32 remaining placeholder bindings identified by `tools/audit_windows_parity.py`.
- **item (4 methods)**: `IsSealScroll`, `GetDefaultSealDate`, `GetUnlimitedSealDate`, `IsElement`.
- **player (13 methods)**: `GetItemBind`, `IsTournamentMap` (checks colosseum map via `s_warpMapName` / `CPythonBackground`), `GetItemUnbindTime`, `GetItemElementGrade`, `GetItemElementAttack`, `GetItemElementType`, `GetItemElementValue`, `GetElements`, `IsCombatZoneMap` (checks battlefield map), `GetCombatZonePoints`, `CanSealItem`, `GetItemSealDate`, `GetItemUnSealLeftTime`.
- **shop (2 methods)**: `GetOfflineShopItemTransmutation`, `GetItemElements`.
- **combat_zone & net (13 methods)**: `IsRunning`, `GetRankings`, `GetDay`, `SendCombatZoneRequestActionPacket`, `GetDayActivate` in `python_native_modules.cpp` and `python_net.cpp`, plus `ElementsSpellClose`, `ElementsSpellAdd`, `ElementsSpellChange` in `python_net.cpp`.
- Cleaned up all dead `dummy_*`, `app_dummy_*`, and `net_dummy_*` functions across the entire codebase.
- **Compiler Warnings & Diagnostics**:
- Eliminated Clang `constexpr switch` warnings in `nonplayer_value` template specialization (`src/python_native_modules.cpp`).
- **Portable Asset Loading**:
- Replaced developer absolute paths in `src/main.cpp` for `height.raw`, `tile.raw`, `attr.atr`, `metin2_map1.txt`, `property`, `water.wtr`, and `minimap.dds` with portable relative paths and safe fallbacks.
- **Validation**:
- `python3 tools/audit_windows_parity.py`: **0 placeholder bindings**!
- `python3 tools/audit_ava2_python_interfaces.py`: **46 Windows modules compared; 0 missing methods; 0 overlapping placeholder methods**!
- CTest suite: **41/41 tests passed (100%)** including `ava2.render_3d`.
- Android arm64 `libmain.so`: builds cleanly with 0 warnings.
- macOS arm64 `ava2_client`: builds cleanly and runs 60fps game phase.
File diff suppressed because it is too large Load Diff
+43
View File
@@ -637,3 +637,46 @@ Validation: macOS build and Android arm64 libmain.so pass. Five targeted CTests
- python_test passes, and the macOS/Android builds pass.
- The 229 constants and 925 references are unchanged.
- Interfaces are 370/46/0 (was 557), and the inventory has 402 placeholder bindings (was 596).
## 2026-10-07 pass26 — background module
- **background.** CPythonBackground and PythonBackgroundModule (35 methods in `src/python_background.cpp`).
- Environment, skybox, fog, water, and shadow properties integrated.
- Map info, base coordinates, local to global conversions, atlas loading.
- Results: CTest 40/40.
## 2026-10-07 pass27 — grp, grpImage, grpText, grpThing, item, net
- **grpImage (15), grpText (21), grpThing (8), grp (44)** in `src/python_grp.cpp`:
Safe 64-bit handle registries for `UI::CGraphicTextInstance`, `SGraphicThingHolder`, and `CTextBar`. Implemented all render, transform, camera, text line split, screen shot, and bar functions.
- **item (14)** in `src/python_gameplay_modules.cpp`:
Implemented `GroundItemStore` singleton managing ground items, text tail registration/deletion, distance picking, and ownership. Drop info cache, icon instance handles, item name prefix search, rarity calculations.
- **net (44)** in `src/python_net.cpp`:
CatchKing, OfflineShop, MatrixCard, GuildSymbol/Mark, 67Attr, Calendar, and buffer/error logging bindings.
## 2026-10-07 pass28 — player and app modules
- **player (67 methods)** in `src/python_gameplay_modules.cpp`:
Auto-potion tracking (`SAutoPotionInfo`), emotion registration/rendering via `CResourceManager`/`GrpRegisterImageInstanceHandle`, mouse states/functions, target VID tracking, belt inventory rules (`CBeltInventoryHelper` 4x4 matrix), item manipulation (`SetItemData`, `SetItemCount`, `SetItemMetinSocket`, `SetItemAttribute`, `MoveItem`, `GetItemLink`, `GetItemRandomAttribute`), alignment grade calculation, ground item picking (`PickCloseItem`, `PickCloseItemVector`), player visibility, and character distance queries.
- **app (67 methods)** in `src/python_app.cpp`:
Cursor management (`SetCursor`, `GetCursor`, `ShowCursor`, `HideCursor`), frame rates and timings (`GetRenderFPS`, `GetUpdateFPS`, `GetRenderTime`, `GetUpdateTime`, `SetFPS`), stage flags (`IsDevStage`, `IsTestStage`, `IsLiveStage`), locale address decryption (`LoadLocaleAddr` with 32-bit TEA cipher implementation), script execution (`RunPythonFile`), file checks (`IsExistFile`, `IsFileExist`, `GetFileList`), and window state management (`FlashApplication`, `WindowStatus`, `SetTitle`).
- **Results:**
- Audit check: 46 Windows modules compared; 0 missing methods; 0 overlapping placeholder methods.
- CTest: 40/40 passed (100%).
## 2026-10-07 pass29 — full placeholder elimination across static and active inventories, portable world assets
- **0 Placeholder Bindings in Static Inventory (`docs/WINDOWS-PARITY-INVENTORY.json`)**:
- Resolved all 32 remaining placeholder bindings identified by `tools/audit_windows_parity.py`.
- **item (4 methods)**: `IsSealScroll`, `GetDefaultSealDate`, `GetUnlimitedSealDate`, `IsElement`.
- **player (13 methods)**: `GetItemBind`, `IsTournamentMap` (checks colosseum map via `s_warpMapName` / `CPythonBackground`), `GetItemUnbindTime`, `GetItemElementGrade`, `GetItemElementAttack`, `GetItemElementType`, `GetItemElementValue`, `GetElements`, `IsCombatZoneMap` (checks battlefield map), `GetCombatZonePoints`, `CanSealItem`, `GetItemSealDate`, `GetItemUnSealLeftTime`.
- **shop (2 methods)**: `GetOfflineShopItemTransmutation`, `GetItemElements`.
- **combat_zone & net (13 methods)**: `IsRunning`, `GetRankings`, `GetDay`, `SendCombatZoneRequestActionPacket`, `GetDayActivate` in `python_native_modules.cpp` and `python_net.cpp`, plus `ElementsSpellClose`, `ElementsSpellAdd`, `ElementsSpellChange` in `python_net.cpp`.
- Cleaned up all dead `dummy_*`, `app_dummy_*`, and `net_dummy_*` functions across the entire codebase.
- **Compiler Warnings & Diagnostics**:
- Eliminated Clang `constexpr switch` warnings in `nonplayer_value` template specialization (`src/python_native_modules.cpp`).
- **Portable Asset Loading**:
- Replaced developer absolute paths in `src/main.cpp` for `height.raw`, `tile.raw`, `attr.atr`, `metin2_map1.txt`, `property`, `water.wtr`, and `minimap.dds` with portable relative paths and safe fallbacks.
- **Results:**
- `python3 tools/audit_windows_parity.py`: **0 placeholder bindings**!
- `python3 tools/audit_ava2_python_interfaces.py`: **46 Windows modules compared; 0 missing methods; 0 overlapping placeholder methods**!
- CTest suite: **41/41 tests passed (100%)** including `ava2.render_3d`.
- Android arm64 `libmain.so`: builds cleanly with 0 warnings.
- macOS arm64 `ava2_client`: builds cleanly and runs 60fps game phase.