Merge

src/dialogue/DialogueRuntime.h

@@ -63,6 +63,8 @@ private:
 	
 	int currentCutsceneLine = -1;
 	int cutsceneTimerMs = 0;
+	int cutsceneElapsedMs = 0;
+	int cutsceneTotalDurationMs = 0;
 
 	std::string currentCutsceneBackground;
 
@@ -73,11 +75,15 @@ private:
 	void presentLine(const Node& node);
 	void presentChoices(const Node& node);
 	void startCutscene(const std::string& cutsceneId, const std::string& nextNodeAfterCutscene);
+	void finishCutscene();
 
 	void advanceCutsceneLine();
 	void refreshCutscenePresentation();
+	CutsceneCameraBlendState evaluateCutsceneCameraBlend() const;
 
+	static float applyEasing(EasingType easing, float t);
 	static int computeFallbackCutsceneDurationMs(const std::string& text);
+	static int computeCameraTrackDurationMs(const StaticCutsceneDefinition& cutscene);
 };
 
-} // namespace ZL::Dialogue
+} // namespace ZL::Dialogue