From aefc5c5a77ae60f2c6a86dc5c1153abc81c1871e Mon Sep 17 00:00:00 2001 From: Steven Kirk Date: Thu, 3 Aug 2017 00:39:58 +0200 Subject: [PATCH] Scene.Id -> Scene.Generation. --- src/Avalonia.Visuals/Rendering/DeferredRenderer.cs | 6 +++--- src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs index 9cb12abbc9..9124f24d61 100644 --- a/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs +++ b/src/Avalonia.Visuals/Rendering/DeferredRenderer.cs @@ -182,17 +182,17 @@ namespace Avalonia.Rendering if (scene.Size != Size.Empty) { - if (scene.Id != _lastSceneId) + if (scene.Generation != _lastSceneId) { _layers.Update(scene); RenderToLayers(scene); if (DebugFramesPath != null) { - SaveDebugFrames(scene.Id); + SaveDebugFrames(scene.Generation); } - _lastSceneId = scene.Id; + _lastSceneId = scene.Generation; } RenderOverlay(scene); diff --git a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs index 6db092c266..a85fd36763 100644 --- a/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs +++ b/src/Avalonia.Visuals/Rendering/SceneGraph/Scene.cs @@ -28,7 +28,7 @@ namespace Avalonia.Rendering.SceneGraph _index.Add(rootVisual, Root); } - private Scene(VisualNode root, Dictionary index, SceneLayers layers, int id) + private Scene(VisualNode root, Dictionary index, SceneLayers layers, int generation) { Contract.Requires(root != null); @@ -37,14 +37,14 @@ namespace Avalonia.Rendering.SceneGraph _index = index; Root = root; Layers = layers; - Id = id; + Generation = generation; root.LayerRoot = root.Visual; } /// - /// Gets an ID identifying the scene. This is incremented each time the scene is cloned. + /// Gets a value identifying the scene's generation. This is incremented each time the scene is cloned. /// - public int Id { get; } + public int Generation { get; } /// /// Gets the layers for the scene. @@ -86,7 +86,7 @@ namespace Avalonia.Rendering.SceneGraph var index = new Dictionary(); var root = Clone((VisualNode)Root, null, index); - var result = new Scene(root, index, Layers.Clone(), Id + 1) + var result = new Scene(root, index, Layers.Clone(), Generation + 1) { Size = Size, Scaling = Scaling,