starred/Memola
1
0
Fork 0
mirror of https://github.com/dscyrescotti/Memola.git synced 2026-04-25 01:58:52 +02:00
Code Issues 5 Packages Projects Releases 3 Wiki Activity

refactor: clean up

Browse Source
This commit is contained in:
dscyrescotti
2024-06-09 12:32:36 +07:00
parent 20e653c200
commit c3a14bd608
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Memola/Canvas/Contexts/GraphicContext.swift
View File

@@ -29,7 +29,7 @@ final class GraphicContext: @unchecked Sendable {
var erasers: [URL: EraserStroke] = [:] var erasers: [URL: EraserStroke] = [:]
let concurrentQueue = DispatchQueue(label: "com.dispatchBarrier", attributes: .concurrent) let barrierQueue = DispatchQueue(label: "com.memola.app.graphic-context", attributes: .concurrent)
init() { init() {
setViewPortVertices() setViewPortVertices()

2
Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift
View File

@@ -84,7 +84,7 @@ final class PenStroke: Stroke, @unchecked Sendable {
eraserStrokes = Set(object.erasers.compactMap { [graphicContext] eraser -> EraserStroke? in eraserStrokes = Set(object.erasers.compactMap { [graphicContext] eraser -> EraserStroke? in
guard let eraser = eraser as? EraserObject else { return nil } guard let eraser = eraser as? EraserObject else { return nil }
let url = eraser.objectID.uriRepresentation() let url = eraser.objectID.uriRepresentation()
return graphicContext.concurrentQueue.sync(flags: .barrier) { return graphicContext.barrierQueue.sync(flags: .barrier) {
if graphicContext.erasers[url] == nil { if graphicContext.erasers[url] == nil {
let _stroke = EraserStroke(object: eraser) let _stroke = EraserStroke(object: eraser)
_stroke.loadQuads(from: eraser) _stroke.loadQuads(from: eraser)

13
Memola/Canvas/RenderPasses/GraphicRenderPass.swift
View File

@@ -100,5 +100,18 @@ class GraphicRenderPass: RenderPass {
} }
graphicContext.previousStroke = nil graphicContext.previousStroke = nil
} }
let eraserStrokes = graphicContext.eraserStrokes
for eraserStroke in eraserStrokes {
if eraserStroke.finishesSaving {
graphicContext.eraserStrokes.remove(eraserStroke)
continue
}
descriptor.colorAttachments[0].loadAction = clearsTexture ? .clear : .load
clearsTexture = false
eraserRenderPass.stroke = eraserStroke
eraserRenderPass.descriptor = descriptor
eraserRenderPass.draw(on: canvas, with: renderer)
}
} }
} }