From 8a5e5ae75aed3661b6640f2478317e76fe20bdd9 Mon Sep 17 00:00:00 2001 From: Robin Kisman <99972691+KcRobin9@users.noreply.github.com> Date: Tue, 21 May 2024 14:42:33 +0200 Subject: [PATCH 1/3] Implement asRenderWeb::Load --- code/midtown/localize/lang_english.h | 6 +- code/midtown/localize/lang_german.h | 6 +- code/midtown/localize/lang_japan.h | 6 +- code/midtown/localize/lang_russian.h | 6 +- code/midtown/localize/string_ids.h | 6 +- code/midtown/mmcity/portal.h | 14 ++ code/midtown/mmcity/renderweb.cpp | 342 ++++++++++++++++++++++++++- code/midtown/mmcity/renderweb.h | 2 +- 8 files changed, 371 insertions(+), 17 deletions(-) diff --git a/code/midtown/localize/lang_english.h b/code/midtown/localize/lang_english.h index de068d89..c10035f7 100644 --- a/code/midtown/localize/lang_english.h +++ b/code/midtown/localize/lang_english.h @@ -35,9 +35,9 @@ X(MM_IDS_14, "Loading facades...") X(MM_IDS_15, "Gill Sans MT, 12, 24, 0, 400") X(MM_IDS_16, "Gill Sans MT, 12, 16, 0, 400") X(MM_IDS_17, "%d%% complete...") -X(MM_IDS_18, "Loading static terrain...") -X(MM_IDS_19, "Loading portal information...") -X(MM_IDS_20, "Loading collision database...") +X(MM_IDS_LOADING_STATIC_TERRAIN, "Loading static terrain...") +X(MM_IDS_LOADING_PORTAL_INFO, "Loading portal information...") +X(MM_IDS_LOADING_COLLISION_DATABASE, "Loading collision database...") X(MM_IDS_PLAYER_NAME, "Player") X(MM_IDS_LOADING_AUDIO, "Loading audio...") X(MM_IDS_LOADING_CITY, "Loading city...") diff --git a/code/midtown/localize/lang_german.h b/code/midtown/localize/lang_german.h index 990b71e9..8f855c7c 100644 --- a/code/midtown/localize/lang_german.h +++ b/code/midtown/localize/lang_german.h @@ -35,9 +35,9 @@ X(MM_IDS_14, "Fassaden werden geladen...") X(MM_IDS_15, "Gill Sans MT, 12, 24, 0, 400") X(MM_IDS_16, "Gill Sans MT, 12, 16, 0, 400") X(MM_IDS_17, "%d%% abgeschlossen...") -X(MM_IDS_18, "Statisches Gelände wird geladen...") -X(MM_IDS_19, "Eingangsdaten werden geladen...") -X(MM_IDS_20, "Kollisionsdatenbank wird geladen...") +X(MM_IDS_LOADING_STATIC_TERRAIN, "Statisches Gelände wird geladen...") +X(MM_IDS_LOADING_PORTAL_INFO, "Eingangsdaten werden geladen...") +X(MM_IDS_LOADING_COLLISION_DATABASE, "Kollisionsdatenbank wird geladen...") X(MM_IDS_PLAYER_NAME, "Spieler") X(MM_IDS_LOADING_AUDIO, "Audio wird geladen...") X(MM_IDS_LOADING_CITY, "Stadt wird geladen...") diff --git a/code/midtown/localize/lang_japan.h b/code/midtown/localize/lang_japan.h index 06cb89c9..f63601ef 100644 --- a/code/midtown/localize/lang_japan.h +++ b/code/midtown/localize/lang_japan.h @@ -35,9 +35,9 @@ X(MM_IDS_14, "建物データをロード中") X(MM_IDS_15, "ＭＳ Ｐゴシック, 10,14, 128, 400") X(MM_IDS_16, "ＭＳ Ｐゴシック, 10, 12, 128, 400") X(MM_IDS_17, "%d%% ロード完了...") -X(MM_IDS_18, "地形データをロード中") -X(MM_IDS_19, "橋データをロード中") -X(MM_IDS_20, "衝突データベースをロード中") +X(MM_IDS_LOADING_STATIC_TERRAIN, "地形データをロード中") +X(MM_IDS_LOADING_PORTAL_INFO, "橋データをロード中") +X(MM_IDS_LOADING_COLLISION_DATABASE, "衝突データベースをロード中") X(MM_IDS_PLAYER_NAME, "プレイヤー") X(MM_IDS_LOADING_AUDIO, "オーディオをロード中") X(MM_IDS_LOADING_CITY, "シティー データをロード中") diff --git a/code/midtown/localize/lang_russian.h b/code/midtown/localize/lang_russian.h index 68dabb2f..0e912d6f 100644 --- a/code/midtown/localize/lang_russian.h +++ b/code/midtown/localize/lang_russian.h @@ -35,9 +35,9 @@ X(MM_IDS_14, "Загружаю фасады...") X(MM_IDS_15, "System, 11, 22, 0, 400") X(MM_IDS_16, "System, 11, 14, 0, 400") X(MM_IDS_17, "%d%% закончено...") -X(MM_IDS_18, "Загружаю статические объекты...") -X(MM_IDS_19, "Загружаю порталы...") -X(MM_IDS_20, "Загружаю информацю о происшествиях...") +X(MM_IDS_LOADING_STATIC_TERRAIN, "Загружаю статические объекты...") +X(MM_IDS_LOADING_PORTAL_INFO, "Загружаю порталы...") +X(MM_IDS_LOADING_COLLISION_DATABASE, "Загружаю информацю о происшествиях...") X(MM_IDS_PLAYER_NAME, "Игрок") X(MM_IDS_LOADING_AUDIO, "Загружаю звук...") X(MM_IDS_LOADING_CITY, "Загружаю город...") diff --git a/code/midtown/localize/string_ids.h b/code/midtown/localize/string_ids.h index 2c218c65..dd2fbe74 100644 --- a/code/midtown/localize/string_ids.h +++ b/code/midtown/localize/string_ids.h @@ -35,9 +35,9 @@ #define MM_IDS_15 15 #define MM_IDS_16 16 #define MM_IDS_17 17 -#define MM_IDS_18 18 -#define MM_IDS_19 19 -#define MM_IDS_20 20 +#define MM_IDS_LOADING_STATIC_TERRAIN 18 +#define MM_IDS_LOADING_PORTAL_INFO 19 +#define MM_IDS_LOADING_COLLISION_DATABASE 20 #define MM_IDS_PLAYER_NAME 21 #define MM_IDS_LOADING_AUDIO 22 #define MM_IDS_LOADING_CITY 23 diff --git a/code/midtown/mmcity/portal.h b/code/midtown/mmcity/portal.h index 8af4acc2..c078fce8 100644 --- a/code/midtown/mmcity/portal.h +++ b/code/midtown/mmcity/portal.h @@ -51,6 +51,7 @@ */ #include "arts7/node.h" +#include "vector7/vector3.h" #include "vector7/vector4.h" struct asPortalCell; @@ -96,6 +97,19 @@ struct asPortalCell struct PtlPath** PtlPaths; }; +struct PtlPortal +{ + u8 Flags; + i8 EdgeCount; + i16 gap2; + i16 Cell1; + i16 Cell2; + f32 Height; + Vector3 Min; + Vector3 Max; + Vector3 ExtraEdge; +}; + check_size(asPortalCell, 0x18); class asPortalWeb : public asNode diff --git a/code/midtown/mmcity/renderweb.cpp b/code/midtown/mmcity/renderweb.cpp index 54b65f2b..df5f3289 100644 --- a/code/midtown/mmcity/renderweb.cpp +++ b/code/midtown/mmcity/renderweb.cpp @@ -20,9 +20,349 @@ define_dummy_symbol(mmcity_renderweb); #include "renderweb.h" +#include "agi/dlptmpl.h" +#include "agi/getdlp.h" +#include "data7/memstat.h" +#include "localize/localize.h" +#include "mmcityinfo/state.h" +#include "mmdyna/bndtmpl.h" +#include "mmdyna/bndtmpl2.h" +#include "stream/fsystem.h" +#include "stream/problems.h" +#include "stream/stream.h" + +#include "cellrend.h" +#include "loader.h" + static mem::cmd_param PARAM_mirrordist {"mirrordist"}; hook_func(INIT_main, [] { create_packed_patch( "Mirror Render Distance", "Adjust mirror render distance", 0x490E96 + 1, PARAM_mirrordist.get_or(200.0f)); -}); \ No newline at end of file +}); + +i32 asRenderWeb::Load(char* city_name, i32 enable_lm) +{ + char city_mesh[256]; + char lm_mesh[256]; + char hitid_name[256]; + char buffer[512]; // original: 128 + i32 visit_tags[512]; // original: 128 + char cull_problem_1[32]; + // char cull_problem_2[32]; + // char cull_problem_3[32]; + + i32 ptr = 0; + i32 room_flags = 0; + i32 visit_tag_count = 0; + + arts_sprintf(city_mesh, "%scity", city_name); + arts_sprintf(lm_mesh, "%slm", city_name); + + if (CellArray) + operator delete(CellArray); + + BeginMemStat("asRenderWeb::Load"); + + Stream* stream = OpenFile(city_name, "city", ".cells", 0, buffer, sizeof(buffer), "Cell info file"); + + if (!stream) + Quitf("Missing .cells file for '%s'", city_name); + + arts_fgets(buffer, sizeof(buffer), stream); + i32 num_cells = atoi(buffer); + + arts_fgets(buffer, sizeof(buffer), stream); + MaxCells = atoi(buffer) + 1; + + Loader()->BeginTask(AngelReadString(MM_IDS_LOADING_STATIC_TERRAIN)); + BeginMemStat("asRenderWeb CELLS"); + + CellArray = new asPortalCell*[MaxCells](); + memset(CellArray, 0, sizeof(asPortalCell*) * MaxCells); + + //////////////////////////////////////////////////////////////////////////////////// + + for (i32 i = 0; i < num_cells; ++i) + { + arts_fgets(buffer, sizeof(buffer), stream); + i32 cell_index = atoi(buffer); + + char* cull_flags_str = strchr(buffer, ',') + 1; + i32 cull_flags = atoi(cull_flags_str); + + char* context = nullptr; + char* token = arts_strtok(cull_flags_str, ", \n", &context); + + if (token) + room_flags = atoi(token); + + token = arts_strtok(nullptr, ", \n", &context); + + if (token) + visit_tag_count = atoi(token); + + for (i32 j = 0; j < visit_tag_count; ++j) + { + token = arts_strtok(nullptr, ", \n", &context); + visit_tags[j] = atoi(token); + } + + if (cell_index < 1 || cell_index > MaxCells) + Quitf("Bad cell index CULL%02d", cell_index); + + mmCellRenderer* rndr = new mmCellRenderer(); + rndr->Init(enable_lm ? lm_mesh : city_mesh, cell_index, cull_flags, room_flags, visit_tag_count, visit_tags); + + CellArray[cell_index] = asPortalWeb::AddCell(city_mesh, rndr, cell_index); + CellArray[cell_index]->Flags = cell_index == 24 || cell_index == 31 || cell_index == 32 || cell_index == 39; + } + + EndMemStat(); + Loader()->EndTask(0.16f); + + //////////////////////////////////////////////////////////////////////////////////// + + Loader()->BeginTask(AngelReadString(MM_IDS_LOADING_PORTAL_INFO)); + BeginMemStat("asRenderWeb PORTALS"); + + stream = OpenFile(city_name, "city", ".ptl", 0, buffer, sizeof(buffer), "portal file"); + + if (!stream) + Quitf("Missing .portal file for '%s'", city_name); + + stream->Read(reinterpret_cast(&ptr), sizeof(ptr)); + stream->Read(reinterpret_cast(&visit_tag_count), sizeof(visit_tag_count)); + + PtlPortal* portal_data = new PtlPortal[ptr]; + stream->Read(reinterpret_cast(portal_data), sizeof(PtlPortal) * ptr); + + //////////////////////////////////////////////////////////////////////////////////// + + for (i32 i = 0; i < visit_tag_count; ++i) + { + PtlPortal ptl {}; // Correct? + stream->Read(reinterpret_cast(&ptl), sizeof(PtlPortal) - sizeof(ptl.ExtraEdge)); + + if (ptl.EdgeCount == 3) + stream->Read(reinterpret_cast(&ptl.ExtraEdge), sizeof(ptl.ExtraEdge)); + + if (!ptl.Cell1 || ptl.Cell1 > MaxCells || (ptl.Cell2 && ptl.Cell2 > MaxCells)) + { + RegisterProblem("Bad portal index", city_name, arts_formatf<128>("%d or %d", ptl.Cell1, ptl.Cell2)); + continue; + } + + // Problematic I think + asPortalCell* cell_array_1 = CellArray[ptl.Cell1]; + asPortalCell* cell_array_2 = CellArray[ptl.Cell2]; + + if (cell_array_1 && cell_array_2) + { + asPortalWeb::AddEdge("PORTAL"_xconst, cell_array_1, cell_array_2, ptl.EdgeCount + 2); + + asPortalEdge* edge = new asPortalEdge(cell_array_1, cell_array_2, ptl.EdgeCount + 2); + edge->Groups = new Vector3[4]; + + if (ptl.EdgeCount == 2) + { + edge->Edges = new Vector3[4]; + edge->Edges[0] = {ptl.Min.x, ptl.Min.y + ptl.Height, ptl.Min.z}; + edge->Edges[0] = {ptl.Min.x, ptl.Min.y + ptl.Height, ptl.Min.z}; + edge->Edges[1] = {ptl.Max.x, ptl.Max.y + ptl.Height, ptl.Max.z}; + edge->Edges[2] = ptl.Max; + edge->Edges[3] = ptl.Min; + } + else + { + edge->Edges = new Vector3[5]; + edge->Edges[0] = {ptl.Min.x, ptl.Min.y + ptl.Height, ptl.Min.z}; + edge->Edges[1] = {ptl.Max.x, ptl.Max.y + ptl.Height, ptl.Max.z}; + edge->Edges[2] = ptl.Max; + edge->Edges[3] = ptl.ExtraEdge; + edge->Edges[4] = ptl.Min; + } + + edge->Plane.CalculatePlane(edge->Edges[0], edge->Edges[1], edge->Edges[2]); + edge->Flags |= ptl.Flags; + + delete[] edge->Edges; + delete[] edge->Groups; + delete edge; + } + + else + { + arts_sprintf(cull_problem_1, "CULL%02d", ptl.Cell1); + RegisterProblem("Cell doesn't exist [missing open area?]", city_name, cull_problem_1); + } + // register problem 2 & 3 + } + + delete[] portal_data; + stream->~Stream(); + + asPortalWeb::BuildGroups(); // does this work? + EndMemStat(); + + //////////////////////////////////////////////////////////////////////////////////// + + Loader()->EndTask(); + Loader()->BeginTask(AngelReadString(MM_IDS_LOADING_COLLISION_DATABASE)); + + BeginMemStat("asRenderWeb hitid bound"); + + arts_sprintf(hitid_name, "%s_hitid", city_name); + + HitIdBound = mmBoundTemplate::GetBoundTemplate(hitid_name, nullptr, nullptr, 1, 300, 1, 300, 0); + + if (HitIdBound) + { + HasHitIdBound = true; + } + else + { + HitIdBound = mmBoundTemplate::GetBoundTemplate(city_mesh, "BOUND"_xconst, nullptr, 1, 150, 1, 150, 0); + HasHitIdBound = false; + } + + EndMemStat(); + + //////////////////////////////////////////////////////////////////////////////////// + + BeginMemStat("asRenderWeb per-room bound"); + + Bounds = new mmBoundTemplate*[MaxCells](); + memset(Bounds, 0, sizeof(mmBoundTemplate*) * MaxCells); + + if (HasHitIdBound) + { + for (i32 i = 0; i < MaxCells; ++i) + { + if (!CellArray[i]) + continue; + + char* mesh = (i >= 200 || !enable_lm) ? city_mesh : lm_mesh; + char* bound_name = arts_formatf<128>("BOUND%02d"_xconst, i); + + if (CHICAGO) + { + if (i == 60) + { + Bounds[60] = + mmBoundTemplate::GetBoundTemplate("dl60_bnd"_xconst, bound_name, nullptr, 0, 0, 0, 0, 0); + continue; + } + if (i == 24) + { + Bounds[24] = + mmBoundTemplate::GetBoundTemplate("dl24_bnd"_xconst, bound_name, nullptr, 0, 0, 0, 0, 0); + continue; + } + if (i == 174) + { + Bounds[174] = + mmBoundTemplate::GetBoundTemplate("dl24_bnd"_xconst, bound_name, nullptr, 0, 0, 0, 0, 0); + continue; + } + } + + Bounds[i] = mmBoundTemplate::GetBoundTemplate(mesh, bound_name, nullptr, 0, 0, 0, 0, 0); + } + } + + //////////////////////////////////////////////////////////////////////////////////// + + else + { + DLPTemplate* city_template = GetDLPTemplate(city_mesh); + DLPTemplate* lm_template = GetDLPTemplate(lm_mesh); + + if (city_template) + { + for (i32 i = 0; i < MaxCells; ++i) + { + if (!CellArray[i]) + continue; + + char* mesh = (i >= 200 || !enable_lm) ? city_mesh : lm_mesh; + char* bound_name = arts_formatf<128>("BOUND%02d"_xconst, i); + + DLPTemplate* tmpl = new DLPTemplate(bound_name); + DLPGroup* grp = tmpl->GroupExists(bound_name); + + if (!grp) + { + Errorf("No group %s in %s", bound_name, city_name); + continue; + } + + i32 num_patches = static_cast(sqrt(grp->NumPatches)); + + if (num_patches > 30) + num_patches = 30; + + if (!CHICAGO) + { + if (num_patches <= 1) + { + Bounds[i] = mmBoundTemplate::GetBoundTemplate(mesh, bound_name, nullptr, 1, 0, 0, 0, 0); + } + else + { + Bounds[i] = mmBoundTemplate::GetBoundTemplate( + mesh, bound_name, nullptr, 1, num_patches, 1, num_patches, 0); + } + continue; + } + + if (i == 623 || i == 350) + num_patches = 1; + + if (i == 60) + { + Bounds[60] = mmBoundTemplate::GetBoundTemplate( + "dl60_bnd"_xconst, bound_name, nullptr, 1, num_patches, 1, num_patches, 0); + continue; + } + if (i == 24) + { + Bounds[24] = mmBoundTemplate::GetBoundTemplate( + "dl24_bnd"_xconst, bound_name, nullptr, 1, num_patches, 1, num_patches, 0); + continue; + } + if (i == 174) + { + Bounds[174] = mmBoundTemplate::GetBoundTemplate( + "dl24_bnd"_xconst, bound_name, nullptr, 1, num_patches, 1, num_patches, 0); + continue; + } + + Bounds[i] = + mmBoundTemplate::GetBoundTemplate(mesh, bound_name, nullptr, 1, num_patches, 1, num_patches, 0); + } + + city_template->Release(); + } + + if (lm_template) + { + lm_template->Release(); + } + else + { + Errorf("Not able to get city template"); + } + } + + //////////////////////////////////////////////////////////////////////////////////// + + if (MakeTableStats) + // ? + // MakeTableStats->Destructor(MakeTableStats, 1u); + + EndMemStat(); + EndMemStat(); + Loader()->EndTask(); + return 1; +} \ No newline at end of file diff --git a/code/midtown/mmcity/renderweb.h b/code/midtown/mmcity/renderweb.h index a8701e75..4b5ce391 100644 --- a/code/midtown/mmcity/renderweb.h +++ b/code/midtown/mmcity/renderweb.h @@ -119,7 +119,7 @@ class asRenderWeb final : public asPortalWeb ARTS_IMPORT asPortalCell* GetStartCell(Vector3& arg1, asPortalCell* arg2, mmPolygon** arg3) override; // ?Load@asRenderWeb@@QAEHPADH@Z - ARTS_IMPORT i32 Load(char* arg1, i32 arg2); + ARTS_EXPORT i32 Load(char* city_name, i32 enable_lm); // ?SetMirrorPos@asRenderWeb@@QAEXMMMMM@Z ARTS_IMPORT void SetMirrorPos(f32 arg1, f32 arg2, f32 arg3, f32 arg4, f32 arg5); From 7287158c89678fa80323ed27f254da0437ab5be2 Mon Sep 17 00:00:00 2001 From: Robin Kisman <99972691+KcRobin9@users.noreply.github.com> Date: Sat, 15 Jun 2024 23:26:48 +0200 Subject: [PATCH 2/3] Tweaked Renderweb --- code/midtown/mmcity/renderweb.cpp | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/midtown/mmcity/renderweb.cpp b/code/midtown/mmcity/renderweb.cpp index df5f3289..ca9234cf 100644 --- a/code/midtown/mmcity/renderweb.cpp +++ b/code/midtown/mmcity/renderweb.cpp @@ -46,8 +46,8 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) char city_mesh[256]; char lm_mesh[256]; char hitid_name[256]; - char buffer[512]; // original: 128 - i32 visit_tags[512]; // original: 128 + char buffer[512]; // original: 128 + i32 visit_tags[512] = {0}; // original: 128 char cull_problem_1[32]; // char cull_problem_2[32]; // char cull_problem_3[32]; @@ -60,7 +60,7 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) arts_sprintf(lm_mesh, "%slm", city_name); if (CellArray) - operator delete(CellArray); + delete[] CellArray; BeginMemStat("asRenderWeb::Load"); @@ -78,8 +78,8 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) Loader()->BeginTask(AngelReadString(MM_IDS_LOADING_STATIC_TERRAIN)); BeginMemStat("asRenderWeb CELLS"); - CellArray = new asPortalCell*[MaxCells](); - memset(CellArray, 0, sizeof(asPortalCell*) * MaxCells); + CellArray = new asPortalCell*[MaxCells]; + std::memset(CellArray, 0, sizeof(asPortalCell*) * MaxCells); //////////////////////////////////////////////////////////////////////////////////// @@ -111,10 +111,10 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) if (cell_index < 1 || cell_index > MaxCells) Quitf("Bad cell index CULL%02d", cell_index); - mmCellRenderer* rndr = new mmCellRenderer(); + mmCellRenderer* rndr = new mmCellRenderer; rndr->Init(enable_lm ? lm_mesh : city_mesh, cell_index, cull_flags, room_flags, visit_tag_count, visit_tags); - CellArray[cell_index] = asPortalWeb::AddCell(city_mesh, rndr, cell_index); + CellArray[cell_index] = AddCell(city_mesh, rndr, cell_index); CellArray[cell_index]->Flags = cell_index == 24 || cell_index == 31 || cell_index == 32 || cell_index == 39; } @@ -141,7 +141,7 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) for (i32 i = 0; i < visit_tag_count; ++i) { - PtlPortal ptl {}; // Correct? + PtlPortal ptl {}; stream->Read(reinterpret_cast(&ptl), sizeof(PtlPortal) - sizeof(ptl.ExtraEdge)); if (ptl.EdgeCount == 3) @@ -159,7 +159,7 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) if (cell_array_1 && cell_array_2) { - asPortalWeb::AddEdge("PORTAL"_xconst, cell_array_1, cell_array_2, ptl.EdgeCount + 2); + AddEdge("PORTAL"_xconst, cell_array_1, cell_array_2, ptl.EdgeCount + 2); asPortalEdge* edge = new asPortalEdge(cell_array_1, cell_array_2, ptl.EdgeCount + 2); edge->Groups = new Vector3[4]; @@ -202,7 +202,7 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) delete[] portal_data; stream->~Stream(); - asPortalWeb::BuildGroups(); // does this work? + BuildGroups(); EndMemStat(); //////////////////////////////////////////////////////////////////////////////////// @@ -360,8 +360,8 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) if (MakeTableStats) // ? // MakeTableStats->Destructor(MakeTableStats, 1u); - EndMemStat(); + EndMemStat(); Loader()->EndTask(); return 1; From 6b519924868f9370569150fba73940a7f94a5740 Mon Sep 17 00:00:00 2001 From: Robin Kisman <99972691+KcRobin9@users.noreply.github.com> Date: Thu, 20 Jun 2024 01:30:12 +0200 Subject: [PATCH 3/3] Formatting Tweaks --- code/midtown/mmcity/renderweb.cpp | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/code/midtown/mmcity/renderweb.cpp b/code/midtown/mmcity/renderweb.cpp index ca9234cf..4bcbe253 100644 --- a/code/midtown/mmcity/renderweb.cpp +++ b/code/midtown/mmcity/renderweb.cpp @@ -81,8 +81,6 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) CellArray = new asPortalCell*[MaxCells]; std::memset(CellArray, 0, sizeof(asPortalCell*) * MaxCells); - //////////////////////////////////////////////////////////////////////////////////// - for (i32 i = 0; i < num_cells; ++i) { arts_fgets(buffer, sizeof(buffer), stream); @@ -121,8 +119,6 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) EndMemStat(); Loader()->EndTask(0.16f); - //////////////////////////////////////////////////////////////////////////////////// - Loader()->BeginTask(AngelReadString(MM_IDS_LOADING_PORTAL_INFO)); BeginMemStat("asRenderWeb PORTALS"); @@ -137,8 +133,6 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) PtlPortal* portal_data = new PtlPortal[ptr]; stream->Read(reinterpret_cast(portal_data), sizeof(PtlPortal) * ptr); - //////////////////////////////////////////////////////////////////////////////////// - for (i32 i = 0; i < visit_tag_count; ++i) { PtlPortal ptl {}; @@ -202,14 +196,12 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) delete[] portal_data; stream->~Stream(); - BuildGroups(); - EndMemStat(); - - //////////////////////////////////////////////////////////////////////////////////// + BuildGroups(); + EndMemStat(); Loader()->EndTask(); - Loader()->BeginTask(AngelReadString(MM_IDS_LOADING_COLLISION_DATABASE)); + Loader()->BeginTask(AngelReadString(MM_IDS_LOADING_COLLISION_DATABASE)); BeginMemStat("asRenderWeb hitid bound"); arts_sprintf(hitid_name, "%s_hitid", city_name); @@ -228,8 +220,6 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) EndMemStat(); - //////////////////////////////////////////////////////////////////////////////////// - BeginMemStat("asRenderWeb per-room bound"); Bounds = new mmBoundTemplate*[MaxCells](); @@ -271,8 +261,6 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) } } - //////////////////////////////////////////////////////////////////////////////////// - else { DLPTemplate* city_template = GetDLPTemplate(city_mesh); @@ -346,20 +334,12 @@ i32 asRenderWeb::Load(char* city_name, i32 enable_lm) } if (lm_template) - { lm_template->Release(); - } else - { Errorf("Not able to get city template"); - } } - //////////////////////////////////////////////////////////////////////////////////// - - if (MakeTableStats) - // ? - // MakeTableStats->Destructor(MakeTableStats, 1u); + if (MakeTableStats) // ? // MakeTableStats->Destructor(MakeTableStats, 1u); EndMemStat(); EndMemStat();