diff --git a/audit/history.jsonl b/audit/history.jsonl index 0e86b482..4fa238ca 100644 --- a/audit/history.jsonl +++ b/audit/history.jsonl @@ -519,3 +519,4 @@ {"time": "2026-09-23T10:36:40Z", "event": "port_round", "unit": "PORT-PLAN 2V2-d.2: Granny runtime on libgr2 + EterGrnLib, main character model animates", "ported": ["EterGrnLib/LODController.cpp", "EterGrnLib/Material.cpp", "EterGrnLib/Mesh.cpp", "EterGrnLib/Model.cpp", "EterGrnLib/ModelInstance.cpp", "EterGrnLib/ModelInstanceCollisionDetection.cpp", "EterGrnLib/ModelInstanceModel.cpp", "EterGrnLib/ModelInstanceMotion.cpp", "EterGrnLib/ModelInstanceRender.cpp", "EterGrnLib/ModelInstanceUpdate.cpp", "EterGrnLib/Motion.cpp", "EterGrnLib/Thing.cpp", "EterGrnLib/ThingInstance.cpp", "EterGrnLib/Util.cpp", "EterLib/GrpObjectInstance.cpp", "EterLib/GrpCollisionObject.cpp", "EterLib/CollisionData.cpp"], "adapted": ["platform/EterGrnLib/GrannyRuntime.cpp: Granny SDK 2.11 API on libgr2 (file sections, type-definition vertex conversion incl. half floats, material texture by Usage, mesh/bone bindings, deformer, control clock/loop/ease, weighted SRT sampling, composite matrices)", "shim/sdk/granny.h declared from the SDK 2.11 header", "CPU vertex/index buffers (platform/EterLib/CpuBuffer.h)", "Resource.cpp gr2 factory", "CPythonApplication::UpdateGame/RenderGame/GetMousePosition through singletons (no app object); CPythonGraphic in GameSingletons; host cursor", "libgr2: skeleton/mesh/anim/fileinfo accessors", "D3D8Types texture-stage enums, D3DXVec4Transform"], "divergent": [], "needs_live": [], "tests": ["port.login_flow: pass (PART_MAIN model has meshes, material 0 diffuse image loaded, WAIT motion changes bone matrices between frames)", "port.login_live: pass against 192.168.21.203", "script/port_gate.sh macos: PASS"], "todo": ["2V2-e Godot render adapter: recognizable standing character offline + live", "mdatr factory with CAttributeData resource"]} {"time": "2026-09-23T11:09:12Z", "event": "port_round", "unit": "PORT-PLAN 2V2-e.1: 3D draw-command channel (recording D3D8 device, StateManager, GrpBase, camera)", "ported": ["EterLib/StateManager.cpp", "EterLib/GrpBase.cpp"], "adapted": ["platform/EterLib/RecordingDevice.cpp: IDirect3DDevice8 that records every Draw* as Render3DDraw (RenderCommands3D.h)", "CGraphicDevice::Create on the recording device, CPU default IB/PDT VBs", "D3DXMath PerspectiveFovRH/OrthoRH/OrthoOffCenterRH + ID3DXMatrixStack", "PythonApplicationCamera.cpp: __UpdateCamera and camera API verbatim, members in a file-static struct", "Process: __UpdateCamera, OnCameraUpdate, Begin/SetInterfaceRenderState/OnUIRender/End", "CScreen Begin/End/Set*Operation, CPythonGraphic Set{Game,Interface}RenderState/PushState/PopState/GetOrthoDepth, CCullingManager::Process view/proj (no frustum culling yet)", "pending CPythonPlayer main-actor functions (no event handler), CMapManager::IsMapReady"], "divergent": [], "needs_live": [], "tests": ["port.login_flow: pass (textured lit triangle draw, RH perspective, all vertices on screen)", "port.login_live: pass against 192.168.21.203", "script/port_gate.sh macos: PASS"], "todo": ["2V2-e.2 Godot consumer of Render3DDraws + offline screenshot", "2V2-e.3 live smoke", "SphereLib frustum culling", "PythonPlayerEventHandler"]} {"time": "2026-09-23T11:33:24Z", "event": "port_round", "unit": "PORT-PLAN 2V2-e.2: Godot consumer of Render3DDraws + offline screenshot", "ported": ["UserInterface/PythonBackground.cpp: CPythonBackground::GetFarClip", "GameLib/MapManager.cpp: CMapManager::CMapManager"], "adapted": ["python_host_node render3d_draws binding", "project/python_3d_surface.gd: draw -> MeshInstance3D (world*view), camera from the RH projection, materials from render state, textures from the 40250 packs (UiAssets.load_pack_tex keeps the d: drive)", "no-environment stand-in: lit draws without light/ambient/emissive shown unshaded (unlit_stand_in_count) until the map/environment port", "port_fake_login_server CLI + script/python_game_render_test.sh (offline / --live via MT_LIVE_*)"], "divergent": [], "needs_live": ["2V2-e.3 live smoke on the real server"], "tests": ["script/python_game_render_test.sh offline: pass (4 textured draws, character centred)", "script/port_gate.sh macos: PASS"], "todo": ["2V2-e.3 live smoke", "environment port (CMapManager::LoadMap / SetCharacterDirLight) removes the unlit stand-in"]} +{"time": "2026-09-23T11:40:26Z", "event": "port_round", "unit": "PORT-PLAN 2V2-e.3: live smoke of the Godot render adapter", "ported": [], "adapted": ["python_3d_surface.gd material key: bools as ints (formatting error made every draw share the first material)", "python_game_render_test.gd: one texture per texture name check"], "divergent": [], "needs_live": [], "tests": ["script/python_game_render_test.sh offline: pass (3 textures, character dressed)", "script/python_game_render_test.sh --live against 192.168.21.203: pass (246 draws, 10 textures, main character + mobs)", "script/port_gate.sh macos: PASS"], "todo": ["environment port (CMapManager::LoadMap / SetCharacterDirLight) removes the unlit stand-in", "terrain/map rendering", "SphereLib frustum culling", "PythonPlayerEventHandler"]} diff --git a/docs/PORT-PLAN.md b/docs/PORT-PLAN.md index 2265f3a9..342e9d54 100644 --- a/docs/PORT-PLAN.md +++ b/docs/PORT-PLAN.md @@ -423,7 +423,7 @@ extension/third_party/cpython-2.7.18/ # 静态库（2P 批次 | 2V2-b | `PythonNetworkStreamPhaseGame*.cpp` 分派闭包：`SetGamePhase`/`GamePhase`，PHASE_GAME 后的 Entergame 包洪流（`GC_TIME`/`GC_CHANNEL`/`GC_CHARACTER_ADD`/`GC_CHAR_ADDITIONAL_INFO`/`GC_CHARACTER_UPDATE`/技能/物品/快捷栏…）读流不断 | 完成：`PythonNetworkStreamPhaseGame`/`PhaseGameActor`/`PhaseGameItem`/`Command`、`NetworkActorManager` 原样移植并在运行时分派（port-map 标 PORTED）；`GC_CHAT` 需要的 `PythonChat.cpp`/`PythonChatModule.cpp` 一并原样移植，`GameplayModules.cpp` 的 `chat` 桩删除，`initChat()` 按 40250 顺序在 `initnet()` 前调用。未移植单元的单例在 `PythonBoot` 的 `GameSingletons` 里按 `CPythonApplication` 成员顺序创建（calloc 存储：替身构造函数不初始化标量）；替身由 `platform_stub.py pending
<符号...> [--ctor]` 按链接缺失符号生成到 `platform/pending//`，返回 `const char*` 的替身返回 `""`（`RecvGuild` 里 `strcmp(…, CPythonPlayer::GetName())`）。`port.login_flow` 假服按 `CInputLogin::Entergame` 顺序发：Loading 阶段 `CHARACTER_ADD`+`CHAR_ADDITIONAL_INFO`+`CHARACTER_UPDATE`、`NPC_POSITION` → `PHASE_GAME` → `LAND_LIST`、`TIME`、`CHANNEL`、问候 `CHAT` → `PING`，客户端回 `PONG`，公告进 `CPythonChat`，`TraceError` 观察钩子（`EterBase/TraceErrorObserver.h`）断言无 `Unknown packet header`。`port.login_live` 2026-09-23 对 192.168.21.203 读 10 s 真实游戏阶段：连接保持、GameWindow 显示、无未知包；剩下的 SYSERR 只有 `CreateInstance` 失败（2V2-d 的 `SetRace` 占位） | | 2V2-c | `PythonCharacterManager` + `chrmgr`/`chr` 模块：`playerSettingModule` 的种族/动作/特效注册走真实实现 | 完成：`PythonCharacterManagerModule.cpp`/`PythonCharacterModule.cpp` 原样移植，`GameplayModules.cpp` 的 `chr`/`chrmgr` 桩删除，`initchr()`/`initchrmgr()` 按 40250 顺序在 `initChat()` 前调用；注册链需要的 `RaceData`/`RaceDataFile`/`RaceManager`/`RaceMotionData`、`GameType`、`AttributeData`/`AttributeInstance`、`TextFileLoader`、`Util.cpp`（代码页/字体部分留在 platform 字体后端，port-map 标 ADAPTED/N_A）、`Camera`/`CameraProcedure` 原样移植（port-map 标 PORTED），`CRaceManager` 按 `CPythonApplication` 成员顺序在 `PythonBoot` 创建；`D3DXMath` 补 `D3DXVec2CCW`/`D3DXMatrixfDeterminant`/`D3DXMatrixLookAtRH`。`port.login_flow` 断言 `chr`/`chrmgr` 不是桩、种族 0 的 `MODE_GENERAL`/`NAME_WAIT` 动作已注册、Syserr 无“처리되지 않은 패킷 헤더”；`port.login_live` 2026-09-23 对 192.168.21.203 连跑 8 次通过、`script/port_gate.sh macos` PASS，怪物种族实例随真实 `SetRace` 创建。偶发（约 1/11）Loading 阶段报头 7 未处理（疑包长失步），测试现打印 `g_iLastPacket` 并判失败，未再复现 | | 2V2-d | `InstanceBase` + `ActorInstance` + `CGraphicThingInstance` adapter：`GC_CHARACTER_ADD` 创建主角实例（msm 模型 + 待机动作） | 完成。d.1：`ActorInstance*.cpp`（Attach/Battle/Blend/CollisionDetection/Event/Fly/Motion/MotionEvent/Position/Render/Rotation/Sync/WeaponTrace）、`InstanceBase*.cpp`（Battle/Effect/Event/Motion/Transform）、`GameUtil`、`FlyTarget`、`PhysicsObject`、`GameEventManager`、`WeaponTrace`、`MapUtil`、`lineintersect_utils` 原样移植，`pending/GameLib/{ActorInstance,FlyTarget,PhysicsObject,MapUtil}.cpp`、`pending/UserInterface/InstanceBase.cpp` 替身删除，`ActorInstance.cpp`/`InstanceBase.cpp` 随主角创建进入运行时（port-map 标 PORTED）；`CGameEventManager` 与 `CPythonSystem`（最后一个成员）按 `CPythonApplication` 成员顺序在 `PythonBoot` 创建；`D3D8Types.h` 补全 `D3DTA`/`D3DTEXTUREOP`/`D3DCMPFUNC`/`D3DBLEND`/`D3DCULL`。假服 `CHARACTER_ADD` 的 `bType` 改为 `CHAR_TYPE_PC`（6，原 0 使 `RecvCharacterAppendPacket` 不记主角、`CHAR_ADDITIONAL_INFO` 报错）。2V2-c 的偶发 Loading 头 7 根因：`TPlayerSkill::tNextRead` 是 `time_t`，40250 用 `_USE_32BIT_TIME_T`，LP64 下 `TPacketGCSkillLevelNew` 变成 2551 字节（线上 1531），`CInputDB::PlayerLoad` 在 `PointsPacket` 后发的 `SKILL_LEVEL`（76）读多吞掉后续包；`Packet.h` 改 `LONG` 并 `static_assert` 1531，假服 Loading 阶段补发 `SKILL_LEVEL` 回归。`port.login_flow` 断言主角实例存在且种族 0、无 `TPacketGCCharacterAdditionalInfo` 报错；`port.login_live` 2026-09-23 对 192.168.21.203 连跑 8 次通过，剩余 SYSERR 只有 gr2 `NOT SUPPORT FILE`。d.2：Granny SDK 2.11 运行时在 libgr2 上实现（`platform/EterGrnLib/GrannyRuntime.cpp`，`shim/sdk/granny.h` 按 SDK 头声明所用类型与函数：文件/段、按类型定义的顶点转换含 half、材质贴图按 Usage 查找、网格绑定、变形器、控制器时钟/循环/缓入缓出、加权 SRT 采样与复合矩阵），`EterGrnLib/*.cpp`（LODController/Material/Mesh/Model/ModelInstance*/Motion/Thing/ThingInstance/Util）与 `EterLib/{GrpObjectInstance,GrpCollisionObject,CollisionData}.cpp` 原样移植，对应 platform 骨架与 pending 替身删除（port-map 标 PORTED）；`Resource.cpp` 注册 gr2 工厂（mdatr 等 `CAttributeData` 资源化时再注册）；VB/IB 为 CPU 缓冲（`platform/EterLib/CpuBuffer.h`），渲染 adapter 属 2V2-e。`app.UpdateGame`/`RenderGame`（40250 `PythonApplication.cpp:321/168`）接入，成员经单例访问（平台没有 `CPythonApplication` 对象），`CPythonGraphic`（含 `CCullingManager`）按成员顺序进 `GameSingletons`；`GetMousePosition` 读 host 光标。`port.login_flow` 断言主角 PART_MAIN 模型有网格、材质漫反射贴图已加载、WAIT 动作使骨骼矩阵逐帧变化；离线与 `port.login_live`（192.168.21.203）2026-09-23 通过 | - | 2V2-e | Godot 显示主角（渲染 adapter），离线 + 真服 smoke：进游戏看到可辨认的静止角色 | 进行中。e.1 完成：3D 绘制命令通道。`EterLib/StateManager.cpp`、`EterLib/GrpBase.cpp` 原样移植（platform 骨架删除，port-map 标 PORTED）；`CGraphicDevice::Create` 建平台 `IDirect3DDevice8`（`platform/EterLib/RecordingDevice.cpp`：记住 transform/渲染状态/贴图阶段/材质/灯光/FVF/流/索引，按 FVF 解码顶点、展开 strip/fan，每次 Draw* 记成一条 `Render3DDraw`，`RenderCommands3D.h`），默认 IB/PDT VB 为 CPU 缓冲；`D3DXMath` 补 `PerspectiveFovRH`/`OrthoRH`/`OrthoOffCenterRH` 与 `ID3DXMatrixStack`。相机：`PythonApplicationCamera.cpp` 原样移植 `__UpdateCamera`/`SetCamera`/`SetCenterPosition`/`GetCenterPosition` 等（成员放文件内静态结构，平台没有 `CPythonApplication` 对象），`Process` 按 40250 顺序调 `__UpdateCamera`→`OnCameraUpdate`→`OnUIUpdate`→`Begin`/`SetInterfaceRenderState`/`OnUIRender`/`End`；`CScreen::Begin/End/Set*Operation`、`CPythonGraphic::Set{Game,Interface}RenderState/PushState/PopState/GetOrthoDepth`、`CCullingManager::Process` 的 view/proj 更新（视锥剔除等 SphereLib）原样；`pending` 补 `CPythonPlayer::NEW_GetMainActorPosition/NEW_GetMainActorPtr/NEW_FindActorPtr/SetMainCharacterIndex`（事件处理器留待 `PythonPlayerEventHandler`）、`CMapManager::IsMapReady`。`port.login_flow` 断言某帧有贴图、带法线/UV 的三角形绘制，投影为 `SetPerspective` 的 RH 透视（_34=-1），且顶点全部落在屏幕内（相机对准主角）；离线与 `port.login_live`（192.168.21.203）2026-09-23 通过。e.2 完成：Godot 消费端 `project/python_3d_surface.gd`（`Metin2PythonHost.render3d_draws` 绑定）：每条透视绘制成一个 `MeshInstance3D`，变换为 world·view（D3D 行向量矩阵的行即基列），`Camera3D` 在原点，fov/near/far 从 `SetPerspective` 投影反推；材质按贴图/混合/alpha test/剔除/光照状态缓存，贴图只从 40250 包取（`UiAssets.load_pack_tex`，包名保留 `d:` 盘符）。`CPythonBackground::GetFarClip` 原样移植（`m_pkMap` 为空 → 50000），`CMapManager` 构造原样（`m_pkMap=NULL`）。PORT 替身：地图未移植前没有环境数据（`LoadMap`→`SetEnvironmentData`→`SetCharacterDirLight`），D3D 会把受光网格画成全黑；「开光照、无灯、环境光与自发光为 0」的绘制按无光照贴图显示并计入 `unlit_stand_in_count`，随环境移植删除。`script/python_game_render_test.sh`（离线起 `port_fake_login_server`，`--live` 读 `MT_LIVE_*`）跑 `python_game_render_test.gd`：system.py 登录→选人→进游戏，4 条绘制（脸、Object05、身体、头发）全部带贴图，截图中心有角色；2026-09-23 离线通过。下一步 e.3 真服冒烟 | + | 2V2-e | Godot 显示主角（渲染 adapter），离线 + 真服 smoke：进游戏看到可辨认的静止角色 | 完成。e.1 完成：3D 绘制命令通道。`EterLib/StateManager.cpp`、`EterLib/GrpBase.cpp` 原样移植（platform 骨架删除，port-map 标 PORTED）；`CGraphicDevice::Create` 建平台 `IDirect3DDevice8`（`platform/EterLib/RecordingDevice.cpp`：记住 transform/渲染状态/贴图阶段/材质/灯光/FVF/流/索引，按 FVF 解码顶点、展开 strip/fan，每次 Draw* 记成一条 `Render3DDraw`，`RenderCommands3D.h`），默认 IB/PDT VB 为 CPU 缓冲；`D3DXMath` 补 `PerspectiveFovRH`/`OrthoRH`/`OrthoOffCenterRH` 与 `ID3DXMatrixStack`。相机：`PythonApplicationCamera.cpp` 原样移植 `__UpdateCamera`/`SetCamera`/`SetCenterPosition`/`GetCenterPosition` 等（成员放文件内静态结构，平台没有 `CPythonApplication` 对象），`Process` 按 40250 顺序调 `__UpdateCamera`→`OnCameraUpdate`→`OnUIUpdate`→`Begin`/`SetInterfaceRenderState`/`OnUIRender`/`End`；`CScreen::Begin/End/Set*Operation`、`CPythonGraphic::Set{Game,Interface}RenderState/PushState/PopState/GetOrthoDepth`、`CCullingManager::Process` 的 view/proj 更新（视锥剔除等 SphereLib）原样；`pending` 补 `CPythonPlayer::NEW_GetMainActorPosition/NEW_GetMainActorPtr/NEW_FindActorPtr/SetMainCharacterIndex`（事件处理器留待 `PythonPlayerEventHandler`）、`CMapManager::IsMapReady`。`port.login_flow` 断言某帧有贴图、带法线/UV 的三角形绘制，投影为 `SetPerspective` 的 RH 透视（_34=-1），且顶点全部落在屏幕内（相机对准主角）；离线与 `port.login_live`（192.168.21.203）2026-09-23 通过。e.2 完成：Godot 消费端 `project/python_3d_surface.gd`（`Metin2PythonHost.render3d_draws` 绑定）：每条透视绘制成一个 `MeshInstance3D`，变换为 world·view（D3D 行向量矩阵的行即基列），`Camera3D` 在原点，fov/near/far 从 `SetPerspective` 投影反推；材质按贴图/混合/alpha test/剔除/光照状态缓存，贴图只从 40250 包取（`UiAssets.load_pack_tex`，包名保留 `d:` 盘符）。`CPythonBackground::GetFarClip` 原样移植（`m_pkMap` 为空 → 50000），`CMapManager` 构造原样（`m_pkMap=NULL`）。PORT 替身：地图未移植前没有环境数据（`LoadMap`→`SetEnvironmentData`→`SetCharacterDirLight`），D3D 会把受光网格画成全黑；「开光照、无灯、环境光与自发光为 0」的绘制按无光照贴图显示并计入 `unlit_stand_in_count`，随环境移植删除。`script/python_game_render_test.sh`（离线起 `port_fake_login_server`，`--live` 读 `MT_LIVE_*`）跑 `python_game_render_test.gd`：system.py 登录→选人→进游戏，4 条绘制（脸、Object05、身体、头发）全部带贴图，截图中心有角色；2026-09-23 离线通过。e.3 完成：实服冒烟 `MT_LIVE_*` 指向 192.168.21.203，`--live` 进游戏后主角与周围狼群带正确贴图、HUD 在上（246 条绘制、10 张贴图）；修 `python_3d_surface.gd` 材质缓存键把 bool 交给 `%d`（格式化失败使所有绘制共用第一个材质即脸部贴图），测试加「每个贴图名一张贴图」断言；2026-09-23 离线与实服通过 | 4. **2V3 — 本地移动**：加入 `PythonPlayer`、`PythonPlayerInput*`、`PythonPlayerEventHandler`、 `InstanceBaseMovement`、`ActorInstance{Motion,Event,Position,Rotation,CollisionDetection}` 的实际依赖闭包。验收为输入经过新路径 改变位置/朝向、发送与 40250 相同的移动封包，并在离线边界测试和真服 smoke 中通过。接通时删除对应 legacy 玩法逻辑。 diff --git a/project/python_3d_surface.gd b/project/python_3d_surface.gd index f998eabb..ac3fb9cc 100644 --- a/project/python_3d_surface.gd +++ b/project/python_3d_surface.gd @@ -171,8 +171,9 @@ func _build_mesh(draw: Dictionary) -> ArrayMesh: func _material(draw: Dictionary) -> StandardMaterial3D: var lit: bool = draw["lighting"] and not _environment_missing(draw) - var key := "%s|%d|%d|%d|%d|%d|%d|%d|%s|%s" % [draw["texture0"], draw["alpha_blend"], draw["src_blend"], - draw["dest_blend"], draw["alpha_test"], draw["alpha_ref"], draw["cull_mode"], lit, + # alpha_blend / alpha_test / lit are bools: %d needs them as ints. + var key := "%s|%d|%d|%d|%d|%d|%d|%d|%s|%s" % [draw["texture0"], int(draw["alpha_blend"]), draw["src_blend"], + draw["dest_blend"], int(draw["alpha_test"]), draw["alpha_ref"], draw["cull_mode"], int(lit), draw["material_diffuse"], draw["material_emissive"]] if _materials.has(key): return _materials[key] diff --git a/project/python_game_render_test.gd b/project/python_game_render_test.gd index a34aa87f..bd211467 100644 --- a/project/python_game_render_test.gd +++ b/project/python_game_render_test.gd @@ -138,12 +138,18 @@ func run() -> void: textures.append(draw["texture0"]) report["textures"] = textures var surfaces_textured := 0 + var distinct_textures := {} for instance in world.find_children("Draw*", "MeshInstance3D", false, false): if instance.visible and instance.mesh: var material: StandardMaterial3D = instance.mesh.surface_get_material(0) if material and material.albedo_texture: surfaces_textured += 1 + distinct_textures[material.albedo_texture] = true report["surfaces_textured"] = surfaces_textured + report["distinct_textures"] = distinct_textures.size() + # Every texture name gets its own texture (face, body, hair are not one material). + _check(distinct_textures.size() == textures.size(), + "one texture per texture name (%d of %d)" % [distinct_textures.size(), textures.size()]) var bounds := [] for instance in world.find_children("Draw*", "MeshInstance3D", false, false): if instance.visible and instance.mesh: