fix: share weather cadence across renderers

This commit is contained in:
OpenAI Codex
2026-09-07 15:16:11 +08:00
parent 8d12a4b361
commit ab86eb8f67
9 changed files with 124 additions and 57 deletions

View File

@@ -621,18 +621,34 @@ TEST(Source, RasterArrayTimelineCadenceUsesOneSharedDeterministicDeadline) {
}
style::RasterArrayTimelineRuntime timeline{std::move(entries)};
const auto start = std::chrono::steady_clock::time_point{} + std::chrono::seconds(1);
EXPECT_TRUE(timeline.cadenceDue(start));
timeline.markCadenceTick(start);
EXPECT_TRUE(timeline.setTargetFps(style::RasterArrayTargetFps::Fps30));
EXPECT_TRUE(timeline.cadenceDue(start));
timeline.markCadenceTick(start);
const auto weatherColorAdvance = timeline.advanceIfDue(start);
EXPECT_TRUE(weatherColorAdvance.advanced);
const auto particleSameDeadline = timeline.advanceIfDue(start);
EXPECT_FALSE(particleSameDeadline.advanced);
EXPECT_EQ(particleSameDeadline.frame.cadenceRevision, weatherColorAdvance.frame.cadenceRevision);
EXPECT_FALSE(timeline.cadenceDue(start + std::chrono::milliseconds(33)));
EXPECT_TRUE(timeline.cadenceDue(start + std::chrono::milliseconds(34)));
const auto particleNextDeadline = timeline.advanceIfDue(start + std::chrono::milliseconds(34));
EXPECT_TRUE(particleNextDeadline.advanced);
const auto weatherColorLateSameDeadline = timeline.advanceIfDue(start + std::chrono::milliseconds(34));
EXPECT_FALSE(weatherColorLateSameDeadline.advanced);
EXPECT_TRUE(timeline.pause());
const auto pausedColorFrame = timeline.frame();
EXPECT_EQ(pausedColorFrame.state, style::RasterArrayPlaybackState::Paused);
// A paused WeatherColor-only layer asks no continuous repaint; if another
// map frame arrives, one shared advance is harmless and does not move MIX.
const auto pausedAdvance = timeline.advanceIfDue(start + std::chrono::milliseconds(68));
EXPECT_TRUE(pausedAdvance.advanced);
EXPECT_FLOAT_EQ(pausedAdvance.frame.mix, pausedColorFrame.mix);
EXPECT_TRUE(timeline.setTargetFps(style::RasterArrayTargetFps::Fps60));
EXPECT_TRUE(timeline.cadenceDue(start));
timeline.markCadenceTick(start);
EXPECT_FALSE(timeline.cadenceDue(start + std::chrono::milliseconds(16)));
EXPECT_TRUE(timeline.cadenceDue(start + std::chrono::milliseconds(17)));
const auto afterSwitch = timeline.advanceIfDue(start + std::chrono::milliseconds(68));
EXPECT_TRUE(afterSwitch.advanced);
EXPECT_FALSE(timeline.advanceIfDue(start + std::chrono::milliseconds(84)).advanced);
EXPECT_TRUE(timeline.advanceIfDue(start + std::chrono::milliseconds(85)).advanced);
const auto missedDeadline = timeline.advanceIfDue(start + std::chrono::seconds(5));
EXPECT_TRUE(missedDeadline.advanced);
EXPECT_FALSE(timeline.advanceIfDue(start + std::chrono::seconds(5)).advanced);
EXPECT_TRUE(timeline.setTargetFps(style::RasterArrayTargetFps::Auto));
EXPECT_TRUE(timeline.cadenceDue(start));
}