[BlockMesher] Finally fixed AO for multibox drawtype.

Unarelith · Jul 19, 2021 · 3259a52 · 3259a52
1 parent 19355e9
commit 3259a52
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 4 deletions.
diff --git a/resources/shaders/game.v.glsl b/resources/shaders/game.v.glsl
@@ -49,9 +49,9 @@ void main() {
 	v_lightValue = lightValue;
 
 	if (ambientOcclusion != 4) {
-		const float aovalues[] = float[](0.4, 0.6, 0.8, 1.0);
-		v_ambientOcclusion = aovalues[int(ambientOcclusion)];
-		// v_ambientOcclusion = 0.4 + 0.2 * ambientOcclusion;
+		/* const float aovalues[] = float[](0.4, 0.6, 0.8, 1.0); */
+		/* v_ambientOcclusion = aovalues[int(ambientOcclusion)]; */
+		v_ambientOcclusion = 0.4 + 0.2 * ambientOcclusion;
 	} else {
 		v_ambientOcclusion = 1.0;
 	}

diff --git a/source/client/world/mesh/BlockMesher.cpp b/source/client/world/mesh/BlockMesher.cpp
@@ -220,8 +220,27 @@ void BlockMesher::addBlockFace(s8f x, s8f y, s8f z, s8f f, ChunkMeshBuildingJob
 		vertices[v].ambientOcclusion = getAmbientOcclusion(x, y, z, *neighbourOfs[v], normal, job.chunkData);
 	}
 
+	// Fix basic ambient occlusion for multibox draw type
+	if (blockState.drawType() == BlockDrawType::Multibox) {
+		float aoValues[nVertsPerFace] = {
+			vertices[0].ambientOcclusion,
+			vertices[1].ambientOcclusion,
+			vertices[2].ambientOcclusion,
+			vertices[3].ambientOcclusion
+		};
+
+		for (u8f v = 0; v < nVertsPerFace; ++v) {
+			float U = (v == 0 || v == 3) ? U0 : U1;
+			float V = 1.f - ((v >= 2) ? V0 : V1);
+
+			float a = gk::lerpf(aoValues[0], aoValues[1], U);
+			float b = gk::lerpf(aoValues[3], aoValues[2], U);
+			vertices[v].ambientOcclusion = gk::lerpf(a, b, V);
+		}
+	}
+
 	auto addVertex = [&](u8 v) {
-		if (Config::ambientOcclusion != 1 || blockState.isLightSource() || blockState.drawType() == BlockDrawType::Multibox)
+		if (Config::ambientOcclusion != 1 || blockState.isLightSource())
 			vertices[v].ambientOcclusion = 4;
 
 		if (blockState.drawType() == BlockDrawType::Liquid)