From 6282199179ce66139473106fefe6ecd887a9e82d Mon Sep 17 00:00:00 2001 From: shenlei Date: Mon, 12 Oct 2026 17:44:04 +0900 Subject: [PATCH] Drive animation clocks from real frame time Water, network-actor, flying-effect and weapon-trace clocks used frames*0.033 or frames/60, and the sky box, effect.Update, fly.Update and render-target previews advanced a fixed 1/30 or 1/60 s per call, so their speed followed the frame rate. They now use the measured frame delta (game_clock = sum of dt in main; GetGameFrameDelta for the Python-driven paths; elapsed SDL ticks for render targets). --frames runs keep their fixed 0.033 s step. The SpeedTree wind update is left unchanged. Co-Authored-By: Claude Opus 5.5 --- src/app/main.cpp | 17 +++++++++-------- src/eter_render/CRenderTarget.cpp | 6 +++++- src/eter_render/CRenderTarget.h | 1 + src/scripting/python_app.cpp | 1 + src/scripting/python_app.h | 1 + src/scripting/python_background.cpp | 3 ++- src/scripting/python_native_modules.cpp | 6 ++++-- 7 files changed, 23 insertions(+), 12 deletions(-) diff --git a/src/app/main.cpp b/src/app/main.cpp index e011a839..a3dd9e82 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -370,6 +370,7 @@ int main(int argc, char** argv) { bool running = true, requested = false, entered = false; int frames = 0, focus = 4; + float game_clock = 0.0f; // seconds of game time (sum of dt); deterministic under --frames std::string local_error, last_phase; auto deadline = std::chrono::steady_clock::now() + std::chrono::seconds(60); @@ -1686,6 +1687,7 @@ const auto profileActiveStart = std::chrono::steady_clock::now(); prev_frame_time = cur_time; if (frame_limit > 0) dt = 0.033f; else dt = std::clamp(dt, 0.001f, 0.25f); + game_clock += dt; #ifdef AVA2_HAS_PYTHON if (python) { @@ -1819,7 +1821,7 @@ const auto profileActiveStart = std::chrono::steady_clock::now(); ava2::SoundManager::Instance().SetPosition(player_actor.GetX(), player_actor.GetY(), player_actor.GetZ()); ava2::SoundManager::Instance().Update(dt); ava2::EffectManager::Instance().Update(dt); - ava2::FlyingManager::Instance().Update(dt, static_cast(frames) / 60.0f); + ava2::FlyingManager::Instance().Update(dt, game_clock); // Drive PythonNetworkStream and NetworkActorManager ava2::PythonNetworkStream::Instance().ProcessRecvData(); @@ -1854,7 +1856,7 @@ const auto profileActiveStart = std::chrono::steady_clock::now(); if (player_actor.IsAttacking()) { float bx, by, bz; if (player_actor.GetBonePosition("equip_right_hand", bx, by, bz)) { - player_weapon_trace.UpdateNewPosition(bx, by, bz, static_cast(frames) / 60.0f); + player_weapon_trace.UpdateNewPosition(bx, by, bz, game_clock); } } @@ -1972,7 +1974,7 @@ const auto profileActiveStart = std::chrono::steady_clock::now(); const auto profileBuildStart = std::chrono::steady_clock::now(); if (last_phase == "game") { // Update outdoor SkyBox, Clouds UV scrolling & dynamic environment - outdoor_skybox.Update(0.033f); + outdoor_skybox.Update(dt); outdoor_forest.UpdateSystem(0.033f); // Atmospheric Environment Fog (modeled after 40250 CMapOutdoor & .msenv) @@ -2057,8 +2059,7 @@ const auto profileActiveStart = std::chrono::steady_clock::now(); // Add water surface (translucent, animated) if (outdoor_water.HasWater()) { - float anim_time = static_cast(frames) * 0.033f; - auto water_draw = outdoor_water.BuildDrawCommand(anim_time); + auto water_draw = outdoor_water.BuildDrawCommand(game_clock); draws.push_back(std::move(water_draw)); } @@ -2113,7 +2114,7 @@ const auto profileActiveStart = std::chrono::steady_clock::now(); auto dog_draws = preview_data ? mob_dog.BuildDrawCommands() : std::vector{}; auto metin_draws = preview_data ? mob_metin.BuildDrawCommands() : std::vector{}; ava2::NetworkActorManager::Instance().UpdateLODLevel(eyeX, eyeY, eyeZ, player_world_x, player_world_z); - auto net_draws = ava2::NetworkActorManager::Instance().BuildDrawCommands(static_cast(frames) * 0.033f, renderer3d->GetViewMatrix(), renderer3d->GetProjMatrix()); + auto net_draws = ava2::NetworkActorManager::Instance().BuildDrawCommands(game_clock, renderer3d->GetViewMatrix(), renderer3d->GetProjMatrix()); if (until_game && rendered_game_frames == 20) { for (const auto& entry : ava2::NetworkActorManager::Instance().GetActorDict()) { const auto& npc=entry.second; @@ -2161,9 +2162,9 @@ const auto profileActiveStart = std::chrono::steady_clock::now(); // Add Particle effects, projectiles, and weapon ribbon trails float camPos[3] = {eyeX, eyeY, eyeZ}; ava2::EffectManager::Instance().BuildDrawCommands(renderer3d->GetViewMatrix(), renderer3d->GetProjMatrix(), camPos, draws); - ava2::FlyingManager::Instance().BuildDrawCommands(renderer3d->GetViewMatrix(), renderer3d->GetProjMatrix(), static_cast(frames) / 60.0f, draws); + ava2::FlyingManager::Instance().BuildDrawCommands(renderer3d->GetViewMatrix(), renderer3d->GetProjMatrix(), game_clock, draws); if (!player_weapon_trace.IsEmpty()) { - player_weapon_trace.BuildDrawCommands(renderer3d->GetViewMatrix(), renderer3d->GetProjMatrix(), static_cast(frames) / 60.0f, draws); + player_weapon_trace.BuildDrawCommands(renderer3d->GetViewMatrix(), renderer3d->GetProjMatrix(), game_clock, draws); } } else { renderer3d->SetFog(false); diff --git a/src/eter_render/CRenderTarget.cpp b/src/eter_render/CRenderTarget.cpp index 257e022f..53b67125 100644 --- a/src/eter_render/CRenderTarget.cpp +++ b/src/eter_render/CRenderTarget.cpp @@ -265,7 +265,11 @@ void CRenderTarget::Render(SDL_Renderer* renderer, const SDL_FRect& destRect) { EnsureTextures(renderer); if (!m_surface || !m_texture) return; - Update(1.0f / 60.0f); + // Real elapsed time between renders, so preview animation/rotation speed is frame-rate independent. + const uint64_t now = SDL_GetTicksNS(); + const float dt = m_lastUpdateNs ? std::clamp(float(now - m_lastUpdateNs) * 1e-9f, 0.0f, 0.25f) : 1.0f / 60.0f; + m_lastUpdateNs = now; + Update(dt); // If background exists, render background first directly to UI if (m_background) { diff --git a/src/eter_render/CRenderTarget.h b/src/eter_render/CRenderTarget.h index 06dc5ef5..8b865685 100644 --- a/src/eter_render/CRenderTarget.h +++ b/src/eter_render/CRenderTarget.h @@ -70,6 +70,7 @@ private: uint32_t m_acceVnum = 0; float m_rotation = 0.0f; + uint64_t m_lastUpdateNs = 0; float m_scale = 1.0f; float m_zoom = 1.0f; float m_pitch = 12.0f; diff --git a/src/scripting/python_app.cpp b/src/scripting/python_app.cpp index bfcf0c26..25890a4d 100644 --- a/src/scripting/python_app.cpp +++ b/src/scripting/python_app.cpp @@ -485,6 +485,7 @@ PyObject* app_set_guild_mark_path(PyObject*, PyObject* args) { void GetCameraInput(int& rotate,int& pitch,int& zoom) { rotate=cameraRotateInput; pitch=cameraPitchInput; zoom=cameraZoomInput; } void StopCameraInput() { cameraRotateInput=cameraPitchInput=cameraZoomInput=0; } void SetGameFrameDelta(float dt) { gameFrameDelta = std::clamp(dt, 0.001f, 0.25f); } +float GetGameFrameDelta() { return gameFrameDelta; } std::int32_t GetServerTimeStamp() { return server_clock.timestamp(unix_seconds()); } void SetServerTime(std::int32_t time) { server_clock.set(time,local_milliseconds(),unix_seconds()); } std::uint32_t GetLocalMSec() { return local_milliseconds(); } diff --git a/src/scripting/python_app.h b/src/scripting/python_app.h index 72c123b2..7e34896b 100644 --- a/src/scripting/python_app.h +++ b/src/scripting/python_app.h @@ -20,6 +20,7 @@ unsigned GetDefaultCodePage(); bool LoadLocaleData(const std::string& localePath); float GetCameraZoomSpeed(); void SetGameFrameDelta(float dt); +float GetGameFrameDelta(); void GetCameraInput(int& rotate,int& pitch,int& zoom); void StopCameraInput(); bool ConsumeCameraSetting(float& distance,float& pitch,float& yaw,float& height); diff --git a/src/scripting/python_background.cpp b/src/scripting/python_background.cpp index 95a97398..94bac85f 100644 --- a/src/scripting/python_background.cpp +++ b/src/scripting/python_background.cpp @@ -1,4 +1,5 @@ #include "python_background.h" +#include "python_app.h" #include "python_minimap.h" #include "python_runtime.h" #include "python_system.h" @@ -596,7 +597,7 @@ void CPythonBackground::Update(float fCenterX, float fCenterY, float fCenterZ) { m_mapObjects->SetLoadingCenter(fCenterX, fCenterZ, std::max(5000.0f, CPythonSystem::Instance().GetObjectDistance())); } if (m_skybox) { - m_skybox->Update(0.033f); + m_skybox->Update(GetGameFrameDelta()); } if (m_forest) { m_forest->UpdateSystem(0.033f); diff --git a/src/scripting/python_native_modules.cpp b/src/scripting/python_native_modules.cpp index 685441ce..bce6dc68 100644 --- a/src/scripting/python_native_modules.cpp +++ b/src/scripting/python_native_modules.cpp @@ -750,7 +750,7 @@ static PyObject* effect_RegisterIndexedFlyData(PyObject*, PyObject* args) { } static PyObject* effect_Update(PyObject*, PyObject*) { - ava2::EffectManager::Instance().Update(1.0f / 60.0f); + ava2::EffectManager::Instance().Update(ava2::GetGameFrameDelta()); Py_RETURN_NONE; } @@ -795,7 +795,9 @@ void initeffect() { } static PyObject* fly_Update(PyObject*, PyObject*) { - ava2::FlyingManager::Instance().Update(1.0f / 60.0f, 0.0f); + static float flyingTime = 0.0f; + flyingTime += ava2::GetGameFrameDelta(); + ava2::FlyingManager::Instance().Update(ava2::GetGameFrameDelta(), flyingTime); Py_RETURN_NONE; }