Original PR: https://github.com/dscyrescotti/Memola/pull/52 Author: @dscyrescotti Created: 6/25/2024 Status: ✅ Merged Merged: 6/25/2024 Merged by: @dscyrescotti
Base: main ← Head: feature/grid-option
main
feature/grid-option
32af33f
de71b56
f104416
21 files changed (+280 additions, -51 deletions)
📝 Memola.xcodeproj/project.pbxproj (+28 -8) ➕ Memola/Canvas/Buffers/Vertices/LineGridVertex.swift (+13 -0) 📝 Memola/Canvas/Buffers/Vertices/PointGridVertex.swift (+3 -3) 📝 Memola/Canvas/Contexts/GraphicContext.swift (+0 -3) ➕ Memola/Canvas/Contexts/LineGridContext.swift (+45 -0) 📝 Memola/Canvas/Contexts/PointGridContext.swift (+6 -9) 📝 Memola/Canvas/Contexts/ViewPortContext.swift (+0 -3) 📝 Memola/Canvas/Core/Canvas.swift (+33 -4) 📝 Memola/Canvas/Core/PipelineStates.swift (+25 -4) ➕ Memola/Canvas/Grid/GridMode.swift (+38 -0) 📝 Memola/Canvas/RenderPasses/ViewPortRenderPass.swift (+16 -5) 📝 Memola/Canvas/Shaders/Grid.metal (+28 -7) 📝 Memola/Canvas/View/Bridge/ViewController/CanvasViewController.swift (+13 -2) 📝 Memola/Features/Memo/Memo/MemoView.swift (+1 -1) 📝 Memola/Features/Memo/Toolbar/Toolbar.swift (+27 -1) 📝 Memola/Features/Memos/MemosView.swift (+1 -0) 📝 Memola/Persistence/Objects/CanvasObject.swift (+1 -0) 📝 Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/Contents.json (+1 -1) ➕ Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/point-texture 1.png (+0 -0) ➖ Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/point-texture.png (+0 -0)
Memola.xcodeproj/project.pbxproj
Memola/Canvas/Buffers/Vertices/LineGridVertex.swift
Memola/Canvas/Buffers/Vertices/PointGridVertex.swift
Memola/Canvas/Contexts/GraphicContext.swift
Memola/Canvas/Contexts/LineGridContext.swift
Memola/Canvas/Contexts/PointGridContext.swift
Memola/Canvas/Contexts/ViewPortContext.swift
Memola/Canvas/Core/Canvas.swift
Memola/Canvas/Core/PipelineStates.swift
Memola/Canvas/Grid/GridMode.swift
Memola/Canvas/RenderPasses/ViewPortRenderPass.swift
Memola/Canvas/Shaders/Grid.metal
Memola/Canvas/View/Bridge/ViewController/CanvasViewController.swift
Memola/Features/Memo/Memo/MemoView.swift
Memola/Features/Memo/Toolbar/Toolbar.swift
Memola/Features/Memos/MemosView.swift
Memola/Persistence/Objects/CanvasObject.swift
Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/Contents.json
Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/point-texture 1.png
Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/point-texture.png
...and 1 more files
This PR add line grid mode option along with grid mode picker button right beside the history control button.
🔄 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/52
Author: @dscyrescotti
Created: 6/25/2024
Status: ✅ Merged
Merged: 6/25/2024
Merged by: @dscyrescotti
Base:
main← Head:feature/grid-option📝 Commits (3)
32af33ffeat: remove guard conditionde71b56feat: add grid optionf104416feat: update point texture📊 Changes
21 files changed (+280 additions, -51 deletions)
View changed files
📝
Memola.xcodeproj/project.pbxproj(+28 -8)➕
Memola/Canvas/Buffers/Vertices/LineGridVertex.swift(+13 -0)📝
Memola/Canvas/Buffers/Vertices/PointGridVertex.swift(+3 -3)📝
Memola/Canvas/Contexts/GraphicContext.swift(+0 -3)➕
Memola/Canvas/Contexts/LineGridContext.swift(+45 -0)📝
Memola/Canvas/Contexts/PointGridContext.swift(+6 -9)📝
Memola/Canvas/Contexts/ViewPortContext.swift(+0 -3)📝
Memola/Canvas/Core/Canvas.swift(+33 -4)📝
Memola/Canvas/Core/PipelineStates.swift(+25 -4)➕
Memola/Canvas/Grid/GridMode.swift(+38 -0)📝
Memola/Canvas/RenderPasses/ViewPortRenderPass.swift(+16 -5)📝
Memola/Canvas/Shaders/Grid.metal(+28 -7)📝
Memola/Canvas/View/Bridge/ViewController/CanvasViewController.swift(+13 -2)📝
Memola/Features/Memo/Memo/MemoView.swift(+1 -1)📝
Memola/Features/Memo/Toolbar/Toolbar.swift(+27 -1)📝
Memola/Features/Memos/MemosView.swift(+1 -0)📝
Memola/Persistence/Objects/CanvasObject.swift(+1 -0)📝
Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/Contents.json(+1 -1)➕
Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/point-texture 1.png(+0 -0)➖
Memola/Resources/Assets/Assets.xcassets/textures/point-texture.textureset/Universal.mipmapset/point-texture.png(+0 -0)...and 1 more files
📄 Description
Description
This PR add line grid mode option along with grid mode picker button right beside the history control button.
🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.