ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 06:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2022-12-25 10:33:53 +04:00
parent 6ece02e998
commit a0f3cfef58
27 changed files with 779 additions and 1894 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
submodules/DrawingUI/Sources/DrawingMetalView.swift
View File

@@ -49,11 +49,10 @@ final class DrawingMetalView: MTKView {
super.init(frame: CGRect(origin: .zero, size: size), device: device)
self.drawableSize = self.size
self.autoResizeDrawable = false
self.isOpaque = false
self.contentScaleFactor = 1.0
self.drawableSize = self.size
//self.presentsWithTransaction = true
self.setup()
}
@@ -124,6 +123,8 @@ final class DrawingMetalView: MTKView {
}
self.drawable?.clear()
self.markerBrush?.pushPoint(CGPoint(x: 100.0, y: 100.0), color: DrawingColor.clear, size: 0.0, isEnd: true)
}
@@ -137,9 +138,6 @@ final class DrawingMetalView: MTKView {
}
override func draw(_ rect: CGRect) {
guard !self.isHidden || (self.drawable?.isClearing ?? false) else {
return
}
super.draw(rect)
guard let drawable = self.drawable, let texture = drawable.texture?.texture else {
@@ -187,19 +185,12 @@ final class DrawingMetalView: MTKView {
case marker
}
func updated(_ point: Polyline.Point, state: DrawingGesturePipeline.DrawingGestureState, brush: BrushType, color: DrawingColor, size: CGFloat) {
func updated(_ point: DrawingPoint, state: DrawingGesturePipeline.DrawingGestureState, brush: BrushType, color: DrawingColor, size: CGFloat) {
switch brush {
case .marker:
self.markerBrush?.updated(point, color: color, state: state, size: size)
}
}
func setup(_ points: [CGPoint], brush: BrushType, color: DrawingColor, size: CGFloat) {
switch brush {
case .marker:
self.markerBrush?.setup(points, color: color, size: size)
}
}
}
private class Drawable {
@@ -229,9 +220,7 @@ private class Drawable {
self.updateBuffer(with: size)
}
var isClearing = false
func clear() {
self.isClearing = true
self.texture?.clear()
self.commit(wait: true)
}
@@ -262,10 +251,6 @@ private class Drawable {
self.commandBuffer?.waitUntilCompleted()
}
self.commandBuffer = nil
if self.isClearing && wait {
self.isClearing = false
}
}
internal func makeTexture() -> Texture? {
@@ -364,7 +349,7 @@ private class Brush {
}
private let bezier = BezierGenerator()
func updated(_ point: Polyline.Point, color: DrawingColor, state: DrawingGesturePipeline.DrawingGestureState, size: CGFloat) {
func updated(_ point: DrawingPoint, color: DrawingColor, state: DrawingGesturePipeline.DrawingGestureState, size: CGFloat) {
let point = point.location
switch state {
case .began:
@@ -491,7 +476,7 @@ private class Stroke {
let overlapping = max(1, line.pointSize / line.pointStep)
var renderingColor = self.color
renderingColor.alpha = renderingColor.alpha / overlapping * 2.5
renderingColor.alpha = renderingColor.alpha / overlapping * 5.5
for i in 0 ..< Int(count) {
let index = CGFloat(i)
@@ -524,30 +509,30 @@ class BezierGenerator {
}
init(beginPoint: CGPoint) {
begin(with: beginPoint)
self.begin(with: beginPoint)
}
func begin(with point: CGPoint) {
step = 0
points.removeAll()
points.append(point)
self.step = 0
self.points.removeAll()
self.points.append(point)
}
func pushPoint(_ point: CGPoint) -> [CGPoint] {
if point == points.last {
if point == self.points.last {
return []
}
points.append(point)
if points.count < 3 {
self.points.append(point)
if self.points.count < 3 {
return []
}
step += 1
self.step += 1
return self.generateSmoothPathPoints()
}
func finish() {
step = 0
points.removeAll()
self.step = 0
self.points.removeAll()
}
var points: [CGPoint] = []
@@ -556,16 +541,16 @@ class BezierGenerator {
private func generateSmoothPathPoints() -> [CGPoint] {
var begin: CGPoint
var control: CGPoint
let end = CGPoint.middle(p1: points[step], p2: points[step + 1])
let end = CGPoint.middle(p1: self.points[step], p2: self.points[self.step + 1])
var vertices: [CGPoint] = []
if step == 1 {
begin = points[0]
let middle1 = CGPoint.middle(p1: points[0], p2: points[1])
control = CGPoint.middle(p1: middle1, p2: points[1])
if self.step == 1 {
begin = self.points[0]
let middle1 = CGPoint.middle(p1: self.points[0], p2: self.points[1])
control = CGPoint.middle(p1: middle1, p2: self.points[1])
} else {
begin = CGPoint.middle(p1: points[step - 1], p2: points[step])
control = points[step]
begin = CGPoint.middle(p1: self.points[self.step - 1], p2: self.points[self.step])
control = self.points[self.step]
}
let distance = begin.distance(to: end)
@@ -573,9 +558,7 @@ class BezierGenerator {
for i in 0 ..< segements {
let t = CGFloat(i) / CGFloat(segements)
let x = pow(1 - t, 2) * begin.x + 2.0 * (1 - t) * t * control.x + t * t * end.x
let y = pow(1 - t, 2) * begin.y + 2.0 * (1 - t) * t * control.y + t * t * end.y
vertices.append(CGPoint(x: x, y: y))
vertices.append(begin.quadBezierPoint(to: end, controlPoint: control, t: t))
}
vertices.append(end)
return vertices