16
0
mirror of https://github.com/MaSzyna-EU07/maszyna.git synced 2026-07-18 01:59:19 +02:00

Add EU7 PACK v11 UTEX, section unload, and LRU streaming caches

Bake deduplicated section texture lists (UTEX) and read them at runtime so
texture warm/prefetch no longer scans every instance. Evict PACK sections
outside a 16 km keep ring and cap mesh/nodedata/texture warm caches to stop
RAM and apply cost from growing without bound during long fast camera flight.

- Bake v11 (format=4): UMES + UTEX + CHNK; mesh/texture ordering by frequency
- Runtime: incremental UTEX warm, adaptive apply slices, preempt/catchup tuning
- Unload: track instances per section, Region erase, pack pool release
- LRU: mesh/nodedata (2000, ref-counted), warmed textures (2048)
- Bench/diagnostics: unload and cache eviction counters
- Fix pack instance erase in Region; resolve duplicate helper symbols
This commit is contained in:
maj00r
2026-06-14 21:22:50 +02:00
parent 56d72fb25e
commit 2ee5f93353
16 changed files with 1228 additions and 104 deletions

View File

@@ -34,6 +34,7 @@ http://mozilla.org/MPL/2.0/.
#include "scene/eu7/eu7_loader.h"
#include "scene/eu7/eu7_load_stats.h"
#include "scene/eu7/eu7_pack_bench.h"
#include "scene/eu7/eu7_section.h"
#include "scene/eu7/eu7_transform.h"
#include "world/Track.h"
#include "world/Traction.h"
@@ -285,19 +286,11 @@ pack_model_needs_full_load( scene::eu7::Eu7Model const &model ) {
|| false == model.transition;
}
[[nodiscard]] std::string
pack_nodedata_cache_key( scene::eu7::Eu7Model const &model ) {
return model.model_file + '\x1f' + model.texture_file + '\x1f'
+ std::to_string( model.node.range_squared_min ) + '\x1f'
+ std::to_string( model.node.range_squared_max ) + '\x1f'
+ ( model.is_terrain ? '1' : '0' );
}
[[nodiscard]] scene::node_data const &
pack_nodedata_cached(
scene::eu7::Eu7Model const &model,
std::unordered_map<std::string, scene::node_data> &cache ) {
auto const key { pack_nodedata_cache_key( model ) };
auto const key { scene::eu7::pack_nodedata_cache_key( model ) };
auto const found { cache.find( key ) };
if( found != cache.end() ) {
return found->second;
@@ -581,6 +574,11 @@ state_serializer::insert_eu7_pack_models(
scene::eu7::pack_bench_inc( &scene::eu7::Eu7PackBench::main_region_inserts );
scene::eu7::pack_bench_inc( &scene::eu7::Eu7PackBench::main_instances_applied );
}
if(
session != nullptr &&
session->section_idx != std::numeric_limits<std::size_t>::max() ) {
m_pack_section_instances[ session->section_idx ].push_back( instance );
}
}
}
@@ -894,6 +892,37 @@ state_serializer::apply_eu7_pack_models(
insert_eu7_pack_models( models + offset, count, scratchpad, session );
}
std::size_t
state_serializer::unload_eu7_pack_section( int const row, int const column ) {
auto const section_idx { scene::eu7::section_index( row, column ) };
auto found { m_pack_section_instances.find( section_idx ) };
if( found == m_pack_section_instances.end() || found->second.empty() ) {
m_pack_section_instances.erase( section_idx );
return 0;
}
std::size_t removed { 0 };
for( auto *instance : found->second ) {
if( instance == nullptr ) {
continue;
}
Particles.erase_bound_node( instance );
if( simulation::Region != nullptr ) {
simulation::Region->erase( instance );
}
TAnimModel::release_pack_instance( instance );
++removed;
}
m_pack_section_instances.erase( found );
return removed;
}
void
state_serializer::reset_eu7_pack_section_instances() {
m_pack_section_instances.clear();
}
void
state_serializer::apply_eu7_scene(
scene::eu7::Eu7Scene const &scene,

View File

@@ -9,12 +9,15 @@ http://mozilla.org/MPL/2.0/.
#pragma once
#include <limits>
#include <unordered_map>
#include <vector>
#include "utilities/parser.h"
#include "scene/eu7/eu7_types.h"
#include "scene/scene.h"
class TAnimModel;
class TModel3d;
namespace simulation {
@@ -22,6 +25,7 @@ namespace simulation {
struct eu7_pack_apply_session {
std::unordered_map<std::string, TModel3d *> *mesh_cache { nullptr };
std::unordered_map<std::string, scene::node_data> *nodedata_cache { nullptr };
std::size_t section_idx { std::numeric_limits<std::size_t>::max() };
};
struct deserializer_state {
@@ -108,8 +112,14 @@ public:
// Odlozone sklady AI — ladowane w tle po wejsciu w gre.
void
drain_deferred_eu7_trainsets( double MaxMs = 12.0 );
// PACK streaming: usun instancje sekcji z Region i zwolnij pool.
[[nodiscard]] std::size_t
unload_eu7_pack_section( int Row, int Column );
void
reset_eu7_pack_section_instances();
private:
std::unordered_map<std::size_t, std::vector<TAnimModel *>> m_pack_section_instances;
struct eu7_transform_state;
void
insert_eu7_models(