Fix broken plantlike drawtype.

RealBadAngel · sfan5 · commit 7e34621b1de7 · 2014-10-22T21:15:31.000+02:00
diff --git a/src/content_mapblock.cpp b/src/content_mapblock.cpp
@@ -1153,40 +1153,40 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
 		{
 			TileSpec tile = getNodeTileN(n, p, 0, data);
 			tile.material_flags |= MATERIAL_FLAG_CRACK_OVERLAY;
-			
+
 			u16 l = getInteriorLight(n, 1, nodedef);
 			video::SColor c = MapBlock_LightColor(255, l, f.light_source);
-
-			float s = BS/2*f.visual_scale;
-
-			for(u32 j=0; j<2; j++)
+			
+			float s = BS / 2;
+			for(u32 j = 0; j < 2; j++)
 			{
 				video::S3DVertex vertices[4] =
 				{
-					video::S3DVertex(-s,-BS/2,      0, 0,0,0, c, 0,1),
-					video::S3DVertex( s,-BS/2,      0, 0,0,0, c, 1,1),
-					video::S3DVertex( s,-BS/2 + s*2,0, 0,0,0, c, 1,0),
-					video::S3DVertex(-s,-BS/2 + s*2,0, 0,0,0, c, 0,0),
+					video::S3DVertex(-s,-s, 0, 0,0,0, c, 0,1),
+					video::S3DVertex( s,-s, 0, 0,0,0, c, 1,1),
+					video::S3DVertex( s, s, 0, 0,0,0, c, 1,0),
+					video::S3DVertex(-s, s, 0, 0,0,0, c, 0,0),
 				};
 
 				if(j == 0)
 				{
-					for(u16 i=0; i<4; i++)
+					for(u16 i = 0; i < 4; i++)
 						vertices[i].Pos.rotateXZBy(46 + n.param2 * 2);
 				}
 				else if(j == 1)
 				{
-					for(u16 i=0; i<4; i++)
+					for(u16 i = 0; i < 4; i++)
 						vertices[i].Pos.rotateXZBy(-44 + n.param2 * 2);
 				}
 
-				for(u16 i=0; i<4; i++)
+				for(u16 i = 0; i < 4; i++)
 				{
 					vertices[i].Pos *= f.visual_scale;
+					vertices[i].Pos.Y -= s * (1 - f.visual_scale);
 					vertices[i].Pos += intToFloat(p, BS);
 				}
 
-				u16 indices[] = {0,1,2,2,3,0};
+				u16 indices[] = {0, 1, 2, 2, 3, 0};
 				// Add to mesh collector
 				collector.append(tile, vertices, 4, indices, 6);
 			}

Original file line number	Diff line number	Diff line change
`@@ -1153,40 +1153,40 @@ void mapblock_mesh_generate_special(MeshMakeData *data,`
`1153`	`1153`	`{`
`1154`	`1154`	`TileSpec tile = getNodeTileN(n, p, 0, data);`
`1155`	`1155`	`tile.material_flags \|= MATERIAL_FLAG_CRACK_OVERLAY;`
`1156`		`-`
	`1156`	`+`
`1157`	`1157`	`u16 l = getInteriorLight(n, 1, nodedef);`
`1158`	`1158`	`video::SColor c = MapBlock_LightColor(255, l, f.light_source);`
`1159`		`-`
`1160`		`- float s = BS/2*f.visual_scale;`
`1161`		`-`
`1162`		`- for(u32 j=0; j<2; j++)`
	`1159`	`+`
	`1160`	`+ float s = BS / 2;`
	`1161`	`+ for(u32 j = 0; j < 2; j++)`
`1163`	`1162`	`{`
`1164`	`1163`	`video::S3DVertex vertices[4] =`
`1165`	`1164`	`{`
`1166`		`- video::S3DVertex(-s,-BS/2, 0, 0,0,0, c, 0,1),`
`1167`		`- video::S3DVertex( s,-BS/2, 0, 0,0,0, c, 1,1),`
`1168`		`- video::S3DVertex( s,-BS/2 + s*2,0, 0,0,0, c, 1,0),`
`1169`		`- video::S3DVertex(-s,-BS/2 + s*2,0, 0,0,0, c, 0,0),`
	`1165`	`+ video::S3DVertex(-s,-s, 0, 0,0,0, c, 0,1),`
	`1166`	`+ video::S3DVertex( s,-s, 0, 0,0,0, c, 1,1),`
	`1167`	`+ video::S3DVertex( s, s, 0, 0,0,0, c, 1,0),`
	`1168`	`+ video::S3DVertex(-s, s, 0, 0,0,0, c, 0,0),`
`1170`	`1169`	`};`
`1171`	`1170`
`1172`	`1171`	`if(j == 0)`
`1173`	`1172`	`{`
`1174`		`- for(u16 i=0; i<4; i++)`
	`1173`	`+ for(u16 i = 0; i < 4; i++)`
`1175`	`1174`	`vertices[i].Pos.rotateXZBy(46 + n.param2 * 2);`
`1176`	`1175`	`}`
`1177`	`1176`	`else if(j == 1)`
`1178`	`1177`	`{`
`1179`		`- for(u16 i=0; i<4; i++)`
	`1178`	`+ for(u16 i = 0; i < 4; i++)`
`1180`	`1179`	`vertices[i].Pos.rotateXZBy(-44 + n.param2 * 2);`
`1181`	`1180`	`}`
`1182`	`1181`
`1183`		`- for(u16 i=0; i<4; i++)`
	`1182`	`+ for(u16 i = 0; i < 4; i++)`
`1184`	`1183`	`{`
`1185`	`1184`	`vertices[i].Pos *= f.visual_scale;`
	`1185`	`+ vertices[i].Pos.Y -= s * (1 - f.visual_scale);`
`1186`	`1186`	`vertices[i].Pos += intToFloat(p, BS);`
`1187`	`1187`	`}`
`1188`	`1188`
`1189`		`- u16 indices[] = {0,1,2,2,3,0};`
	`1189`	`+ u16 indices[] = {0, 1, 2, 2, 3, 0};`
`1190`	`1190`	`// Add to mesh collector`
`1191`	`1191`	`collector.append(tile, vertices, 4, indices, 6);`
`1192`	`1192`	`}`