strips/voxelotl-engine
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/voxelotl-engine.git synced 2025-08-03 05:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

turn the ChunkID type alias into a real type

Browse Source
This commit is contained in:
a dinosaur
2024-09-08 03:47:26 +10:00
parent 76b61c49ae
commit b804030594
9 changed files with 78 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Sources/Voxelotl/ChunkGeneration.swift
View File

@ -2,8 +2,8 @@ import Foundation
public struct ChunkGeneration {
private let queue: OperationQueue
private let localReadyChunks = ConcurrentDictionary<SIMD3<Int>, Chunk>()
private var generatingChunkSet = Set<SIMD3<Int>>()
private let localReadyChunks = ConcurrentDictionary<ChunkID, Chunk>()
private var generatingChunkSet = Set<ChunkID>()
weak var world: World?
@ -21,18 +21,18 @@ public struct ChunkGeneration {
self.generatingChunkSet.removeAll()
}
public mutating func generate(chunkID: SIMD3<Int>) {
public mutating func generate(chunkID: ChunkID) {
if generatingChunkSet.insert(chunkID).inserted {
self.queueGenerateJob(chunkID: chunkID)
}
}
func queueGenerateJob(chunkID: SIMD3<Int>) {
func queueGenerateJob(chunkID: ChunkID) {
self.queue.addOperation {
guard let world = self.world else {
return
}
let chunk = world.generateSingleChunkUncommitted(chunkID: chunkID)
let chunk = world.generateSingleChunkUncommitted(id: chunkID)
self.localReadyChunks[chunkID] = chunk
}
}
@ -41,12 +41,12 @@ public struct ChunkGeneration {
guard let world = self.world else {
return
}
let centerChunkID = World.makeID(position: position)
let centerChunkID = ChunkID(fromPosition: position)
let range = -2...2
for z in range {
for y in range {
for x in range {
let chunkID = centerChunkID &+ SIMD3(x, y, z)
let chunkID = centerChunkID &+ ChunkID(x, y, z)
if world.getChunk(id: chunkID) == nil {
self.generate(chunkID: chunkID)
}
@ -69,7 +69,7 @@ public struct ChunkGeneration {
}
for (chunkID, chunk) in self.localReadyChunks.take() {
world.addChunk(chunkID: chunkID, chunk: chunk)
world.addChunk(id: chunkID, chunk: chunk)
self.generatingChunkSet.remove(chunkID)
}
}