Skip to content

Commit ba8af71

Browse files
committed
Another optimization, deleted not useful struct
1 parent 5960308 commit ba8af71

File tree

4 files changed

+14
-30
lines changed

4 files changed

+14
-30
lines changed

SnakeGame/GameFieldView.swift

Lines changed: 11 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,6 @@
88

99
import UIKit
1010

11-
struct SegmentParameters {
12-
13-
var rect: CGRect
14-
var type: SegmentType
15-
16-
init(segment: GameSegment){
17-
18-
self.rect = segment.rect
19-
self.type = segment.type
20-
}
21-
}
22-
2311
protocol DidDrawDelegate {
2412
func viewDidDraw()
2513
}
@@ -32,19 +20,17 @@ class GameFieldView: UIView {
3220

3321
func renderSegments(segments: [GameSegment]){
3422

35-
for (index, value) in segments.enumerate() {
36-
37-
let parameters = SegmentParameters(segment: value)
23+
for (index, segment) in segments.enumerate() {
3824

3925
if index == segmentViews.count {
4026

41-
let segmentView = SegmentView(parameters: parameters)
27+
let segmentView = SegmentView(segment: segment)
4228

4329
self.addSubview(segmentView)
4430
segmentViews.append(segmentView)
4531

4632
}else{
47-
segmentViews[index].parameters = parameters
33+
segmentViews[index].segment = segment
4834
}
4935
}
5036
}
@@ -53,9 +39,7 @@ class GameFieldView: UIView {
5339

5440
for border in borders{
5541

56-
let parameters = SegmentParameters(segment: border)
57-
58-
let view = SegmentView(parameters: parameters)
42+
let view = SegmentView(segment: border)
5943

6044
addSubview(view)
6145
}
@@ -85,18 +69,18 @@ enum SegmentType{
8569

8670
class SegmentView: UIView {
8771

88-
var parameters: SegmentParameters!{
72+
var segment: GameSegment!{
8973
didSet{
90-
frame = parameters.rect
74+
frame = segment.rect
9175
setNeedsDisplay()
9276
}
9377
}
9478

95-
init(parameters: SegmentParameters) {
96-
super.init(frame: parameters.rect)
79+
init(segment: GameSegment) {
80+
super.init(frame: segment.rect)
9781

9882
backgroundColor = UIColor.clearColor()
99-
self.parameters = parameters
83+
self.segment = segment
10084
}
10185

10286

@@ -107,7 +91,7 @@ class SegmentView: UIView {
10791

10892
func path() -> UIBezierPath {
10993

110-
switch parameters.type {
94+
switch segment.type {
11195
case .Head, .Tail, .Middle, .Food:
11296
return UIBezierPath(ovalInRect: CGRect(x: 0, y: 0, width: bounds.width, height: bounds.height))
11397
default:
@@ -118,7 +102,7 @@ class SegmentView: UIView {
118102
}
119103

120104
func color() -> UIColor {
121-
switch parameters.type {
105+
switch segment.type {
122106
case .Head:
123107
return UIColor.blueColor().colorWithAlphaComponent(0.8)
124108
case .Tail:

SnakeGame/GameModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import UIKit
1010

11-
let side: CGFloat = UIScreen.mainScreen().bounds.width / 30
11+
let side: CGFloat = UIScreen.mainScreen().bounds.width / 25
1212

1313
protocol BrainDelegate {
1414
func snakeIsDeadWithScore(value: Int)

SnakeGame/GameViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ class GameViewController: UIViewController {
2222
@IBAction func refreshAction(sender: UIBarButtonItem) {
2323

2424
gameFieldView.clearSubviews()
25-
gameFieldView.setNeedsDisplay()
25+
resetBrain()
2626
}
2727

2828
private var brain: GameBrain!

SnakeGame/Snake.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ class GameSegment {
1818
}
1919
}
2020

21-
var type: SegmentType!
21+
var type: SegmentType
2222

2323
init(point: CGPoint, type: SegmentType){
2424

0 commit comments

Comments
 (0)