minetest/minetest
1
0
Fork 0
mirror of https://github.com/minetest/minetest.git synced 2024-09-24 05:20:29 +02:00
Code Issues Releases Wiki Activity

Fix broken plantlike drawtype.

Browse Source
This commit is contained in:
RealBadAngel 2014-10-21 23:06:12 +02:00 committed by sfan5
parent 171bbd7959
commit 7e34621b1d
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/content_mapblock.cpp
View File

@ -1153,40 +1153,40 @@ void mapblock_mesh_generate_special(MeshMakeData *data,
{ {
TileSpec tile = getNodeTileN(n, p, 0, data); TileSpec tile = getNodeTileN(n, p, 0, data);
tile.material_flags |= MATERIAL_FLAG_CRACK_OVERLAY; tile.material_flags |= MATERIAL_FLAG_CRACK_OVERLAY;
u16 l = getInteriorLight(n, 1, nodedef); u16 l = getInteriorLight(n, 1, nodedef);
video::SColor c = MapBlock_LightColor(255, l, f.light_source); video::SColor c = MapBlock_LightColor(255, l, f.light_source);
float s = BS/2*f.visual_scale; float s = BS / 2;
for(u32 j = 0; j < 2; j++)
for(u32 j=0; j<2; j++)
{ {
video::S3DVertex vertices[4] = video::S3DVertex vertices[4] =
{ {
video::S3DVertex(-s,-BS/2, 0, 0,0,0, c, 0,1), video::S3DVertex(-s,-s, 0, 0,0,0, c, 0,1),
video::S3DVertex( s,-BS/2, 0, 0,0,0, c, 1,1), video::S3DVertex( s,-s, 0, 0,0,0, c, 1,1),
video::S3DVertex( s,-BS/2 + s*2,0, 0,0,0, c, 1,0), video::S3DVertex( s, s, 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,0),
}; };
if(j == 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); vertices[i].Pos.rotateXZBy(46 + n.param2 * 2);
} }
else if(j == 1) 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); 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 *= f.visual_scale;
vertices[i].Pos.Y -= s * (1 - f.visual_scale);
vertices[i].Pos += intToFloat(p, BS); 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 // Add to mesh collector
collector.append(tile, vertices, 4, indices, 6); collector.append(tile, vertices, 4, indices, 6);
} }