AVA2 client Windows parity passes (gr2 BitKnit2/64-bit, GamePhase handlers, python modules)
- gr2: BitKnit2 decompression, 64-bit LE files, compressed curves - net: remaining GamePhase handlers, generated GC packet table - python: event/chat/chr/minimap/guild/quest/messenger/shop-search and other native modules ported against the AVA2 Windows client - render: D3D8 fixed-function lighting in Gr2ModelRenderer, terrain without baked shade; cape/NPC equipment attachment - tests + audits updated; docs/PORT-PLAN.md and WINDOWS-PARITY.md Batch 4 (render pipeline: background.*, app.RenderGame/UpdateGame, camera bindings, main.cpp fake-content removal) is still in progress. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
co-authored by
Claude Opus 5.5
parent
9f748eb05a
commit
9077aa389a
@@ -16,8 +16,14 @@
|
||||
#include <cassert>
|
||||
#include <iostream>
|
||||
#include <filesystem>
|
||||
#include "test_rundir.h"
|
||||
|
||||
using ava2_test::kSkip;
|
||||
using ava2_test::PackMaker;
|
||||
|
||||
int main(int argc, char** argv) {
|
||||
if (!ava2_test::EnterTestRunDir()) return kSkip;
|
||||
|
||||
std::string model_path = "ymir work/pc/warrior/warrior_assasin1.gr2";
|
||||
if (argc > 1) {
|
||||
model_path = argv[1];
|
||||
@@ -29,8 +35,20 @@ int main(int argc, char** argv) {
|
||||
} else if (std::filesystem::exists("../" + model_path)) {
|
||||
model_path = "../" + model_path;
|
||||
} else {
|
||||
std::cerr << "Model file not found: " << model_path << std::endl;
|
||||
return 1;
|
||||
std::cerr << "SKIP: model file not found: " << model_path << std::endl;
|
||||
return kSkip;
|
||||
}
|
||||
}
|
||||
|
||||
// The scene below loads cwd-relative client assets (merged `ymir work`, bgm, sound),
|
||||
// like the Windows client root. Without them the asserts would only report the
|
||||
// environment, so skip instead; when they are present every check runs.
|
||||
for (const char* required : {"ymir work/zone/b/obj/b_general_obj_01_2.gr2",
|
||||
"bgm/login_window.mp3",
|
||||
"sound/ui/click.wav"}) {
|
||||
if (!std::filesystem::exists(required)) {
|
||||
std::cerr << "SKIP: client asset missing from working directory: " << required << std::endl;
|
||||
return kSkip;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -259,13 +277,13 @@ int main(int argc, char** argv) {
|
||||
// ── Test Terrain Heightmap & Outdoor Scene Rendering ────────────────────
|
||||
std::cout << "\n── Testing Terrain Heightmap & Outdoor Scene Rendering ──" << std::endl;
|
||||
ava2::TerrainHeightmap terrain;
|
||||
std::string raw_path = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/metin2_map_a1/001003/height.raw";
|
||||
std::string raw_path = PackMaker() + "/Maps/metin2_map_a1/001003/height.raw";
|
||||
if (std::filesystem::exists(raw_path)) {
|
||||
bool raw_ok = terrain.LoadRaw(raw_path, 0.5f, 50.0f);
|
||||
std::cout << "Loaded Metin2 height.raw: " << (raw_ok ? "SUCCESS" : "FAILED") << std::endl;
|
||||
assert(raw_ok && "Metin2 height.raw must load successfully");
|
||||
|
||||
std::string tile_path = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/metin2_map_a1/001003/tile.raw";
|
||||
std::string tile_path = PackMaker() + "/Maps/metin2_map_a1/001003/tile.raw";
|
||||
if (std::filesystem::exists(tile_path)) {
|
||||
bool tile_ok = terrain.LoadTileRaw(tile_path);
|
||||
std::cout << "Loaded Metin2 tile.raw: " << (tile_ok ? "SUCCESS" : "FAILED") << std::endl;
|
||||
@@ -306,11 +324,11 @@ int main(int argc, char** argv) {
|
||||
assert(added_bldg && "Building model must instantiate successfully");
|
||||
|
||||
// Test AreaData & Property scanning
|
||||
std::string prop_dir = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/property/property";
|
||||
std::string prop_dir = PackMaker() + "/property/property";
|
||||
if (std::filesystem::exists(prop_dir)) {
|
||||
obj_mgr.RegisterProperty(234517142, bldg_path);
|
||||
assert(obj_mgr.GetPropertyCount() >= 1);
|
||||
std::string areadata_path = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/metin2_map_a1/001003/areadata.txt";
|
||||
std::string areadata_path = PackMaker() + "/Maps/metin2_map_a1/001003/areadata.txt";
|
||||
if (std::filesystem::exists(areadata_path)) {
|
||||
obj_mgr.LoadAreaData(areadata_path, 0.05f);
|
||||
std::cout << "Loaded objects from areadata.txt: " << obj_mgr.GetObjectCount() << std::endl;
|
||||
@@ -369,7 +387,7 @@ int main(int argc, char** argv) {
|
||||
// ── Test WaterManager & Fog Rendering ──────────────────────────────────
|
||||
std::cout << "\n── Testing WaterManager & Depth Fog System ──" << std::endl;
|
||||
ava2::WaterManager water_mgr;
|
||||
std::string water_file = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/metin2_map_a1/001003/water.wtr";
|
||||
std::string water_file = PackMaker() + "/Maps/metin2_map_a1/001003/water.wtr";
|
||||
if (std::filesystem::exists(water_file)) {
|
||||
bool water_loaded = water_mgr.LoadWater(water_file, 40.0f, 0.5f, 40.0f, -2560.0f, -2560.0f);
|
||||
assert(water_loaded && "Failed to load water.wtr");
|
||||
@@ -521,7 +539,7 @@ int main(int argc, char** argv) {
|
||||
// ── Test MinimapManager (Radar Minimap System) ──────────────────────────
|
||||
std::cout << "\n── Testing MinimapManager (Radar Minimap System) ──" << std::endl;
|
||||
ava2::MinimapManager minimap;
|
||||
std::string minimap_test_path = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/metin2_map_a1/001003/minimap.dds";
|
||||
std::string minimap_test_path = PackMaker() + "/Maps/metin2_map_a1/001003/minimap.dds";
|
||||
if (std::filesystem::exists(minimap_test_path)) {
|
||||
bool m_ok = minimap.LoadMinimap(minimap_test_path);
|
||||
std::cout << "Loaded Metin2 minimap.dds: " << (m_ok ? "SUCCESS" : "FAILED")
|
||||
@@ -830,19 +848,19 @@ int main(int argc, char** argv) {
|
||||
|
||||
std::string test_raw = "map/metin2_map_a1/001003/height.raw";
|
||||
if (!std::filesystem::exists(test_raw)) {
|
||||
test_raw = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/metin2_map_a1/001003/height.raw";
|
||||
test_raw = PackMaker() + "/Maps/metin2_map_a1/001003/height.raw";
|
||||
}
|
||||
std::string test_tile = "map/metin2_map_a1/001003/tile.raw";
|
||||
if (!std::filesystem::exists(test_tile)) {
|
||||
test_tile = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/metin2_map_a1/001003/tile.raw";
|
||||
test_tile = PackMaker() + "/Maps/metin2_map_a1/001003/tile.raw";
|
||||
}
|
||||
std::string test_attr = "map/metin2_map_a1/001003/attr.atr";
|
||||
if (!std::filesystem::exists(test_attr)) {
|
||||
test_attr = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/metin2_map_a1/001003/attr.atr";
|
||||
test_attr = PackMaker() + "/Maps/metin2_map_a1/001003/attr.atr";
|
||||
}
|
||||
std::string test_tset = "textureset/metin2_map1.txt";
|
||||
if (!std::filesystem::exists(test_tset)) {
|
||||
test_tset = "/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Maps/textureset/metin2_map1.txt";
|
||||
test_tset = PackMaker() + "/textureset/textureset/metin2_map1.txt";
|
||||
}
|
||||
|
||||
if (std::filesystem::exists(test_raw)) {
|
||||
@@ -1003,7 +1021,7 @@ int main(int argc, char** argv) {
|
||||
std::vector<ava2::CharacterSoundEvent> mss_events;
|
||||
bool mss_loaded = snd.LoadCharacterSoundScript("sound/pc/warrior/skill/samyeon.mss", mss_events);
|
||||
if (!mss_loaded) {
|
||||
mss_loaded = snd.LoadCharacterSoundScript("/Users/shen/Work/Code/Metin2/AVA2/TEST/1. Client DEV/pack_maker/Sound/sound/pc/warrior/skill/samyeon.mss", mss_events);
|
||||
mss_loaded = snd.LoadCharacterSoundScript(PackMaker() + "/Sound/sound/pc/warrior/skill/samyeon.mss", mss_events);
|
||||
}
|
||||
assert(mss_loaded && "Samyeon .mss script must be loaded");
|
||||
assert(mss_events.size() == 2 && "Samyeon .mss must have exactly 2 sound events");
|
||||
|
||||
Reference in New Issue
Block a user