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

Fix the off-by-ones

Browse source
This commit is contained in:
Eryn Wells 2018-11-22 11:14:34 -07:00
parent 6c0792fc9c
commit a72309ec09
2 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Terrain2/Shaders/TerrainAlgorithms.metal
View file

@ -82,29 +82,30 @@ kernel void updateGeometryVertexNormals(constant packed_float3 *meshPositions [[
device packed_float3 *vertexNormals [[buffer(GeneratorBufferIndexNormals)]], device packed_float3 *vertexNormals [[buffer(GeneratorBufferIndexNormals)]],
uint2 tid [[thread_position_in_grid]]) uint2 tid [[thread_position_in_grid]])
{ {
float3 normal = float3(); const uint2 segs = uniforms.terrainSegments;
float3 normal = float3();
uint adjacent = 0; uint adjacent = 0;
if (tid.y > 0 && tid.x > 0) { if (tid.y > 0 && tid.x > 0) {
uint aIndex = 2 * segmentIndex(uint2(tid.x - 1, tid.y - 1), uniforms.terrainSegments) + 1; uint aIndex = 2 * segmentIndex(uint2(tid.x - 1, tid.y - 1), segs) + 1;
normal += faceNormals[aIndex]; normal += faceNormals[aIndex];
adjacent += 1; adjacent += 1;
} }
if (tid.y > 0 && tid.x < (uniforms.terrainSegments.x - 1)) { if (tid.y > 0 && tid.x < segs.x) {
uint segment = segmentIndex(uint2(tid.x, tid.y - 1), uniforms.terrainSegments); uint segment = segmentIndex(uint2(tid.x, tid.y - 1), segs);
uint bIndex = 2 * segment; uint bIndex = 2 * segment;
uint cIndex = 2 * segment + 1; uint cIndex = 2 * segment + 1;
normal += faceNormals[bIndex] + faceNormals[cIndex]; normal += faceNormals[bIndex] + faceNormals[cIndex];
adjacent += 2; adjacent += 2;
} }
if (tid.x < (uniforms.terrainSegments.x - 1) && tid.y < (uniforms.terrainSegments.y - 1)) { if (tid.x < segs.x && tid.y < segs.y) {
uint dIndex = 2 * segmentIndex(tid, uniforms.terrainSegments); uint dIndex = 2 * segmentIndex(tid, segs);
normal += faceNormals[dIndex]; normal += faceNormals[dIndex];
adjacent += 1; adjacent += 1;
} }
if (tid.x > 0 && tid.y < (uniforms.terrainSegments.y - 1)) { if (tid.x > 0 && tid.y < segs.y) {
uint segment = segmentIndex(uint2(tid.x - 1, tid.y), uniforms.terrainSegments); uint segment = segmentIndex(uint2(tid.x - 1, tid.y), segs);
uint eIndex = 2 * segment + 1; uint eIndex = 2 * segment + 1;
uint fIndex = 2 * segment; uint fIndex = 2 * segment;
normal += faceNormals[eIndex] + faceNormals[fIndex]; normal += faceNormals[eIndex] + faceNormals[fIndex];
@ -113,8 +114,8 @@ kernel void updateGeometryVertexNormals(constant packed_float3 *meshPositions [[
if (adjacent != 0) { if (adjacent != 0) {
normal = normalize(normal / float(adjacent)); normal = normalize(normal / float(adjacent));
uint vertexNormalIndex = segmentIndex(tid, uniforms.terrainSegments); uint idx = segmentIndex(tid, segs);
vertexNormals[vertexNormalIndex] = normal; vertexNormals[idx] = normal;
} }
} }

2
Terrain2/Terrain.swift
View file

@ -201,7 +201,7 @@ class Terrain: NSObject {
let normalsBuffer = mesh.vertexBuffers[BufferIndex.normals.rawValue] let normalsBuffer = mesh.vertexBuffers[BufferIndex.normals.rawValue]
computeEncoder.setBuffer(normalsBuffer.buffer, offset: normalsBuffer.offset, index: GeneratorBufferIndex.normals.rawValue) computeEncoder.setBuffer(normalsBuffer.buffer, offset: normalsBuffer.offset, index: GeneratorBufferIndex.normals.rawValue)
computeEncoder.setBuffer(uniforms.buffer, offset: uniforms.offset, index: GeneratorBufferIndex.uniforms.rawValue) computeEncoder.setBuffer(uniforms.buffer, offset: uniforms.offset, index: GeneratorBufferIndex.uniforms.rawValue)
computeEncoder.dispatchThreads(MTLSize(width: 2 * Int(segments.x * segments.y), height: 1, depth: 1), threadsPerThreadgroup: MTLSize(width: 8, height: 8, depth: 1)) computeEncoder.dispatchThreads(MTLSize(width: Int(segments.x + 1), height: Int(segments.y + 1), depth: 1), threadsPerThreadgroup: MTLSize(width: 8, height: 8, depth: 1))
computeEncoder.popDebugGroup() computeEncoder.popDebugGroup()
computeEncoder.endEncoding() computeEncoder.endEncoding()
} }