Original PR: https://github.com/dscyrescotti/Memola/pull/37 Author: @dscyrescotti Created: 5/26/2024 Status: ✅ Merged Merged: 5/26/2024 Merged by: @dscyrescotti
Base: main ← Head: feature/r-tree
main
feature/r-tree
43d933a
1f9f8ef
dccf838
fc6639b
e13c0f2
db18153
22 files changed (+424 additions, -282 deletions)
📝 Memola.xcodeproj/project.pbxproj (+33 -5) 📝 Memola/Canvas/Contexts/GraphicContext.swift (+43 -33) 📝 Memola/Canvas/Core/Canvas.swift (+1 -5) ➕ Memola/Canvas/Geometries/Stroke/Core/Stroke.swift (+125 -0) 📝 Memola/Canvas/Geometries/Stroke/Core/StrokeGenerator.swift (+3 -3) ➕ Memola/Canvas/Geometries/Stroke/Core/StrokeStyle.swift (+22 -0) 📝 Memola/Canvas/Geometries/Stroke/Generators/SolidPointStrokeGenerator.swift (+14 -10) ➖ Memola/Canvas/Geometries/Stroke/Stroke.swift (+0 -194) ➕ Memola/Canvas/Geometries/Stroke/Strokes/EraserStroke.swift (+50 -0) ➕ Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift (+98 -0) 📝 Memola/Canvas/History/History.swift (+4 -4) 📝 Memola/Canvas/History/HistoryEvent.swift (+1 -1) 📝 Memola/Canvas/RenderPasses/CacheRenderPass.swift (+3 -2) 📝 Memola/Canvas/RenderPasses/EraserRenderPass.swift (+2 -2) 📝 Memola/Canvas/RenderPasses/GraphicRenderPass.swift (+9 -6) 📝 Memola/Canvas/RenderPasses/StrokeRenderPass.swift (+2 -2) 📝 Memola/Canvas/Tool/Pen/Core/Pen.swift (+2 -2) 📝 Memola/Canvas/Tool/Pen/Core/PenStyle.swift (+1 -11) 📝 Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift (+2 -0) 📝 Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift (+2 -0)
Memola.xcodeproj/project.pbxproj
Memola/Canvas/Contexts/GraphicContext.swift
Memola/Canvas/Core/Canvas.swift
Memola/Canvas/Geometries/Stroke/Core/Stroke.swift
Memola/Canvas/Geometries/Stroke/Core/StrokeGenerator.swift
Memola/Canvas/Geometries/Stroke/Core/StrokeStyle.swift
Memola/Canvas/Geometries/Stroke/Generators/SolidPointStrokeGenerator.swift
Memola/Canvas/Geometries/Stroke/Stroke.swift
Memola/Canvas/Geometries/Stroke/Strokes/EraserStroke.swift
Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift
Memola/Canvas/History/History.swift
Memola/Canvas/History/HistoryEvent.swift
Memola/Canvas/RenderPasses/CacheRenderPass.swift
Memola/Canvas/RenderPasses/EraserRenderPass.swift
Memola/Canvas/RenderPasses/GraphicRenderPass.swift
Memola/Canvas/RenderPasses/StrokeRenderPass.swift
Memola/Canvas/Tool/Pen/Core/Pen.swift
Memola/Canvas/Tool/Pen/Core/PenStyle.swift
Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift
Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift
...and 2 more files
This PR uses RTree data structure to store strokes for search time efficiency.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.
No dependencies set.
The note is not visible to the blocked user.
📋 Pull Request Information
Original PR: https://github.com/dscyrescotti/Memola/pull/37
Author: @dscyrescotti
Created: 5/26/2024
Status: ✅ Merged
Merged: 5/26/2024
Merged by: @dscyrescotti
Base:
main← Head:feature/r-tree📝 Commits (6)
43d933arefactor: clean up1f9f8efrefactor: replace stroke class with protocoldccf838refactor: clean upfc6639brefactor: use Stroke protocol annotation in place of PenStrokee13c0f2feat: use rtree in place of arraydb18153refactor: clean up📊 Changes
22 files changed (+424 additions, -282 deletions)
View changed files
📝
Memola.xcodeproj/project.pbxproj(+33 -5)📝
Memola/Canvas/Contexts/GraphicContext.swift(+43 -33)📝
Memola/Canvas/Core/Canvas.swift(+1 -5)➕
Memola/Canvas/Geometries/Stroke/Core/Stroke.swift(+125 -0)📝
Memola/Canvas/Geometries/Stroke/Core/StrokeGenerator.swift(+3 -3)➕
Memola/Canvas/Geometries/Stroke/Core/StrokeStyle.swift(+22 -0)📝
Memola/Canvas/Geometries/Stroke/Generators/SolidPointStrokeGenerator.swift(+14 -10)➖
Memola/Canvas/Geometries/Stroke/Stroke.swift(+0 -194)➕
Memola/Canvas/Geometries/Stroke/Strokes/EraserStroke.swift(+50 -0)➕
Memola/Canvas/Geometries/Stroke/Strokes/PenStroke.swift(+98 -0)📝
Memola/Canvas/History/History.swift(+4 -4)📝
Memola/Canvas/History/HistoryEvent.swift(+1 -1)📝
Memola/Canvas/RenderPasses/CacheRenderPass.swift(+3 -2)📝
Memola/Canvas/RenderPasses/EraserRenderPass.swift(+2 -2)📝
Memola/Canvas/RenderPasses/GraphicRenderPass.swift(+9 -6)📝
Memola/Canvas/RenderPasses/StrokeRenderPass.swift(+2 -2)📝
Memola/Canvas/Tool/Pen/Core/Pen.swift(+2 -2)📝
Memola/Canvas/Tool/Pen/Core/PenStyle.swift(+1 -11)📝
Memola/Canvas/Tool/Pen/PenStyles/EraserPenStyle.swift(+2 -0)📝
Memola/Canvas/Tool/Pen/PenStyles/MarkerPenStyle.swift(+2 -0)...and 2 more files
📄 Description
Description
This PR uses RTree data structure to store strokes for search time efficiency.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.