shadowfacts
/
Tetris
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: shadowfacts:2c3e4c95414093b898232965a9ecec8c0a001d5b
Branches Tags
shadowfacts:master
..
compare: shadowfacts:f844d5466fb4a0b082d72f12b4837e8045b885e5
Branches Tags
shadowfacts:master

No commits in common. "2c3e4c95414093b898232965a9ecec8c0a001d5b" and "f844d5466fb4a0b082d72f12b4837e8045b885e5" have entirely different histories.
2c3e4c9541 ... f844d5466f

8 changed files with 41 additions and 113 deletions
Show Stats Expand all files Collapse all files

27
Tetris/ContentView.swift
View File

@ -17,7 +17,7 @@ struct ContentView: View {
return c
}()
@State var timer: Timer?
@State var initialXPosition: Int?
@State var prevHorizTranslation: CGFloat?
var body: some View {
GeometryReader { (geometry) in
@ -27,7 +27,7 @@ struct ContentView: View {
.onAppear(perform: self.startTimer)
.onDisappear(perform: self.stopTimer)
.onTapGesture(perform: self.onTap)
.gesture(self.horizDragGesture(geometry: geometry).simultaneously(with: self.verticalDragGesture))
.gesture(self.horizDragGesture(geometry: geometry))
// .gesture(ExclusiveGesture(horizDragGesture, verticalDragGesture))
// .gesture(horizDragGesture.simultaneously(with: verticalDragGesture))
@ -57,25 +57,32 @@ struct ContentView: View {
DragGesture(coordinateSpace: .global)
.onChanged { (state) in
guard let currentPiece = self.controller.currentPiece else { return }
if self.initialXPosition == nil {
self.initialXPosition = currentPiece.topLeft.0
// let position = (state.location.x) / geometry.size.width * 10
// let moved = currentPiece.moved(by: (Int(position.rounded()) - currentPiece.topLeft.0, 0))
// if !self.controller.overlapsAny(moved) {
// self.controller.currentPiece = moved
// }
if self.prevHorizTranslation == nil {
self.prevHorizTranslation = state.translation.width
}
var moved = currentPiece
let xPosition = self.initialXPosition! + Int((state.translation.width / (geometry.size.width / 10)).rounded())
moved.topLeft = (xPosition, currentPiece.topLeft.1)
let delta = state.translation.width - self.prevHorizTranslation!
let amount = Int((delta / 20).rounded())
let moved = currentPiece.moved(by: (amount, 0))
if !self.controller.overlapsAny(moved) {
self.controller.currentPiece = moved
self.prevHorizTranslation = state.translation.width
}
}.onEnded { (state) in
self.initialXPosition = nil
self.prevHorizTranslation = nil
}
}
var verticalDragGesture: some Gesture {
DragGesture()
.onEnded { (state) in
if abs(state.translation.height) > 80 {
if state.translation.height > 0 {
let deltaY = state.location.y - state.startLocation.y
if abs(deltaY) > 40 {
if deltaY > 0 {
self.onSwipeDown()
} else {
self.onSwipeUp()

22
TetrisKit/GameBoard.swift
View File

@ -12,43 +12,41 @@ public struct GameBoard {
public let width: Int
public let height: Int
public internal(set) var tiles: [[Tetromino?]]
public internal(set) var tiles: [[Bool]]
public init(width: Int, height: Int) {
self.width = width
self.height = height
tiles = (1...height).map { _ in
Array(repeating: nil, count: width)
Array(repeating: false, count: width)
}
}
public subscript(x: Int, y: Int) -> Bool {
return self.tiles[y][x] != nil
}
public subscript(x: Int, y: Int) -> Tetromino? {
return self.tiles[y][x]
}
public mutating func set(piece: GamePiece) {
mutating func set(piece: GamePiece) {
let (left, top) = piece.topLeft
for y in 0..<piece.tiles.count where y + top < height {
for x in 0..<piece.tiles.first!.count where x + left < width {
if piece.tiles[y][x] {
self.tiles[y + top][x + left] = piece.tetromino
self.tiles[y + top][x + left] = true
}
}
}
}
mutating func clear(tiles: [(Int, Int)]) {
public mutating func set(tiles: [(Int, Int)]) {
for (x, y) in tiles {
self.tiles[y][x] = nil
self.tiles[y][x] = true
}
}
func rowFull(_ row: Int) -> Bool {
return tiles[row].allSatisfy({ $0 != nil })
mutating func unset(tiles: [(Int, Int)]) {
for (x, y) in tiles {
self.tiles[y][x] = false
}
}
}

40
TetrisKit/GameController.swift
View File

@ -14,8 +14,6 @@ public class GameController: ObservableObject {
public let width = 10
public let height = 16
var state: GameState = .waitingForStart
@Published public var board: GameBoard
@Published public var currentPiece: GamePiece? {
@ -35,7 +33,6 @@ public class GameController: ObservableObject {
}
public func start() {
state = .playing(.normal)
nextPiece()
}
@ -48,29 +45,24 @@ public class GameController: ObservableObject {
self.board.set(piece: currentPiece!)
clearLines()
nextPiece()
if case .playing(.dropped) = state {
state = .playing(.normal)
}
}
func clearLines() {
let fullRow = Array(repeating: true, count: width)
var row = height - 1
while row >= 0 {
if board.rowFull(row) {
if board.tiles[row] == fullRow {
board.tiles.remove(at: row)
}
row -= 1
}
for _ in 0..<height - board.tiles.count {
board.tiles.insert(Array(repeating: nil, count: width), at: 0)
board.tiles.insert(Array(repeating: false, count: width), at: 0)
}
}
public func step() {
guard case .playing(_) = state,
let currentPiece = currentPiece else { return }
guard let currentPiece = currentPiece else { return }
let modifiedPiece = currentPiece.moved(by: (0, 1))
if overlapsAny(modifiedPiece) {
finalizePiece()
@ -80,9 +72,7 @@ public class GameController: ObservableObject {
}
public func rotate(direction: RotationDirection) {
guard case .playing(_) = state,
let currentPiece = currentPiece else { return }
guard let currentPiece = currentPiece else { return }
let modifiedPiece = currentPiece.rotated(direction)
if !overlapsAny(modifiedPiece) {
self.currentPiece = modifiedPiece
@ -90,8 +80,7 @@ public class GameController: ObservableObject {
}
public func left() {
guard case .playing(.normal) = state,
let currentPiece = currentPiece else { return }
guard let currentPiece = currentPiece else { return }
let modifiedPiece = currentPiece.moved(by: (-1, 0))
if !overlapsAny(modifiedPiece) {
self.currentPiece = modifiedPiece
@ -99,8 +88,7 @@ public class GameController: ObservableObject {
}
public func right() {
guard case .playing(.normal) = state,
let currentPiece = currentPiece else { return }
guard let currentPiece = currentPiece else { return }
let modifiedPiece = currentPiece.moved(by: (1, 0))
if !overlapsAny(modifiedPiece) {
self.currentPiece = modifiedPiece
@ -108,12 +96,10 @@ public class GameController: ObservableObject {
}
public func drop() {
guard case .playing(.normal) = state else { return }
currentPiece = currentPieceAtDropPoint
state = .playing(.dropped)
}
private func updateCurrentPieceAtDropPoint() {
func updateCurrentPieceAtDropPoint() {
guard let currentPiece = currentPiece else { return }
var prev = currentPiece
currentPieceAtDropPoint = currentPiece
@ -137,13 +123,3 @@ public class GameController: ObservableObject {
}
}
enum GameState {
case waitingForStart
case playing(PlayState)
}
enum PlayState {
case normal
case dropped
}

2
TetrisKit/GamePiece.swift
View File

@ -10,7 +10,7 @@ import Foundation
public struct GamePiece {
public let tetromino: Tetromino
public var topLeft: (Int, Int)
public internal(set) var topLeft: (Int, Int)
public internal(set) var tiles: [[Bool]]
public init(tetromino: Tetromino) {

12
TetrisUI/CurrentPieceView.swift
View File

@ -18,21 +18,11 @@ struct CurrentPieceView: View {
var body: some View {
GridView(rows: self.boardHeight, columns: self.boardWidth) { (col, row, size) in
Rectangle()
.foregroundColor(self.colorAt(col, row))
.foregroundColor(self.currentPieceAt(col, row) ? Color.blue : self.droppedPieceAt(col, row) ? Color.gray : Color.clear)
.frame(width: size, height: size)
}
}
func colorAt(_ col: Int, _ row: Int) -> Color {
if currentPieceAt(col, row) {
return self.currentPiece!.tetromino.color
} else if droppedPieceAt(col, row) {
return .gray
} else {
return .clear
}
}
func currentPieceAt(_ col: Int, _ row: Int) -> Bool {
guard let currentPiece = self.currentPiece else { return false }
let (left, top) = currentPiece.topLeft

41
TetrisUI/Tetromino+Color.swift
View File

@ -1,41 +0,0 @@
//
// Tetromino+Color.swift
// Tetris
//
// Created by Shadowfacts on 10/15/19.
// Copyright © 2019 Shadowfacts. All rights reserved.
//
import SwiftUI
import TetrisKit
fileprivate extension Color {
static let tetrominoAqua = Color(red: 0, green: 214/255, blue: 211/255)
static let tetrominoBlue = Color(red: 0, green: 79/255, blue: 214/255)
static let tetrominoOrange = Color(red: 255/255, green: 128/255, blue: 0)
static let tetrominoYellow = Color(red: 255/255, green: 229/255, blue: 0)
static let tetrominoGreen = Color(red: 0, green: 214/255, blue: 71/255)
static let tetrominoPurple = Color(red: 168/255, green: 0, blue: 214/255)
static let tetrominoRed = Color(red: 214/255, green: 0, blue: 61/255)
}
extension Tetromino {
var color: Color {
switch self {
case .i:
return .tetrominoAqua
case .o:
return .tetrominoYellow
case .t:
return .tetrominoPurple
case .j:
return .tetrominoOrange
case .l:
return .tetrominoBlue
case .s:
return .tetrominoRed
case .z:
return .tetrominoGreen
}
}
}

6
TetrisUI/TilesView.swift
View File

@ -16,7 +16,7 @@ struct TilesView: View {
GridView(rows: board.height, columns: board.width) { (col, row, size) in
Rectangle()
.frame(width: size, height: size)
.foregroundColor(self.board[col, row]?.color ?? Color.clear)
.foregroundColor(self.board[col, row] ? Color.red : Color.black)
}
}
}
@ -24,9 +24,7 @@ struct TilesView: View {
struct TilesView_Previews: PreviewProvider {
@State static var board: GameBoard = {
var b = GameBoard(width: 10, height: 16)
var piece = GamePiece(tetromino: .z)
piece.topLeft = (0, 14)
b.set(piece: piece)
b.set(tiles: [(0, 15), (1, 15), (1, 14), (2, 14)])
return b
}()

4
tetriscli/main.swift
View File

@ -82,7 +82,7 @@ extension TwoDimString {
setColumn(controller.width + 1, to: "+" + String(repeating: "|", count: controller.height) + "+")
for y in 0..<controller.height {
for x in 0..<controller.width where controller.board[x, y] {
for x in 0..<controller.width where controller.board.get(tile: (x, y)) {
self[x + 1, y + 1] = "X"
}
}
@ -99,7 +99,7 @@ extension TwoDimString {
}
let controller = GameController()
controller.start()
controller.currentPiece = GamePiece(tetromino: .l)
func readMove() {
print(TwoDimString(controller: controller))