diff --git a/src/app/main.cpp b/src/app/main.cpp index 34fa185f..8ed4c5c4 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -2023,7 +2023,7 @@ const auto profileActiveStart = std::chrono::steady_clock::now(); #ifdef AVA2_HAS_PYTHON bool bg_rendered = false; if (ava2::CPythonBackground::Instance().IsMapReady()) { - ava2::CPythonBackground::Instance().Update(eyeX, eyeY, eyeZ); + ava2::CPythonBackground::Instance().Update(player_world_x, player_world_y, player_world_z); float camPos[3] = {eyeX, eyeY, eyeZ}; ava2::CPythonBackground::Instance().BuildDrawCommands(renderer3d->GetViewMatrix(), renderer3d->GetProjMatrix(), camPos, draws, &draw_refs); bg_rendered = true; diff --git a/src/eter_render/MapObjectManager.cpp b/src/eter_render/MapObjectManager.cpp index fd2a7243..20f98902 100644 --- a/src/eter_render/MapObjectManager.cpp +++ b/src/eter_render/MapObjectManager.cpp @@ -386,6 +386,10 @@ void MapObjectManager::AppendDrawRefs(const float* view, const float* proj, std: const float* light_direction, const float* light_ambient) const { for (const auto& obj : m_objects) { if (!obj.model) continue; + if (m_maxDistanceSq > 0.0f) { + const float dx = obj.x - m_centerX, dz = obj.z - m_centerZ; + if (dx * dx + dz * dz >= m_maxDistanceSq) continue; + } float world[16]; MakeFullTransformMatrix(obj.yaw, obj.pitch, obj.roll, obj.x, obj.y, obj.z, obj.scale, world); diff --git a/src/eter_render/MapObjectManager.h b/src/eter_render/MapObjectManager.h index e888bf06..81e0f847 100644 --- a/src/eter_render/MapObjectManager.h +++ b/src/eter_render/MapObjectManager.h @@ -149,6 +149,9 @@ public: size_t GetCachedModelCount() const { return m_model_cache.size(); } const std::vector& GetObjects() const { return m_objects; } + // CArea::__UpdateLoadedObjectInstances (ENABLE_MAP_OBJECT_OPTIMIZATION): objects farther than + // maxDistance (2D, from the main actor) are not drawn. maxDistance <= 0 draws everything. + void SetLoadingCenter(float x, float z, float maxDistance) { m_centerX = x; m_centerZ = z; m_maxDistanceSq = maxDistance > 0.0f ? maxDistance * maxDistance : 0.0f; } private: const std::vector& CollisionCandidates(float x,float z,float radius) const; @@ -162,6 +165,7 @@ private: std::unordered_map> m_model_cache; mutable std::unordered_map>> m_meshStreams; std::vector m_objects; + float m_centerX = 0.0f, m_centerZ = 0.0f, m_maxDistanceSq = 0.0f; }; } // namespace ava2 diff --git a/src/scripting/python_background.cpp b/src/scripting/python_background.cpp index 64a66e23..79eee974 100644 --- a/src/scripting/python_background.cpp +++ b/src/scripting/python_background.cpp @@ -589,8 +589,12 @@ void CPythonBackground::DeleteSpecialEffect(uint32_t dwID) { (void)dwID; } -void CPythonBackground::Update(float fCameraX, float fCameraY, float fCameraZ) { - (void)fCameraX; (void)fCameraY; (void)fCameraZ; +void CPythonBackground::Update(float fCenterX, float fCenterY, float fCenterZ) { + (void)fCenterY; + if (m_mapObjects) { + // CArea::GetMaxLoadingDistanceSqr: OBJECT_DIST, never under 5000. + m_mapObjects->SetLoadingCenter(fCenterX, fCenterZ, std::max(5000.0f, CPythonSystem::Instance().GetObjectDistance())); + } if (m_skybox) { m_skybox->Update(0.033f); } diff --git a/src/scripting/python_background.h b/src/scripting/python_background.h index e47cb095..d4491024 100644 --- a/src/scripting/python_background.h +++ b/src/scripting/python_background.h @@ -184,7 +184,8 @@ public: void CreateSpecialEffect(uint32_t dwID, float fx, float fy, float fz, const char* szFileName); void DeleteSpecialEffect(uint32_t dwID); - void Update(float fCameraX, float fCameraY, float fCameraZ); + // Original CPythonApplication passes the main actor position (map-object loading center). + void Update(float fCenterX, float fCenterY, float fCenterZ); void Render(); void RenderSky();