From 65ffec18e905067a211b554d5b6f8b3b68ce3155 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 22 Nov 2018 08:12:15 -0700 Subject: [PATCH] A couple small random tweaks while I play with lighting --- Terrain2/Renderer.swift | 2 +- Terrain2/Shaders/TerrainAlgorithms.metal | 2 +- Terrain2/Terrain.swift | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Terrain2/Renderer.swift b/Terrain2/Renderer.swift index 3ac6f28..2c43e84 100644 --- a/Terrain2/Renderer.swift +++ b/Terrain2/Renderer.swift @@ -18,7 +18,7 @@ let alignedUniformsSize = (MemoryLayout.size & ~0xFF) + 0x100 let maxBuffersInFlight = 3 let terrainDimensions = float2(10, 10) -let terrainSegments = uint2(20, 20) +let terrainSegments = uint2(5, 5) enum RendererError: Error { case badVertexDescriptor diff --git a/Terrain2/Shaders/TerrainAlgorithms.metal b/Terrain2/Shaders/TerrainAlgorithms.metal index 7545a83..7d7c06d 100644 --- a/Terrain2/Shaders/TerrainAlgorithms.metal +++ b/Terrain2/Shaders/TerrainAlgorithms.metal @@ -47,7 +47,7 @@ kernel void updateGeometryNormals(constant packed_float3 *meshPositions [[buffer float3 side2 = v1 - v3; float3 normal = normalize(cross(side1, side2)); faceNormals[tid] = normal; - faceMidpoints[tid] = 0.3333333333 * (v1 + v2 + v3); + faceMidpoints[tid] = (1.0 / 3.0) * (v1 + v2 + v3); } kernel void updateGeometryVertexNormals() diff --git a/Terrain2/Terrain.swift b/Terrain2/Terrain.swift index 14bcf01..311d944 100644 --- a/Terrain2/Terrain.swift +++ b/Terrain2/Terrain.swift @@ -108,7 +108,7 @@ class Terrain: NSObject { print("Couldn't create algorithm") return nil } - (gen as DiamondSquareGenerator).roughness = 0.075 + gen.roughness = 0.2 generator = gen do {