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

Fix the normals!!1!

Browse source
This commit is contained in:
Eryn Wells 2018-11-26 17:26:09 -08:00
parent 5d3276ab03
commit b26bec76da
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Terrain2/Shaders/TerrainAlgorithms.metal
View file

@ -82,7 +82,7 @@ kernel void updateGeometryVertexNormals(constant packed_float3 *meshPositions [[
{ {
const uint2 segs = uniforms.terrainSegments; const uint2 segs = uniforms.terrainSegments;
float3 normal = float3(); float3 normal = float3(0);
uint adjacent = 0; uint adjacent = 0;
if (tid.x > 0 && tid.y > 0) { if (tid.x > 0 && tid.y > 0) {
@ -90,19 +90,19 @@ kernel void updateGeometryVertexNormals(constant packed_float3 *meshPositions [[
normal += faceNormals[aIndex]; normal += faceNormals[aIndex];
adjacent += 1; adjacent += 1;
} }
if (tid.x > 0 && tid.y < segs.y) { if (tid.x > 0 && tid.y <= segs.y) {
uint segment = segmentIndex(uint2(tid.x - 1, tid.y), segs); uint segment = segmentIndex(uint2(tid.x - 1, tid.y), 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 < segs.x && tid.y < segs.y) { if (tid.x <= segs.x && tid.y <= segs.y) {
uint dIndex = 2 * segmentIndex(tid, segs); uint dIndex = 2 * segmentIndex(tid, segs);
normal += faceNormals[dIndex]; normal += faceNormals[dIndex];
adjacent += 1; adjacent += 1;
} }
if (tid.x < segs.x && tid.y > 0) { if (tid.x <= segs.x && tid.y > 0) {
uint segment = segmentIndex(uint2(tid.x, tid.y - 1), segs); uint segment = segmentIndex(uint2(tid.x, tid.y - 1), segs);
uint eIndex = 2 * segment + 1; uint eIndex = 2 * segment + 1;
uint fIndex = 2 * segment; uint fIndex = 2 * segment;
@ -112,7 +112,7 @@ kernel void updateGeometryVertexNormals(constant packed_float3 *meshPositions [[
if (adjacent != 0) { if (adjacent != 0) {
normal = normalize(normal / float(adjacent)); normal = normalize(normal / float(adjacent));
uint idx = segmentIndex(tid, segs) + 1; uint idx = tid.y * (segs.x + 1) + tid.x;
vertexNormals[idx] = normal; vertexNormals[idx] = normal;
} }
} }