eryn/terrain
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't recurse to size 2; only average corner of particular side you're on

Browse source 
The former makes things so much faster. omg.
This commit is contained in:
Eryn Wells 2018-11-26 08:36:53 -08:00
parent 240499ced8
commit 1a32b8e085
2 changed files with 92 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

108
Terrain2Tests/AlgorithmsTests.swift
View file

@ -38,41 +38,41 @@ class DiamondSquareAlgorithmTests: XCTestCase {
// MARK: Diamond Corners
func testDiamondCornersNorth() {
let corners = alg.diamondCorners(forPoint: Point(x: 2, y: 0), diamondSize: grid.size)
XCTAssertEqual(corners.count, 4)
XCTAssertEqual(corners[0], Point(x: 2, y: 2))
XCTAssertEqual(corners[1], Point(x: 0, y: 0))
XCTAssertEqual(corners[2], Point(x: 2, y: 2))
XCTAssertEqual(corners[3], Point(x: 4, y: 0))
}
func testDiamondCornersWest() {
let corners = alg.diamondCorners(forPoint: Point(x: 0, y: 2), diamondSize: grid.size)
XCTAssertEqual(corners.count, 4)
XCTAssertEqual(corners[0], Point(x: 0, y: 0))
XCTAssertEqual(corners[1], Point(x: 2, y: 2))
XCTAssertEqual(corners[2], Point(x: 0, y: 4))
XCTAssertEqual(corners[3], Point(x: 2, y: 2))
}
func testDiamondCornersSouth() {
let corners = alg.diamondCorners(forPoint: Point(x: 2, y: 4), diamondSize: grid.size)
XCTAssertEqual(corners.count, 4)
XCTAssertEqual(corners[0], Point(x: 2, y: 2))
XCTAssertEqual(corners[1], Point(x: 0, y: 4))
XCTAssertEqual(corners[2], Point(x: 2, y: 2))
XCTAssertEqual(corners[3], Point(x: 4, y: 4))
}
func testDiamondCornersEast() {
let corners = alg.diamondCorners(forPoint: Point(x: 4, y: 2), diamondSize: grid.size)
XCTAssertEqual(corners.count, 4)
XCTAssertEqual(corners[0], Point(x: 4, y: 0))
XCTAssertEqual(corners[1], Point(x: 2, y: 2))
XCTAssertEqual(corners[2], Point(x: 4, y: 4))
XCTAssertEqual(corners[3], Point(x: 2, y: 2))
}
// func testDiamondCornersNorth() {
// let corners = alg.diamondCorners(forPoint: Point(x: 2, y: 0), diamondSize: grid.size)
// XCTAssertEqual(corners.count, 4)
// XCTAssertEqual(corners[0], Point(x: 2, y: 2))
// XCTAssertEqual(corners[1], Point(x: 0, y: 0))
// XCTAssertEqual(corners[2], Point(x: 2, y: 2))
// XCTAssertEqual(corners[3], Point(x: 4, y: 0))
// }
//
// func testDiamondCornersWest() {
// let corners = alg.diamondCorners(forPoint: Point(x: 0, y: 2), diamondSize: grid.size)
// XCTAssertEqual(corners.count, 4)
// XCTAssertEqual(corners[0], Point(x: 0, y: 0))
// XCTAssertEqual(corners[1], Point(x: 2, y: 2))
// XCTAssertEqual(corners[2], Point(x: 0, y: 4))
// XCTAssertEqual(corners[3], Point(x: 2, y: 2))
// }
//
// func testDiamondCornersSouth() {
// let corners = alg.diamondCorners(forPoint: Point(x: 2, y: 4), diamondSize: grid.size)
// XCTAssertEqual(corners.count, 4)
// XCTAssertEqual(corners[0], Point(x: 2, y: 2))
// XCTAssertEqual(corners[1], Point(x: 0, y: 4))
// XCTAssertEqual(corners[2], Point(x: 2, y: 2))
// XCTAssertEqual(corners[3], Point(x: 4, y: 4))
// }
//
// func testDiamondCornersEast() {
// let corners = alg.diamondCorners(forPoint: Point(x: 4, y: 2), diamondSize: grid.size)
// XCTAssertEqual(corners.count, 4)
// XCTAssertEqual(corners[0], Point(x: 4, y: 0))
// XCTAssertEqual(corners[1], Point(x: 2, y: 2))
// XCTAssertEqual(corners[2], Point(x: 4, y: 4))
// XCTAssertEqual(corners[3], Point(x: 2, y: 2))
// }
}
class DiamondSquareBoxTests: XCTestCase {
@ -102,25 +102,25 @@ class DiamondSquareBoxTests: XCTestCase {
Box(origin: Point(x: 0, y: 2), size: Size(w: 3, h: 3)),
Box(origin: Point(x: 2, y: 2), size: Size(w: 3, h: 3)),
Box(origin: Point(x: 0, y: 0), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 1, y: 0), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 0, y: 1), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 1, y: 1), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 2, y: 0), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 3, y: 0), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 2, y: 1), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 3, y: 1), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 0, y: 2), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 1, y: 2), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 0, y: 3), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 1, y: 3), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 2, y: 2), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 3, y: 2), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 2, y: 3), size: Size(w: 2, h: 2)),
Box(origin: Point(x: 3, y: 3), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 0, y: 0), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 1, y: 0), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 0, y: 1), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 1, y: 1), size: Size(w: 2, h: 2)),
//
// Box(origin: Point(x: 2, y: 0), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 3, y: 0), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 2, y: 1), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 3, y: 1), size: Size(w: 2, h: 2)),
//
// Box(origin: Point(x: 0, y: 2), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 1, y: 2), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 0, y: 3), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 1, y: 3), size: Size(w: 2, h: 2)),
//
// Box(origin: Point(x: 2, y: 2), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 3, y: 2), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 2, y: 3), size: Size(w: 2, h: 2)),
// Box(origin: Point(x: 3, y: 3), size: Size(w: 2, h: 2)),
].reversed()
let prog = Progress(totalUnitCount: 1)