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

Debug modifying the geometry

Browse source 
packed_float3 != float3 ¯\_(ツ)_/¯
This commit is contained in:
Eryn Wells 2018-11-11 20:16:08 -05:00
parent 3462fa2458
commit dc3de77a59
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Terrain2/Renderer.swift
View file

@ -207,6 +207,7 @@ class Renderer: NSObject, MTKViewDelegate {
_ = regenerationSemaphore.wait(timeout: DispatchTime.distantFuture) _ = regenerationSemaphore.wait(timeout: DispatchTime.distantFuture)
if let commandBuffer = commandQueue.makeCommandBuffer() { if let commandBuffer = commandQueue.makeCommandBuffer() {
let needsGeometryUpdate = didUpdateTerrain
var didScheduleAlgorithmIteration = false var didScheduleAlgorithmIteration = false
let inFlightSem = inFlightSemaphore let inFlightSem = inFlightSemaphore
let regenSem = regenerationSemaphore let regenSem = regenerationSemaphore
@ -214,7 +215,7 @@ class Renderer: NSObject, MTKViewDelegate {
if didScheduleAlgorithmIteration && self.iterateTerrainAlgorithm { if didScheduleAlgorithmIteration && self.iterateTerrainAlgorithm {
self.iterateTerrainAlgorithm = false self.iterateTerrainAlgorithm = false
} }
if self.didUpdateTerrain { if needsGeometryUpdate {
self.didUpdateTerrain = false self.didUpdateTerrain = false
} }
regenSem.signal() regenSem.signal()
@ -235,12 +236,18 @@ class Renderer: NSObject, MTKViewDelegate {
didScheduleAlgorithmIteration = true didScheduleAlgorithmIteration = true
} }
if didScheduleAlgorithmIteration || didUpdateTerrain, let computeEncoder = commandBuffer.makeComputeCommandEncoder() { if didScheduleAlgorithmIteration || needsGeometryUpdate, let computeEncoder = commandBuffer.makeComputeCommandEncoder() {
print("Scheduling update geometry iteration") print("Scheduling update geometry iteration")
computeEncoder.label = "Geometry Heights Encoder" computeEncoder.label = "Geometry Heights Encoder"
computeEncoder.pushDebugGroup("Update Geometry: Heights") computeEncoder.pushDebugGroup("Update Geometry: Heights")
computeEncoder.setComputePipelineState(updateGeometryHeightsPipeline) computeEncoder.setComputePipelineState(updateGeometryHeightsPipeline)
computeEncoder.dispatchThreads(MTLSize(width: Int(terrain.segments.x), height: Int(terrain.segments.y), depth: 1), threadsPerThreadgroup: MTLSize(width: 10, height: 10, depth: 1)) computeEncoder.setTexture(terrain.generator.outTexture, index: GeneratorTextureIndex.in.rawValue)
let vertexBuffer = terrain.mesh.vertexBuffers[BufferIndex.meshPositions.rawValue]
computeEncoder.setBuffer(vertexBuffer.buffer, offset: vertexBuffer.offset, index: GeneratorBufferIndex.vertexes.rawValue)
let texCoordBuffer = terrain.mesh.vertexBuffers[BufferIndex.meshGenerics.rawValue]
computeEncoder.setBuffer(texCoordBuffer.buffer, offset: texCoordBuffer.offset, index: GeneratorBufferIndex.texCoords.rawValue)
computeEncoder.setBuffer(dynamicUniformBuffer, offset: uniformBufferOffset, index: GeneratorBufferIndex.uniforms.rawValue)
computeEncoder.dispatchThreads(MTLSize(width: Int(terrain.segments.x + 1), height: Int(terrain.segments.y + 1), depth: 1), threadsPerThreadgroup: MTLSize(width: 8, height: 8, depth: 1))
computeEncoder.popDebugGroup() computeEncoder.popDebugGroup()
computeEncoder.endEncoding() computeEncoder.endEncoding()
} }

2
Terrain2/Shaders/TerrainAlgorithms.metal
View file

@ -46,7 +46,7 @@ private:
kernel void updateGeometryHeights(texture2d<float> texture [[texture(GeneratorTextureIndexIn)]], kernel void updateGeometryHeights(texture2d<float> texture [[texture(GeneratorTextureIndexIn)]],
constant float2 *texCoords [[buffer(GeneratorBufferIndexTexCoords)]], constant float2 *texCoords [[buffer(GeneratorBufferIndexTexCoords)]],
constant Uniforms &uniforms [[buffer(GeneratorBufferIndexUniforms)]], constant Uniforms &uniforms [[buffer(GeneratorBufferIndexUniforms)]],
device float3 *vertexes [[buffer(GeneratorBufferIndexVertexes)]], device packed_float3 *vertexes [[buffer(GeneratorBufferIndexVertexes)]],
uint2 tid [[thread_position_in_grid]]) uint2 tid [[thread_position_in_grid]])
{ {
constexpr sampler s(coord::normalized, address::clamp_to_zero, filter::linear); constexpr sampler s(coord::normalized, address::clamp_to_zero, filter::linear);