Merge pull request #101 from Ark-Kit/refactor/canvas-method

[ark-render] refactor: use more general canvas return type
Ark-Kit · Apr 21, 2024 · f07fdbf · f07fdbf
2 parents 11f0840 + bb3dd6f
commit f07fdbf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/ArkKit/ark-render-kit/CanvasContext.swift b/ArkKit/ark-render-kit/CanvasContext.swift
@@ -7,7 +7,7 @@ protocol CanvasContext<View> {
     var arkView: (any ArkView<View>)? { get }
     var memo: [EntityID: [RenderableComponentType: (any RenderableComponent, any Renderable)]] { get }
 
-    func getFlatCanvas() -> ArkFlatCanvas
+    func getFlatCanvas() -> any Canvas
     func render(_ canvas: any Canvas, using renderer: any RenderableBuilder<View>)
 }
 
@@ -62,7 +62,7 @@ class ArkCanvasContext<View>: CanvasContext {
     }
 
     /// Outputs a logical canvas with the relevant entities in the canvas and their renderable components only
-    func getFlatCanvas() -> ArkFlatCanvas {
+    func getFlatCanvas() -> any Canvas {
         var arkCanvas = ArkFlatCanvas()
         for renderableCompType in ArkCanvasSystem.renderableComponentTypes {
             let renderableEntities = ecs.getEntities(with: [renderableCompType])

diff --git a/ArkKit/ark-render-kit/canvas/Canvas.swift b/ArkKit/ark-render-kit/canvas/Canvas.swift
@@ -22,4 +22,7 @@ protocol Canvas {
     typealias RenderableComponentType = ObjectIdentifier
     typealias CanvasElements = [EntityID: [RenderableComponentType: any RenderableComponent]]
     var canvasElements: CanvasElements { get }
+    mutating func addEntityRenderableToCanvas(entityId: EntityID,
+                                              componentType: RenderableComponentType,
+                                              renderableComponent: any RenderableComponent)
 }