Fix world-aligned node rendering at bottom (#10742)

Wuzzy2 · web-flow · commit e441ab967523 · 2021-02-19T19:45:36.000+01:00
diff --git a/src/client/mapblock_mesh.cpp b/src/client/mapblock_mesh.cpp
@@ -404,7 +404,7 @@ static void getNodeVertexDirs(const v3s16 &dir, v3s16 *vertex_dirs)
 
 static void getNodeTextureCoords(v3f base, const v3f &scale, const v3s16 &dir, float *u, float *v)
 {
-	if (dir.X > 0 || dir.Y > 0 || dir.Z < 0)
+	if (dir.X > 0 || dir.Y != 0 || dir.Z < 0)
 		base -= scale;
 	if (dir == v3s16(0,0,1)) {
 		*u = -base.X - 1;
@@ -422,8 +422,8 @@ static void getNodeTextureCoords(v3f base, const v3f &scale, const v3s16 &dir, f
 		*u = base.X + 1;
 		*v = -base.Z - 2;
 	} else if (dir == v3s16(0,-1,0)) {
-		*u = base.X;
-		*v = base.Z;
+		*u = base.X + 1;
+		*v = base.Z + 1;
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -404,7 +404,7 @@ static void getNodeVertexDirs(const v3s16 &dir, v3s16 *vertex_dirs)`
`404`	`404`
`405`	`405`	`static void getNodeTextureCoords(v3f base, const v3f &scale, const v3s16 &dir, float u, float v)`
`406`	`406`	`{`
`407`		`- if (dir.X > 0 \|\| dir.Y > 0 \|\| dir.Z < 0)`
	`407`	`+ if (dir.X > 0 \|\| dir.Y != 0 \|\| dir.Z < 0)`
`408`	`408`	`base -= scale;`
`409`	`409`	`if (dir == v3s16(0,0,1)) {`
`410`	`410`	`*u = -base.X - 1;`
`@@ -422,8 +422,8 @@ static void getNodeTextureCoords(v3f base, const v3f &scale, const v3s16 &dir, f`
`422`	`422`	`*u = base.X + 1;`
`423`	`423`	`*v = -base.Z - 2;`
`424`	`424`	`} else if (dir == v3s16(0,-1,0)) {`
`425`		`- *u = base.X;`
`426`		`- *v = base.Z;`
	`425`	`+ *u = base.X + 1;`
	`426`	`+ *v = base.Z + 1;`
`427`	`427`	`}`
`428`	`428`	`}`
`429`	`429`