From a58241cd1317956f496641f927cb252c8c7040bc Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sat, 10 Nov 2018 13:16:22 -0500
Subject: [PATCH] Rename Algorithm -> TerrainGenerator

---
 Terrain2/Algorithms.swift | 8 ++++----
 Terrain2/Terrain.swift    | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Terrain2/Algorithms.swift b/Terrain2/Algorithms.swift
index 526446b..3f44308 100644
--- a/Terrain2/Algorithms.swift
+++ b/Terrain2/Algorithms.swift
@@ -14,7 +14,7 @@ enum KernelError: Error {
     case textureCreationFailed
 }
 
-protocol Algorithm {
+protocol TerrainGenerator {
     var name: String { get }
     var outTexture: MTLTexture { get }
 
@@ -75,7 +75,7 @@ class Kernel {
 }
 
 /// "Compute" zero for every value of the height map.
-class ZeroAlgorithm: Kernel, Algorithm {
+class ZeroAlgorithm: Kernel, TerrainGenerator {
     let name = "Zero"
 
     init?(device: MTLDevice, library: MTLLibrary) {
@@ -93,7 +93,7 @@ class ZeroAlgorithm: Kernel, Algorithm {
 }
 
 /// Randomly generate heights that are independent of all others.
-class RandomAlgorithm: Kernel, Algorithm {
+class RandomAlgorithm: Kernel, TerrainGenerator {
     let name = "Random"
 
     private var uniforms: UnsafeMutablePointer<RandomAlgorithmUniforms>
@@ -124,7 +124,7 @@ class RandomAlgorithm: Kernel, Algorithm {
 
 /// Implementation of the Diamond-Squares algorithm.
 /// - https://en.wikipedia.org/wiki/Diamond-square_algorithm
-public class DiamondSquareAlgorithm: Algorithm {
+public class DiamondSquareAlgorithm: TerrainGenerator {
     public struct Box {
         public typealias Point = (x: Int, y: Int)
         public typealias Size = (w: Int, h: Int)
diff --git a/Terrain2/Terrain.swift b/Terrain2/Terrain.swift
index b7c49aa..8fa03e3 100644
--- a/Terrain2/Terrain.swift
+++ b/Terrain2/Terrain.swift
@@ -75,7 +75,7 @@ class Terrain: NSObject {
     let vertexDescriptor: MTLVertexDescriptor
     let mesh: MTKMesh
 
-    var algorithm: Algorithm
+    var generator: TerrainGenerator
 
     init?(dimensions dim: float2, segments seg: uint2, device: MTLDevice, library: MTLLibrary) {
         dimensions = dim
@@ -89,11 +89,11 @@ class Terrain: NSObject {
             return nil
         }
 
-        guard let alg = RandomAlgorithm(device: device, library: library) else {
+        guard let gen = RandomAlgorithm(device: device, library: library) else {
             print("Couldn't create algorithm")
             return nil
         }
-        algorithm = alg
+        generator = gen
 
         super.init()
     }