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

Fix progress accounting: make it out of 1 instead of out of 3 tasks

Browse source
This commit is contained in:
Eryn Wells 2018-11-19 10:57:06 -07:00
parent 7ff2d3ed6e
commit 95fe543efc
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Terrain2/Terrain.swift
View file

@ -113,7 +113,7 @@ class Terrain: NSObject {
do { do {
updateHeightsPipeline = try Terrain.computePipeline(withFunctionNamed: "updateGeometryHeights", device: device, library: library) updateHeightsPipeline = try Terrain.computePipeline(withFunctionNamed: "updateGeometryHeights", device: device, library: library)
updateSurfaceNormalsPipeline = try Terrain.computePipeline(withFunctionNamed: "updateGeometryNormals", device: device, library: library) updateSurfaceNormalsPipeline = try Terrain.computePipeline(withFunctionNamed: "updateGeometryNormals", device: device, library: library)
updateVertexNormalsPipeline = try Terrain.computePipeline(withFunctionNamed: "updateGeometryVertexNormals", device: device, library: library) // updateVertexNormalsPipeline = try Terrain.computePipeline(withFunctionNamed: "updateGeometryVertexNormals", device: device, library: library)
} catch { } catch {
print("Unable to create compute pipelines for terrain geometry updates. Error: \(error)") print("Unable to create compute pipelines for terrain geometry updates. Error: \(error)")
return nil return nil
@ -123,18 +123,16 @@ class Terrain: NSObject {
} }
func generate(completion: @escaping () -> Void) -> Progress { func generate(completion: @escaping () -> Void) -> Progress {
let progress = Progress(totalUnitCount: 3) let progress = Progress(totalUnitCount: 1)
generatorQueue.async { generatorQueue.async {
progress.becomeCurrent(withPendingUnitCount: 3) progress.becomeCurrent(withPendingUnitCount: 1)
let heights = self.generator.render(progress: progress) let _ = self.generator.render(progress: progress)
progress.completedUnitCount += 1 progress.completedUnitCount += 1
// TODO: Store heights // TODO: Store heights
progress.completedUnitCount += 1
// TODO: Compute normals // TODO: Compute normals
progress.completedUnitCount += 1
progress.resignCurrent() progress.resignCurrent()
completion() completion()