Skip to content

Commit 3cce6ce

Browse files
committed
static randomColor
1 parent 4f67abe commit 3cce6ce

File tree

3 files changed

+8
-8
lines changed

3 files changed

+8
-8
lines changed

Delaunay

Utilities.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ extension CGFloat {
6969
}
7070

7171
extension OSColor {
72-
func randomColor() -> OSColor {
72+
static func randomColor() -> OSColor {
7373
let hue = CGFloat( Double.random() ) // 0.0 to 1.0
7474
let saturation: CGFloat = 0.5 // 0.5 to 1.0, away from white
7575
let brightness: CGFloat = 1.0 // 0.5 to 1.0, away from black

ViewController.swift

+6-6
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class ViewController: OSViewController {
2929
let layer:CALayer? = self.view.layer
3030

3131
baseLayer.frame = CGRect.init(origin: CGPoint.zero, size: baseLayer.frame.size)
32-
// baseLayer.colors = [OSColor().randomColor().cgColor, OSColor().randomColor().cgColor, OSColor().randomColor().cgColor]
32+
// baseLayer.colors = [OSColor.randomColor().cgColor, OSColor.randomColor().cgColor, OSColor.randomColor().cgColor]
3333
layer?.addSublayer(baseLayer)
3434
baseLayer.borderWidth = 0
3535

@@ -91,10 +91,10 @@ class ViewController: OSViewController {
9191
let triangleLayer = CAShapeLayer()
9292
triangleLayer.frame = baseLayer.frame
9393
triangleLayer.path = triangle.toPath()
94-
triangleLayer.borderWidth = 0.5
95-
triangleLayer.strokeColor = OSColor.black.cgColor
94+
// triangleLayer.borderWidth = 0.5
95+
// triangleLayer.strokeColor = OSColor.black.cgColor
9696
triangleLayer.fillColor = OSColor.gray.cgColor
97-
triangleLayer.fillColor = OSColor().randomColor().cgColor
97+
triangleLayer.fillColor = OSColor.randomColor().cgColor
9898
triangleLayer.backgroundColor = OSColor.clear.cgColor
9999
baseLayer.addSublayer(triangleLayer)
100100
}
@@ -103,7 +103,7 @@ class ViewController: OSViewController {
103103
// Style Square
104104
let a = CAShapeLayer()
105105
a.path = path.cgPath
106-
a.strokeColor = OSColor().randomColor().cgColor
106+
a.strokeColor = OSColor.black.cgColor
107107
a.fillColor = nil
108108
a.opacity = 1.0
109109
a.lineWidth = 1
@@ -118,7 +118,7 @@ class ViewController: OSViewController {
118118
// // Style Square
119119
// let a = CAShapeLayer()
120120
// a.path = path2
121-
// a.strokeColor = OSColor().randomColor().cgColor
121+
// a.strokeColor = OSColor.randomColor().cgColor
122122
// a.fillColor = nil
123123
// a.opacity = 1.0
124124
// a.lineWidth = 1

0 commit comments

Comments
 (0)